Sync the latest code changes

[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 e369390..a32ba86 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v11.json
@@ -61,11 +61,11 @@
                         "default": "true"
                 },
                 {
-                       "from": "vlan",
-                       "to": "multicast-configuration",
-                       "label": "uses",
+                       "from": "allotted-resource",
+                       "to": "allotted-resource",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -73,23 +73,23 @@
                         "default": "true"
                 },
                 {
-                       "from": "vnfc",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "hasIpAddress",
+                       "from": "allotted-resource",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.PartOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
                         "from": "allotted-resource",
-                       "to": "l-interface",
-                       "label": "uses",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -97,57 +97,33 @@
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "vf-module",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "logical-link",
-                       "to": "vpn-binding",
-                       "label": "uses",
+                       "from": "allotted-resource",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.PartOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "flavor",
-                       "label": "hasFlavor",
+                       "from": "allotted-resource",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "l-interface",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "hasIpAddress",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
                         "from": "allotted-resource",
                         "to": "network-policy",
-                       "label": "uses",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "ONE2ONE",
                         "contains-other-v": "NONE",
@@ -157,93 +133,93 @@
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "vnfc",
-                       "label": "hosts",
+                       "from": "allotted-resource",
+                       "to": "vlan",
+                       "label": "org.onap.relationships.inventory.PartOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "volume-group",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "service-instance",
-                       "label": "hasServiceInstance",
+                       "from": "allotted-resource",
+                       "to": "vpn-binding",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "service-instance",
-                       "label": "dependsOn",
+                       "from": "tunnel-xconnect",
+                       "to": "allotted-resource",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "flavor",
-                       "label": "has",
+                       "from": "availability-zone",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "pserver",
-                       "label": "runsOnPserver",
+                       "from": "availability-zone",
+                       "to": "service-capability",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "vip-ipv6-address-list",
-                       "to": "subnet",
-                       "label": "isMemberOf",
+                       "from": "availability-zone",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "cloud-region",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "pnf",
-                       "label": "bridgedTo",
+                       "from": "cloud-region",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -253,189 +229,201 @@
                         "default": "true"
                 },
                 {
-                       "from": "virtual-data-center",
-                       "to": "generic-vnf",
-                       "label": "hasVNF",
+                       "from": "cloud-region",
+                       "to": "zone",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pnf",
-                       "to": "p-interface",
-                       "label": "hasPinterface",
+                       "from": "dvs-switch",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "vip-ipv4-address-list",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "flavor",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "pnf",
-                       "label": "hostedOn",
+                       "from": "group-assignment",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "p-interface",
-                       "to": "physical-link",
-                       "label": "usesPhysicalLink",
+                       "from": "image",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "model-element",
-                       "to": "model-ver",
-                       "label": "isA",
+                       "from": "oam-network",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "pnf",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "snapshot",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "subnet",
-                       "label": "isMemberOf",
+                       "from": "tenant",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "oam-network",
-                       "to": "service-capability",
-                       "label": "supportsServiceCapability",
+                       "from": "vip-ipv4-address-list",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "zone",
-                       "label": "isMemberOf",
+                       "from": "vip-ipv6-address-list",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
+                       "contains-other-v": "!${direction}",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "segmentation-assignment",
-                       "label": "has",
+                       "from": "volume-group",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
+                       "default": "true"
+               },
+               {
+                       "from": "complex",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "configuration",
-                       "to": "metadatum",
-                       "label": "owns",
+                       "from": "ctag-pool",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "license",
-                       "label": "has",
+                       "from": "configuration",
+                       "to": "allotted-resource",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "named-query-element",
-                       "to": "related-lookup",
-                       "label": "uses",
+                       "from": "configuration",
+                       "to": "logical-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "p-interface",
-                       "label": "hasPinterface",
+                       "from": "metadatum",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vip-ipv6-address-list",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "connector",
+                       "to": "virtual-data-center",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -445,59 +433,59 @@
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "vserver",
-                       "label": "runsOnVserver",
+                       "from": "metadatum",
+                       "to": "connector",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vpls-pe",
-                       "to": "lag-interface",
-                       "label": "hasLAGinterface",
+                       "from": "element-choice-set",
+                       "to": "constrained-element-set",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "vnfc",
-                       "label": "uses",
+                       "from": "ctag-pool",
+                       "to": "availability-zone",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "service-instance",
-                       "label": "hasInstance",
+                       "from": "service-subscription",
+                       "to": "customer",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "named-query",
-                       "to": "model",
-                       "label": "relatedTo",
+                       "from": "dvs-switch",
+                       "to": "availability-zone",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -505,33 +493,33 @@
                         "default": "true"
                 },
                 {
-                       "from": "vf-module",
-                       "to": "vnfc",
-                       "label": "uses",
+                       "from": "model-element",
+                       "to": "element-choice-set",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "entitlement",
-                       "label": "has",
+                       "from": "entitlement",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vip-ipv4-address-list",
-                       "to": "subnet",
-                       "label": "isMemberOf",
+                       "from": "generic-vnf",
+                       "to": "availability-zone",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -541,9 +529,9 @@
                         "default": "true"
                 },
                 {
-                       "from": "availability-zone",
-                       "to": "service-capability",
-                       "label": "supportsServiceCapability",
+                       "from": "generic-vnf",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -553,33 +541,21 @@
                         "default": "true"
                 },
                 {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "l3-network",
-                       "label": "isMemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "vip-ipv6-address-list",
-                       "label": "hasIpAddress",
+                       "from": "generic-vnf",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "route-table-reference",
-                       "label": "uses",
+                       "from": "generic-vnf",
+                       "to": "ctag-pool",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -589,45 +565,45 @@
                         "default": "true"
                 },
                 {
-                       "from": "model-element",
-                       "to": "constrained-element-set",
-                       "label": "connectsTo",
+                       "from": "generic-vnf",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "configuration",
-                       "to": "allotted-resource",
-                       "label": "uses",
+                       "from": "generic-vnf",
+                       "to": "ipsec-configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "configuration",
-                       "to": "allotted-resource",
-                       "label": "uses",
+                       "from": "generic-vnf",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "dvs-switch",
-                       "to": "availability-zone",
-                       "label": "existsIn",
+                       "from": "generic-vnf",
+                       "to": "license-key-resource",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -637,129 +613,117 @@
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "lag-interface",
-                       "label": "hasLAGInterface",
+                       "from": "generic-vnf",
+                       "to": "pnf",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vpls-pe",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "generic-vnf",
+                       "to": "pserver",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
-                       "to": "vlan",
-                       "label": "isPartOf",
+                       "from": "vnfc",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "zone",
-                       "to": "complex",
-                       "label": "existsIn",
+                       "from": "generic-vnf",
+                       "to": "vnf-image",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "ctag-pool",
-                       "to": "availability-zone",
-                       "label": "supportsAvailabilityZone",
+                       "from": "generic-vnf",
+                       "to": "volume-group",
+                       "label": "org.onap.relationships.inventory.DependsOn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "owning-entity",
-                       "to": "service-instance",
-                       "label": "owns",
+                       "from": "generic-vnf",
+                       "to": "vserver",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "vce",
-                       "to": "port-group",
-                       "label": "hasPortGroup",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "lag-interface",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "site-pair-set",
-                       "to": "routing-instance",
-                       "label": "hasRoutingInstance",
+                       "from": "license",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
                         "from": "l-interface",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "hasIpAddress",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
+                       "from": "network-profile",
                         "to": "generic-vnf",
-                       "label": "isPartOf",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -769,201 +733,189 @@
                         "default": "true"
                 },
                 {
-                       "from": "vnfc",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "hasIpAddress",
+                       "from": "service-instance",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "availability-zone",
-                       "label": "hasAvailabilityZone",
+                       "from": "site-pair-set",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "vserver",
-                       "label": "runsOnVserver",
+                       "from": "vf-module",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "pserver",
-                       "label": "bridgedTo",
+                       "from": "pserver",
+                       "to": "group-assignment",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "oam-network",
-                       "label": "has",
+                       "from": "tenant",
+                       "to": "group-assignment",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "dvs-switch",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "service-instance",
-                       "to": "allotted-resource",
-                       "label": "has",
+                       "from": "metadatum",
+                       "to": "image",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "allotted-resource",
-                       "label": "uses",
+                       "from": "instance-group",
+                       "to": "model",
+                       "label": "org.onap.relationships.inventory.Targets",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "configuration",
-                       "label": "uses",
+                       "from": "vig-server",
+                       "to": "ipsec-configuration",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "subnet",
-                       "to": "host-route",
-                       "label": "has",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "lag-interface",
-                       "to": "lag-link",
-                       "label": "usesLAGLink",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "generic-vnf",
-                       "label": "bridgedTo",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "subnet",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "vce",
-                       "to": "entitlement",
-                       "label": "has",
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l-interface",
-                       "to": "sriov-vf",
-                       "label": "has",
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "named-query-element",
-                       "to": "model",
-                       "label": "isA",
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "subnet",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "group-assignment",
-                       "to": "pserver",
-                       "label": "has",
+                       "from": "ctag-assignment",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vnfc",
+                       "from": "l3-network",
                         "to": "instance-group",
-                       "label": "isMemberOf",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -973,21 +925,21 @@
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "cvlan-tag",
-                       "label": "hasIPAGFacingVLAN",
+                       "from": "l3-network",
+                       "to": "network-policy",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "l3-network",
+                       "to": "route-table-reference",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -997,155 +949,203 @@
                         "default": "true"
                 },
                 {
-                       "from": "line-of-business",
-                       "to": "generic-vnf",
-                       "label": "realizedBy",
+                       "from": "l3-network",
+                       "to": "vpn-binding",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
+                       "default": "true"
+               },
+               {
+                       "from": "segmentation-assignment",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "service-instance",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "pserver",
-                       "label": "runsOnPserver",
+                       "from": "subnet",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "lag-interface",
+                       "to": "lag-link",
+                       "label": "tosca.relationships.network.LinksTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "${direction}",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "availability-zone",
-                       "label": "hasAvailabilityZone",
+                       "from": "lag-interface",
+                       "to": "logical-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-interface-ipv4-address-list",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "lag-interface",
+                       "to": "p-interface",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "subnet",
-                       "label": "hasSubnet",
+                       "from": "l-interface",
+                       "to": "lag-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "volume-group",
-                       "to": "tenant",
-                       "label": "belongsTo",
+                       "from": "line-of-business",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "l-interface",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "l3-network",
-                       "label": "usesL3Network",
+                       "from": "l-interface",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "l-interface",
+                       "to": "logical-link",
+                       "label": "tosca.relationships.network.LinksTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "availability-zone",
-                       "to": "complex",
-                       "label": "groupsResourcesIn",
+                       "from": "sriov-vf",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
-                       "to": "vpn-binding",
-                       "label": "belongsTo",
+                       "from": "vlan",
+                       "to": "l-interface",
+                       "label": "tosca.relationships.network.LinksTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "project",
-                       "to": "service-instance",
-                       "label": "created",
+                       "from": "logical-link",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1153,9 +1153,9 @@
                         "default": "true"
                 },
                 {
-                       "from": "platform",
+                       "from": "logical-link",
                         "to": "generic-vnf",
-                       "label": "uses",
+                       "label": "org.onap.relationships.inventory.BridgedTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -1165,9 +1165,9 @@
                         "default": "true"
                 },
                 {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "l3-network",
-                       "label": "isMemberOf",
+                       "from": "logical-link",
+                       "to": "lag-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -1177,45 +1177,45 @@
                         "default": "true"
                 },
                 {
-                       "from": "port-group",
-                       "to": "cvlan-tag",
-                       "label": "hasCTag",
+                       "from": "logical-link",
+                       "to": "logical-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "image",
-                       "to": "metadatum",
-                       "label": "hasMetaDatum",
+                       "from": "logical-link",
+                       "to": "pnf",
+                       "label": "org.onap.relationships.inventory.BridgedTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vnfc",
-                       "to": "vip-ipv6-address-list",
-                       "label": "uses",
+                       "from": "logical-link",
+                       "to": "pserver",
+                       "label": "org.onap.relationships.inventory.BridgedTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "oam-network",
-                       "to": "complex",
-                       "label": "definedFor",
+                       "from": "logical-link",
+                       "to": "vpn-binding",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -1225,201 +1225,189 @@
                         "default": "true"
                 },
                 {
-                       "from": "vlan",
-                       "to": "l3-interface-ipv4-address-list",
-                       "label": "hasIpAddress",
+                       "from": "model-ver",
+                       "to": "model",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "routing-instance",
-                       "to": "site-pair",
-                       "label": "hasSitePair",
+                       "from": "constrained-element-set",
+                       "to": "model-constraint",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vpn-binding",
-                       "to": "route-target",
-                       "label": "has",
+                       "from": "constrained-element-set",
+                       "to": "model-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
-                       "to": "tunnel-xconnect",
-                       "label": "has",
+                       "from": "model-constraint",
+                       "to": "model-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l-interface",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "model-element",
+                       "to": "model-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "ipsec-configuration",
-                       "to": "vig-server",
-                       "label": "hasVigServer",
+                       "from": "model-element",
+                       "to": "model-ver",
+                       "label": "org.onap.relationships.inventory.IsA",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "lag-interface",
-                       "label": "hasLAGInterface",
+                       "from": "model-element",
+                       "to": "model-ver",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "model-constraint",
-                       "to": "constrained-element-set",
-                       "label": "uses",
+                       "from": "named-query",
+                       "to": "model",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "l-interface",
-                       "to": "l-interface",
-                       "label": "has",
+                       "from": "named-query-element",
+                       "to": "named-query",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "lag-interface",
-                       "to": "p-interface",
-                       "label": "usesPInterface",
+                       "from": "named-query-element",
+                       "to": "model",
+                       "label": "org.onap.relationships.inventory.IsA",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "model-element",
-                       "to": "model-constraint",
-                       "label": "uses",
+                       "from": "named-query-element",
+                       "to": "named-query-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "connector",
-                       "to": "virtual-data-center",
-                       "label": "contains",
+                       "from": "property-constraint",
+                       "to": "named-query-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "model-element",
-                       "to": "model-element",
-                       "label": "connectsTo",
+                       "from": "related-lookup",
+                       "to": "named-query-element",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
-               {
-                       "from": "tenant",
-                       "to": "vserver",
-                       "label": "owns",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "!${direction}",
-                       "prevent-delete": "${direction}",
-                       "default": "true"
-               },
                 {
                         "from": "l-interface",
-                       "to": "vlan",
-                       "label": "hasVlan",
+                       "to": "newvce",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vpls-pe",
-                       "to": "ctag-pool",
-                       "label": "usesCtagPool",
+                       "from": "oam-network",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "instance-group",
-                       "to": "model",
-                       "label": "targets",
+                       "from": "oam-network",
+                       "to": "service-capability",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -1430,34 +1418,46 @@
                 },
                 {
                         "from": "service-instance",
-                       "to": "zone",
-                       "label": "locatedIn",
+                       "to": "owning-entity",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pnf",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "l-interface",
+                       "to": "p-interface",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "p-interface",
+                       "to": "logical-link",
+                       "label": "tosca.relationships.network.LinksTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "configuration",
-                       "to": "logical-link",
-                       "label": "has",
+                       "from": "p-interface",
+                       "to": "physical-link",
+                       "label": "tosca.relationships.network.LinksTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
@@ -1465,23 +1465,23 @@
                         "default": "true"
                 },
                 {
-                       "from": "configuration",
-                       "to": "logical-link",
-                       "label": "has",
+                       "from": "sriov-pf",
+                       "to": "p-interface",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "pnf",
-                       "label": "uses",
+                       "from": "platform",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1489,93 +1489,117 @@
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "ctag-assignment",
-                       "label": "hasCtagAssignment",
+                       "from": "lag-interface",
+                       "to": "pnf",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "instance-group",
-                       "label": "isMemberOf",
+                       "from": "p-interface",
+                       "to": "pnf",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "vf-module",
-                       "label": "isPartOf",
+                       "from": "pnf",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "complex",
-                       "to": "ctag-pool",
-                       "label": "hasCtagPool",
+                       "from": "pnf",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "constrained-element-set",
-                       "to": "element-choice-set",
-                       "label": "uses",
+                       "from": "pnf",
+                       "to": "zone",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "p-interface",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
+                       "from": "cvlan-tag",
+                       "to": "port-group",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "project",
+                       "to": "service-instance",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "image",
-                       "label": "hasImage",
+                       "from": "lag-interface",
+                       "to": "pserver",
+                       "label": "tosca.relationships.network.BindsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "p-interface",
+                       "to": "pserver",
+                       "label": "tosca.relationships.network.BindsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "pserver",
+                       "to": "availability-zone",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
@@ -1585,23 +1609,23 @@
                         "default": "true"
                 },
                 {
-                       "from": "tenant",
-                       "to": "l3-network",
-                       "label": "usesL3Network",
+                       "from": "pserver",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "volume-group",
+                       "from": "pserver",
                         "to": "complex",
-                       "label": "existsIn",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
@@ -1609,11 +1633,11 @@
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "cloud-region",
-                       "label": "existsIn",
+                       "from": "pserver",
+                       "to": "zone",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1621,47 +1645,47 @@
                         "default": "true"
                 },
                 {
-                       "from": "sriov-vf",
-                       "to": "sriov-pf",
-                       "label": "uses",
+                       "from": "site-pair",
+                       "to": "routing-instance",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "customer",
-                       "to": "service-subscription",
-                       "label": "subscribesTo",
+                       "from": "allotted-resource",
+                       "to": "service-instance",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "!${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "newvce",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
+                       "from": "metadatum",
+                       "to": "service-instance",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
+                       "from": "service-instance",
                         "to": "allotted-resource",
-                       "label": "bindsTo",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1669,9 +1693,21 @@
                         "default": "true"
                 },
                 {
-                       "from": "allotted-resource",
-                       "to": "l3-network",
-                       "label": "isPartOf",
+                       "from": "service-instance",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "service-instance",
+                       "to": "connector",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -1681,83 +1717,83 @@
                         "default": "true"
                 },
                 {
-                       "from": "p-interface",
-                       "to": "logical-link",
-                       "label": "usesLogicalLink",
+                       "from": "service-instance",
+                       "to": "ctag-assignment",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "availability-zone",
-                       "label": "existsIn",
+                       "from": "service-instance",
+                       "to": "cvlan-tag",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "complex",
-                       "label": "locatedIn",
+                       "from": "service-instance",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "model-ver",
-                       "to": "metadatum",
-                       "label": "hasMetaData",
+                       "from": "service-instance",
+                       "to": "logical-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "volume",
-                       "label": "hasVolume",
+                       "from": "service-instance",
+                       "to": "pnf",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "vip-ipv4-address-list",
-                       "label": "hasIpAddress",
+                       "from": "service-instance",
+                       "to": "service-instance",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "zone",
-                       "label": "isMemberOf",
+                       "from": "service-instance",
+                       "to": "vlan",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1765,11 +1801,11 @@
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "service-instance",
-                       "label": "hasInstance",
+                       "from": "service-instance",
+                       "to": "zone",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
@@ -1777,35 +1813,47 @@
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "availability-zone",
-                       "label": "has",
+                       "from": "service-instance",
+                       "to": "service-subscription",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "class-of-service",
+                       "to": "site-pair",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "site-pair",
-                       "to": "class-of-service",
-                       "label": "hasClassOfService",
+                       "from": "routing-instance",
+                       "to": "site-pair-set",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "instance-group",
-                       "label": "memberOf",
+                       "from": "sriov-vf",
+                       "to": "sriov-pf",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -1813,141 +1861,129 @@
                         "default": "true"
                 },
                 {
-                       "from": "element-choice-set",
-                       "to": "model-element",
-                       "label": "has",
+                       "from": "host-route",
+                       "to": "subnet",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "network-policy",
-                       "label": "uses",
+                       "from": "service-subscription",
+                       "to": "tenant",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "vnf-image",
-                       "label": "usesVnfImage",
+                       "from": "tenant",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vlan",
-                       "to": "logical-link",
-                       "label": "usesLogicalLink",
+                       "from": "vserver",
+                       "to": "tenant",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
+                       "from": "entitlement",
+                       "to": "vce",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "license",
-                       "label": "has",
+                       "from": "license",
+                       "to": "vce",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pnf",
-                       "to": "zone",
-                       "label": "isMemberOf",
+                       "from": "port-group",
+                       "to": "vce",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
                         "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true"
+               },
+               {
+                       "from": "service-instance",
+                       "to": "vce",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vnfc",
-                       "to": "vip-ipv4-address-list",
-                       "label": "uses",
+                       "from": "vce",
+                       "to": "availability-zone",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "lag-interface",
-                       "to": "logical-link",
-                       "label": "uses",
+                       "from": "vce",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "p-interface",
-                       "to": "sriov-pf",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "l3-interface-ipv6-address-list",
-                       "to": "subnet",
-                       "label": "isMemberOf",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "!${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "generic-vnf",
-                       "to": "volume-group",
-                       "label": "uses",
+                       "from": "vce",
+                       "to": "vserver",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
@@ -1957,57 +1993,45 @@
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
+                       "from": "vf-module",
                         "to": "l3-network",
-                       "label": "uses",
+                       "label": "org.onap.relationships.inventory.DependsOn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "group-assignment",
-                       "label": "has",
+                       "from": "vf-module",
+                       "to": "vnfc",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "group-assignment",
-                       "to": "tenant",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "l-interface",
-                       "to": "logical-link",
-                       "label": "usesLogicalLink",
+                       "from": "vf-module",
+                       "to": "volume-group",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2ONE",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "virtual-data-center",
-                       "to": "logical-link",
-                       "label": "contains",
+                       "from": "vip-ipv4-address-list",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -2017,21 +2041,21 @@
                         "default": "true"
                 },
                 {
-                       "from": "named-query-element",
-                       "to": "named-query-element",
-                       "label": "connectsTo",
+                       "from": "vip-ipv4-address-list",
+                       "to": "subnet",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "connector",
-                       "label": "uses",
+                       "from": "vip-ipv6-address-list",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -2041,23 +2065,23 @@
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "ctag-pool",
-                       "label": "usesCtagPool",
+                       "from": "vip-ipv6-address-list",
+                       "to": "subnet",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "pserver",
-                       "to": "cloud-region",
-                       "label": "locatedIn",
+                       "from": "generic-vnf",
+                       "to": "virtual-data-center",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
@@ -2065,141 +2089,105 @@
                         "default": "true"
                 },
                 {
-                       "from": "vf-module",
-                       "to": "l3-network",
-                       "label": "uses",
+                       "from": "logical-link",
+                       "to": "virtual-data-center",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "snapshot",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "cloud-region",
-                       "to": "tenant",
-                       "label": "has",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "vlan",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "!${direction}",
-                       "prevent-delete": "${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "cloud-region",
-                       "to": "image",
-                       "label": "has",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "${direction}",
-                       "default": "true"
-               },
-               {
-                       "from": "model-ver",
-                       "to": "model-element",
-                       "label": "startsWith",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "vlan",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "pnf",
-                       "to": "lag-interface",
-                       "label": "has",
+                       "from": "vlan",
+                       "to": "logical-link",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
                         "delete-other-v": "${direction}",
                         "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vserver",
-                       "to": "snapshot",
-                       "label": "uses",
+                       "from": "vlan",
+                       "to": "multicast-configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "named-query-element",
-                       "to": "property-constraint",
-                       "label": "uses",
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "vnfc",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-subscription",
-                       "to": "service-instance",
-                       "label": "hasInstance",
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "vnfc",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "!${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "logical-link",
-                       "label": "uses",
+                       "from": "vnfc",
+                       "to": "instance-group",
+                       "label": "org.onap.relationships.inventory.MemberOf",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
+                       "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "tenant",
-                       "to": "service-subscription",
-                       "label": "relatedTo",
+                       "from": "vnfc",
+                       "to": "vip-ipv4-address-list",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
                         "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
@@ -2209,11 +2197,11 @@
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "vlan",
-                       "label": "dependsOn",
+                       "from": "vnfc",
+                       "to": "vip-ipv6-address-list",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -2221,71 +2209,71 @@
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "metadatum",
-                       "label": "hasMetaData",
+                       "from": "tenant",
+                       "to": "volume-group",
+                       "label": "org.onap.relationships.inventory.DependsOn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "lag-link",
-                       "label": "usesLAGLink",
+                       "from": "volume-group",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
                         "from": "lag-interface",
-                       "to": "l-interface",
-                       "label": "hasLInterface",
+                       "to": "vpls-pe",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "named-query",
-                       "to": "named-query-element",
-                       "label": "startsWith",
+                       "from": "p-interface",
+                       "to": "vpls-pe",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "ctag-assignment",
-                       "label": "uses",
+                       "from": "vpls-pe",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "ipsec-configuration",
-                       "label": "uses",
+                       "from": "vpls-pe",
+                       "to": "ctag-pool",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
@@ -2293,95 +2281,95 @@
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "site-pair-set",
-                       "label": "hasSitePairSet",
+                       "from": "route-target",
+                       "to": "vpn-binding",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "model",
-                       "to": "model-ver",
-                       "label": "has",
+                       "from": "l-interface",
+                       "to": "vserver",
+                       "label": "tosca.relationships.network.BindsTo",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "connector",
-                       "to": "metadatum",
-                       "label": "hasMetaData",
+                       "from": "vf-module",
+                       "to": "vserver",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "network-profile",
-                       "label": "hasNetworkProfile",
+                       "from": "vnfc",
+                       "to": "vserver",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "!${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "vf-module",
-                       "to": "volume-group",
-                       "label": "uses",
+                       "from": "vserver",
+                       "to": "flavor",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "configuration",
-                       "label": "has",
+                       "from": "vserver",
+                       "to": "image",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "service-instance",
-                       "to": "configuration",
-                       "label": "has",
+                       "from": "vserver",
+                       "to": "pserver",
+                       "label": "tosca.relationships.HostedOn",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "SVC-INFRA": "${direction}",
+                       "prevent-delete": "!${direction}",
                         "default": "true"
                 },
                 {
-                       "from": "logical-link",
-                       "to": "logical-link",
-                       "label": "uses",
+                       "from": "vserver",
+                       "to": "snapshot",
+                       "label": "org.onap.relationships.inventory.Uses",
                         "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "ONE2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "${direction}",
@@ -2389,64 +2377,40 @@
                         "default": "true"
                 },
                 {
-                       "from": "vpls-pe",
-                       "to": "p-interface",
-                       "label": "hasPinterface",
+                       "from": "vserver",
+                       "to": "volume",
+                       "label": "tosca.relationships.AttachesTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "ONE2MANY",
                         "contains-other-v": "${direction}",
                         "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "SVC-INFRA": "${direction}",
                         "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "generic-vnf",
-                       "to": "license-key-resource",
-                       "label": "uses",
+                       "from": "metadatum",
+                       "to": "model-ver",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                         "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
+                       "prevent-delete": "NONE",
                         "default": "true"
                 },
                 {
-                       "from": "l3-network",
-                       "to": "vpn-binding",
-                       "label": "usesVpnBinding",
+                       "from": "zone",
+                       "to": "complex",
+                       "label": "org.onap.relationships.inventory.LocatedIn",
                         "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
+                       "multiplicity": "MANY2ONE",
                         "contains-other-v": "NONE",
                         "delete-other-v": "NONE",
                         "SVC-INFRA": "NONE",
                         "prevent-delete": "!${direction}",
                         "default": "true"
-               },
-               {
-                       "from": "complex",
-                       "to": "l3-network",
-                       "label": "usesL3Network",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "vlan",
-                       "to": "l3-interface-ipv6-address-list",
-                       "label": "hasIpAddress",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2MANY",
-                       "contains-other-v": "${direction}",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
-                       "prevent-delete": "NONE",
-                       "default": "true"
                 }
         ]
  }