Merge "Enhance the schema for VIPs and ip address"

[aai/aai-common.git] / aai-core / src / main / resources / dbedgerules / DbEdgeRules_v11.json
diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json

index 9ebd047..7b97315 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -6,18 +6,29 @@
                         "label": "groupsResourcesIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
                 },
+               {
+                       "from" : "auth-info-item",
+                       "to" : "tenant",
+                       "label" : "defaultTenant",
+                       "direction" : "OUT",
+                       "multiplicity" : "One2One",
+                       "isParent" : "false",
+                       "usesResource" : "false",
+                       "hasDelTarget" : "false",
+                       "SVC-INFRA" : "false"
+               },
                 {
                         "from": "generic-vnf",
                         "to": "license-key-resource",
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -28,7 +39,7 @@
                         "label": "supportsServiceCapability",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -39,7 +50,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -50,7 +61,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -61,7 +72,18 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "${direction}"
+               },
+               {
+                       "from": "cloud-region",
+                       "to": "auth-info-item",
+                       "label": "has",
+                       "direction": "OUT",
+                       "multiplicity": "One2Many",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "${direction}"
@@ -72,7 +94,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -83,7 +105,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -94,7 +116,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -105,7 +127,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -116,7 +138,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -127,8 +149,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -139,7 +160,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -150,7 +171,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "${direction}"
@@ -161,7 +182,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -172,7 +193,7 @@
                         "label": "hasCtagPool",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -183,7 +204,7 @@
                         "label": "usesL3Network",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -194,7 +215,7 @@
                         "label": "supportsAvailabilityZone",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -205,7 +226,7 @@
                         "label": "subscribesTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -216,7 +237,7 @@
                         "label": "existsIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -227,7 +248,7 @@
                         "label": "hasLInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -238,7 +259,7 @@
                         "label": "hasAvailabilityZone",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -249,7 +270,7 @@
                         "label": "hasLAGInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -260,8 +281,7 @@
                         "label": "usesL3Network",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -272,8 +292,7 @@
                         "label": "runsOnPserver",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -284,7 +303,7 @@
                         "label": "usesVnfImage",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -295,8 +314,7 @@
                         "label": "runsOnVserver",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -307,8 +325,7 @@
                         "label": "hasInstance",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -319,7 +336,7 @@
                         "label": "hasSitePairSet",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -330,7 +347,7 @@
                         "label": "hasNetworkProfile",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -341,7 +358,7 @@
                         "label": "hostedOn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -352,7 +369,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -363,29 +380,18 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
                 },
-               {
-                       "from": "image",
-                       "to": "metadata",
-                       "label": "hasMetaData",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
                 {
                         "from": "image",
                         "to": "metadatum",
                         "label": "hasMetaDatum",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -396,7 +402,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -407,7 +413,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -418,7 +424,7 @@
                         "label": "hasIpAddress",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -429,7 +435,7 @@
                         "label": "hasIpAddress",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -440,7 +446,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -451,7 +457,7 @@
                         "label": "usesLogicalLink",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -462,7 +468,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -473,7 +479,7 @@
                         "label": "hasVlan",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -484,7 +490,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -495,7 +501,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -506,7 +512,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -517,7 +523,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -528,7 +534,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -539,7 +545,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -550,7 +556,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -561,7 +567,7 @@
                         "label": "usesVpnBinding",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -572,7 +578,7 @@
                         "label": "memberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -583,7 +589,7 @@
                         "label": "hasSubnet",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -594,7 +600,7 @@
                         "label": "hasInstance",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -605,7 +611,7 @@
                         "label": "hasCtagAssignment",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -616,7 +622,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -627,7 +633,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -638,7 +644,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -649,8 +655,7 @@
                         "label": "usesLAGLink",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -661,8 +666,7 @@
                         "label": "usesPInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -673,7 +677,7 @@
                         "label": "hasLInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -684,8 +688,7 @@
                         "label": "usesLAGLink",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -696,7 +699,7 @@
                         "label": "bridgedTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -707,7 +710,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -718,7 +721,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -729,7 +732,7 @@
                         "label": "startsWith",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -740,7 +743,7 @@
                         "label": "isA",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -751,7 +754,7 @@
                         "label": "hasMetaData",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -762,7 +765,7 @@
                         "label": "connectsTo",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -773,7 +776,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -784,7 +787,7 @@
                         "label": "connectsTo",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -795,7 +798,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -806,7 +809,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -817,7 +820,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -828,7 +831,7 @@
                         "label": "relatedTo",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -839,7 +842,7 @@
                         "label": "startsWith",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -850,7 +853,7 @@
                         "label": "connectsTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -861,7 +864,7 @@
                         "label": "isA",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -872,7 +875,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -883,7 +886,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -894,7 +897,7 @@
                         "label": "targets",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -905,7 +908,7 @@
                         "label": "hasLInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -916,7 +919,7 @@
                         "label": "definedFor",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -927,7 +930,7 @@
                         "label": "supportsServiceCapability",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -938,7 +941,7 @@
                         "label": "hasLInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -949,7 +952,7 @@
                         "label": "usesPhysicalLink",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -960,7 +963,7 @@
                         "label": "usesLogicalLink",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -971,8 +974,7 @@
                         "label": "hasCTag",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -983,7 +985,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -994,7 +996,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1005,7 +1007,7 @@
                         "label": "existsIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -1016,7 +1018,7 @@
                         "label": "hasLAGInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1027,8 +1029,7 @@
                         "label": "hasPinterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1039,7 +1040,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1050,8 +1051,7 @@
                         "label": "hasPinterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1062,7 +1062,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1073,7 +1073,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1084,7 +1084,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1095,7 +1095,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1106,8 +1106,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1118,8 +1117,7 @@
                         "label": "hasIPAGFacingVLAN",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1130,8 +1128,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1142,7 +1139,7 @@
                         "label": "hasInstance",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -1153,7 +1150,7 @@
                         "label": "hasRoutingInstance",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1164,7 +1161,7 @@
                         "label": "hasSitePair",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1175,7 +1172,7 @@
                         "label": "hasClassOfService",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1186,7 +1183,7 @@
                         "label": "usesL3Network",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1197,7 +1194,7 @@
                         "label": "relatedTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1208,7 +1205,7 @@
                         "label": "owns",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "${direction}"
@@ -1219,7 +1216,7 @@
                         "label": "hasAvailabilityZone",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1230,7 +1227,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -1241,8 +1238,7 @@
                         "label": "hasPortGroup",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1253,8 +1249,7 @@
                         "label": "runsOnVserver",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1265,7 +1260,7 @@
                         "label": "hasServiceInstance",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -1276,7 +1271,7 @@
                         "label": "hasVNF",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE"
@@ -1287,7 +1282,7 @@
                         "label": "hasIpAddress",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1298,74 +1293,18 @@
                         "label": "hasIpAddress",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
                 },
-               {
-                       "from": "vpe",
-                       "to": "complex",
-                       "label": "locatedIn",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}"
-               },
-               {
-                       "from": "vpe",
-                       "to": "ctag-pool",
-                       "label": "usesCtagPool",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
-               {
-                       "from": "vpe",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
-               {
-                       "from": "vpe",
-                       "to": "lag-interface",
-                       "label": "hasLAGInterface",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
-               {
-                       "from": "vpe",
-                       "to": "vserver",
-                       "label": "runsOnVserver",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
                 {
                         "from": "vpls-pe",
                         "to": "complex",
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1376,7 +1315,7 @@
                         "label": "usesCtagPool",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1387,7 +1326,7 @@
                         "label": "hasPinterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1398,7 +1337,7 @@
                         "label": "hasLAGinterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1409,7 +1348,7 @@
                         "label": "hasFlavor",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -1420,30 +1359,18 @@
                         "label": "hasImage",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
                 },
-               {
-                       "from": "vserver",
-                       "to": "ipaddress",
-                       "label": "hasIpAddress",
-                       "direction": "OUT",
-                       "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
                 {
                         "from": "vserver",
                         "to": "l-interface",
                         "label": "hasLInterface",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1454,8 +1381,7 @@
                         "label": "runsOnPserver",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -1466,8 +1392,7 @@
                         "label": "hasVolume",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1478,8 +1403,7 @@
                         "label": "hosts",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1490,7 +1414,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1501,8 +1425,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1513,7 +1436,7 @@
                         "label": "hasMetaData",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1524,7 +1447,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1535,8 +1458,7 @@
                         "label": "dependsOn",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1547,8 +1469,7 @@
                         "label": "dependsOn",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1559,7 +1480,7 @@
                         "label": "contains",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1570,7 +1491,7 @@
                         "label": "hasMetaData",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1581,8 +1502,7 @@
                         "label": "contains",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1593,7 +1513,7 @@
                         "label": "bridgedTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1604,7 +1524,7 @@
                         "label": "bridgedTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1615,8 +1535,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1627,7 +1546,7 @@
                         "label": "existsIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}"
@@ -1638,7 +1557,7 @@
                         "label": "belongsTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1649,8 +1568,7 @@
                         "label": "hasVigServer",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1661,8 +1579,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1673,7 +1590,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1684,7 +1601,7 @@
                         "label": "isPartOf",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1695,7 +1612,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1706,7 +1623,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "${direction}"
@@ -1717,7 +1634,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1728,7 +1645,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1739,7 +1656,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1750,7 +1667,7 @@
                         "label": "usesLogicalLink",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE"
@@ -1761,7 +1678,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1772,7 +1689,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1783,7 +1700,7 @@
                         "label": "isPartOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1794,7 +1711,7 @@
                         "label": "isPartOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1805,7 +1722,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1816,7 +1733,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1827,7 +1744,7 @@
                         "label": "isPartOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1838,7 +1755,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1849,7 +1766,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1860,7 +1777,7 @@
                         "label": "isMemberOf",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1871,7 +1788,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1882,7 +1799,7 @@
                         "label": "existsIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1893,7 +1810,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1904,7 +1821,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1915,7 +1832,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1926,7 +1843,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1937,29 +1854,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2Many",
-                       "contains": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
-               {
-                       "from": "vpe",
-                       "to": "entitlement",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "One2Many",
-                       "contains": "${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE"
-               },
-               {
-                       "from": "vpe",
-                       "to": "license",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "One2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1970,7 +1865,7 @@
                         "label": "existsIn",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -1981,7 +1876,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -1992,7 +1887,7 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -2003,7 +1898,7 @@
                         "label": "belongsTo",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -2014,7 +1909,7 @@
                         "label": "bindsTo",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -2025,7 +1920,7 @@
                         "label": "locatedIn",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}"
@@ -2036,7 +1931,7 @@
                         "label": "usesCtagPool",
                         "direction": "OUT",
                         "multiplicity": "Many2Many",
-                       "contains": "NONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -2047,7 +1942,7 @@
                         "label": "has",
                         "direction": "OUT",
                         "multiplicity": "One2One",
-                       "contains": "${direction}",
+                       "contains-other-v": "${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
@@ -2058,11 +1953,65 @@
                         "label": "uses",
                         "direction": "OUT",
                         "multiplicity": "Many2One",
-                       "contains": "NONE",
-                       "uses-resource": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE"
+               },
+               {
+                       "from": "subnet",
+                       "to": "host-route",
+                       "label": "has",
+                       "direction": "OUT",
+                       "multiplicity": "One2Many",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE"
+               },
+               {
+                       "from": "vnfc",
+                       "to": "vip-ipv4-address-list",
+                       "label": "uses",
+                       "direction": "OUT",
+                       "multiplicity": "Many2Many",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE"
+               },
+               {
+                       "from": "vnfc",
+                       "to": "vip-ipv6-address-list",
+                       "label": "uses",
+                       "direction": "OUT",
+                       "multiplicity": "Many2Many",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE"
+               },
+               {
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "vnfc",
+                       "label": "belongsTo",
+                       "direction": "IN",
+                       "multiplicity": "Many2One",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE"
+               },
+               {
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "vnfc",
+                       "label": "belongsTo",
+                       "direction": "IN",
+                       "multiplicity": "Many2One",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE"
                 }
         ]
  }