Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- root@noc:/opt/noc/inv/collections/objectmodels/Cisco # hg diff
- diff -r 5598ead9e5cf inv/collections/objectmodels/Cisco/ASR9k/mpa.json
- --- a/inv/collections/objectmodels/Cisco/ASR9k/mpa.json Thu Nov 21 15:38:04 2013 +0400
- +++ b/inv/collections/objectmodels/Cisco/ASR9k/mpa.json Fri Nov 22 12:33:35 2013 +0400
- @@ -74,7 +74,7 @@
- "gender": "f",
- "name": "Gi0_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/1 port",
- @@ -82,7 +82,7 @@
- "gender": "f",
- "name": "Gi1_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/2 port",
- @@ -90,7 +90,7 @@
- "gender": "f",
- "name": "Gi2_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/3 port",
- @@ -98,7 +98,7 @@
- "gender": "f",
- "name": "Gi3_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/4 port",
- @@ -106,7 +106,7 @@
- "gender": "f",
- "name": "Gi4_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/5 port",
- @@ -114,7 +114,7 @@
- "gender": "f",
- "name": "Gi5_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/6 port",
- @@ -122,7 +122,7 @@
- "gender": "f",
- "name": "Gi6_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/7 port",
- @@ -130,7 +130,7 @@
- "gender": "f",
- "name": "Gi7_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/8 port",
- @@ -138,7 +138,7 @@
- "gender": "f",
- "name": "Gi8_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/9 port",
- @@ -146,7 +146,7 @@
- "gender": "f",
- "name": "Gi9_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/10 port",
- @@ -154,7 +154,7 @@
- "gender": "f",
- "name": "Gi10_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/11 port",
- @@ -162,7 +162,7 @@
- "gender": "f",
- "name": "Gi11_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/12 port",
- @@ -170,7 +170,7 @@
- "gender": "f",
- "name": "Gi12_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/13 port",
- @@ -178,7 +178,7 @@
- "gender": "f",
- "name": "Gi13_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/14 port",
- @@ -186,7 +186,7 @@
- "gender": "f",
- "name": "Gi14_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/15 port",
- @@ -194,7 +194,7 @@
- "gender": "f",
- "name": "Gi15_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/16 port",
- @@ -202,7 +202,7 @@
- "gender": "f",
- "name": "Gi16_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/17 port",
- @@ -210,7 +210,7 @@
- "gender": "f",
- "name": "Gi17_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/18 port",
- @@ -218,7 +218,7 @@
- "gender": "f",
- "name": "Gi18_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- },
- {
- "description": "GiX/19 port",
- @@ -226,7 +226,7 @@
- "gender": "f",
- "name": "Gi19_sfp",
- "protocols": ["TransEth1G"],
- - "type__name": "Transceiver | SFP | Cisco"
- + "type__name": "Transceiver | SFP"
- }
- ],
- "data": {
- diff -r 5598ead9e5cf inv/collections/objectmodels/Cisco/me3400.json
- --- a/inv/collections/objectmodels/Cisco/me3400.json Thu Nov 21 15:38:04 2013 +0400
- +++ b/inv/collections/objectmodels/Cisco/me3400.json Fri Nov 22 12:33:35 2013 +0400
- @@ -580,6 +580,9 @@
- },
- "asset": {
- "part_no0": "ME-3400-24TS-D"
- + },
- + "management": {
- + "managed": true
- }
- }
- },
- diff -r 5598ead9e5cf lib/nosql.py
- --- a/lib/nosql.py Thu Nov 21 15:38:04 2013 +0400
- +++ b/lib/nosql.py Fri Nov 22 12:33:35 2013 +0400
- @@ -99,8 +99,9 @@
- if v is not None:
- instance._data[self.name] = v
- else:
- - raise ValidationError("Unable to dereference %s:%s" % (
- - self.document_type, value))
- + raise ValidationError(
- + "Unable to dereference %s:%s [db.%s.remove({_id: ObjectId(\"%s\")}) to remove]" % (
- + self.document_type, value, self.document_type._meta["collection"], value))
- return super(PlainReferenceField, self).__get__(instance, owner)
- def to_mongo(self, document):
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
