Sync the latest code changes

Issue-ID: AAI-493

Change-Id: I5f39ce9bb19cfb9607b659bed82066cae7569ecc
Signed-off-by: Venkata Harish K Kajur <vk250x@att.com>

1 files changed, 787 insertions, 787 deletions

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
index 9997468f..0e9eebb0 100644
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
+++ b/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v8.json
@@ -1,261 +1,273 @@
 {
 	"rules": [
 		{
-			"from": "ipsec-configuration",
-			"to": "vig-server",
-			"label": "hasVigServer",
+			"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": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "vlan",
-			"to": "multicast-configuration",
-			"label": "uses",
+			"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": "NONE",
-			"prevent-delete": "NONE",
-			"default": "true"
-		},
-		{
-			"from": "generic-vnf",
-			"to": "lag-interface",
-			"label": "hasLAGInterface",
-			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "model-constraint",
-			"to": "constrained-element-set",
-			"label": "uses",
+			"from": "availability-zone",
+			"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": "!${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "vf-module",
-			"label": "has",
+			"from": "cloud-region",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "lag-interface",
-			"to": "p-interface",
-			"label": "usesPInterface",
+			"from": "cloud-region",
+			"to": "l3-network",
+			"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": "model-element",
-			"to": "model-constraint",
-			"label": "uses",
+			"from": "dvs-switch",
+			"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": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "connector",
-			"to": "virtual-data-center",
-			"label": "contains",
+			"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": "model-element",
-			"to": "model-element",
-			"label": "connectsTo",
+			"from": "group-assignment",
+			"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": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "tenant",
-			"to": "vserver",
-			"label": "owns",
+			"from": "image",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "!${direction}",
-			"prevent-delete": "${direction}",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "vserver",
-			"to": "flavor",
-			"label": "hasFlavor",
+			"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": "${direction}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "l-interface",
-			"to": "vlan",
-			"label": "hasVlan",
+			"from": "snapshot",
+			"to": "cloud-region",
+			"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": "NONE",
 			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "l-interface",
-			"to": "l3-interface-ipv4-address-list",
-			"label": "hasIpAddress",
+			"from": "tenant",
+			"to": "cloud-region",
+			"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": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "model",
-			"to": "metadatum",
-			"label": "hasMetaData",
+			"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": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "vpls-pe",
-			"to": "ctag-pool",
-			"label": "usesCtagPool",
+			"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": "ctag-pool",
+			"to": "complex",
+			"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": "vserver",
-			"to": "vnfc",
-			"label": "hosts",
+			"from": "connector",
+			"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}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "volume-group",
-			"label": "has",
+			"from": "metadatum",
+			"to": "connector",
+			"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": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "l3-network",
-			"to": "ctag-assignment",
-			"label": "hasCtagAssignment",
+			"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}",
-			"SVC-INFRA": "${direction}",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "vce",
-			"to": "service-instance",
-			"label": "hasServiceInstance",
+			"from": "ctag-pool",
+			"to": "availability-zone",
+			"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": "service-subscription",
+			"to": "customer",
+			"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": "service-instance",
-			"label": "dependsOn",
+			"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",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "flavor",
-			"label": "has",
+			"from": "model-element",
+			"to": "element-choice-set",
+			"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": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
 			"from": "generic-vnf",
-			"to": "pserver",
-			"label": "runsOnPserver",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -265,11 +277,11 @@
 			"default": "true"
 		},
 		{
-			"from": "logical-link",
-			"to": "pnf",
-			"label": "bridgedTo",
+			"from": "generic-vnf",
+			"to": "ipsec-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
@@ -277,117 +289,117 @@
 			"default": "true"
 		},
 		{
-			"from": "virtual-data-center",
-			"to": "generic-vnf",
-			"label": "hasVNF",
+			"from": "generic-vnf",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "!${direction}",
+			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "pnf",
-			"to": "p-interface",
-			"label": "hasPinterface",
+			"from": "generic-vnf",
+			"to": "license-key-resource",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "vserver",
-			"to": "vf-module",
-			"label": "isPartOf",
+			"from": "generic-vnf",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "complex",
-			"to": "ctag-pool",
-			"label": "hasCtagPool",
+			"from": "vnfc",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "!${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "constrained-element-set",
-			"to": "element-choice-set",
-			"label": "uses",
+			"from": "generic-vnf",
+			"to": "vnf-image",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "p-interface",
-			"to": "l-interface",
-			"label": "hasLInterface",
+			"from": "generic-vnf",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "p-interface",
-			"to": "physical-link",
-			"label": "usesPhysicalLink",
+			"from": "generic-vnf",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "vserver",
-			"to": "image",
-			"label": "hasImage",
+			"from": "lag-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "pnf",
-			"to": "complex",
-			"label": "locatedIn",
+			"from": "l-interface",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "tenant",
-			"to": "l3-network",
-			"label": "usesL3Network",
+			"from": "network-profile",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.AppliesTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -397,119 +409,119 @@
 			"default": "true"
 		},
 		{
-			"from": "l3-interface-ipv4-address-list",
-			"to": "subnet",
-			"label": "isMemberOf",
+			"from": "service-instance",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.ComposedOf",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "volume-group",
-			"to": "complex",
-			"label": "existsIn",
+			"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": "${direction}",
-			"prevent-delete": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "oam-network",
-			"to": "service-capability",
-			"label": "supportsServiceCapability",
+			"from": "vf-module",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true"
+		},
+		{
+			"from": "pserver",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"prevent-delete": "${direction}",
 			"default": "true"
 		},
 		{
-			"from": "customer",
-			"to": "service-subscription",
-			"label": "subscribesTo",
+			"from": "tenant",
+			"to": "group-assignment",
+			"label": "org.onap.relationships.inventory.MemberOf",
 			"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": "l3-network",
-			"to": "segmentation-assignment",
-			"label": "has",
+			"from": "metadatum",
+			"to": "image",
+			"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": "named-query-element",
-			"to": "related-lookup",
-			"label": "uses",
+			"from": "vig-server",
+			"to": "ipsec-configuration",
+			"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": "pserver",
-			"to": "p-interface",
-			"label": "hasPinterface",
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
 			"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": "newvce",
-			"to": "l-interface",
-			"label": "hasLInterface",
+			"from": "l3-interface-ipv4-address-list",
+			"to": "subnet",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE",
-			"default": "true"
-		},
-		{
-			"from": "p-interface",
-			"to": "logical-link",
-			"label": "usesLogicalLink",
-			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "vserver",
-			"label": "runsOnVserver",
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.network.MemberOf",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
@@ -517,11 +529,11 @@
 			"default": "true"
 		},
 		{
-			"from": "pserver",
-			"to": "availability-zone",
-			"label": "existsIn",
+			"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": "${direction}",
@@ -529,47 +541,47 @@
 			"default": "true"
 		},
 		{
-			"from": "vpls-pe",
-			"to": "lag-interface",
-			"label": "hasLAGinterface",
+			"from": "ctag-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"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": "generic-vnf",
-			"to": "vnfc",
-			"label": "uses",
+			"from": "l3-network",
+			"to": "network-policy",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
-			"delete-other-v": "${direction}",
+			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
 			"from": "l3-network",
-			"to": "service-instance",
-			"label": "hasInstance",
+			"to": "route-table-reference",
+			"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": "named-query",
-			"to": "model",
-			"label": "relatedTo",
+			"from": "l3-network",
+			"to": "vpn-binding",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
@@ -577,189 +589,153 @@
 			"default": "true"
 		},
 		{
-			"from": "vf-module",
-			"to": "vnfc",
-			"label": "uses",
-			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "${direction}",
-			"default": "true"
-		},
-		{
-			"from": "pserver",
-			"to": "complex",
-			"label": "locatedIn",
+			"from": "segmentation-assignment",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
-			"prevent-delete": "!${direction}",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "availability-zone",
-			"to": "service-capability",
-			"label": "supportsServiceCapability",
+			"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",
-			"prevent-delete": "!${direction}",
-			"default": "true"
-		},
-		{
-			"from": "vserver",
-			"to": "volume",
-			"label": "hasVolume",
-			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "l3-interface-ipv4-address-list",
+			"from": "subnet",
 			"to": "l3-network",
-			"label": "isMemberOf",
+			"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": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "service-instance",
-			"label": "hasInstance",
+			"from": "lag-interface",
+			"to": "lag-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": "l3-network",
-			"to": "route-table-reference",
-			"label": "uses",
+			"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": "model-element",
-			"to": "constrained-element-set",
-			"label": "connectsTo",
+			"from": "l-interface",
+			"to": "lag-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"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": "dvs-switch",
-			"to": "availability-zone",
-			"label": "existsIn",
-			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
-			"default": "true"
-		},
-		{
-			"from": "pserver",
-			"to": "lag-interface",
-			"label": "hasLAGInterface",
+			"from": "l3-interface-ipv4-address-list",
+			"to": "l-interface",
+			"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": "cloud-region",
-			"to": "availability-zone",
-			"label": "has",
+			"from": "l3-interface-ipv6-address-list",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"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": "vpls-pe",
-			"to": "complex",
-			"label": "locatedIn",
+			"from": "l-interface",
+			"to": "logical-link",
+			"label": "tosca.relationships.network.LinksTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"delete-other-v": "${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "site-pair",
-			"to": "class-of-service",
-			"label": "hasClassOfService",
+			"from": "sriov-vf",
+			"to": "l-interface",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "element-choice-set",
-			"to": "model-element",
-			"label": "has",
+			"from": "vlan",
+			"to": "l-interface",
+			"label": "tosca.relationships.network.LinksTo",
 			"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": "ctag-pool",
-			"to": "availability-zone",
-			"label": "supportsAvailabilityZone",
+			"from": "logical-link",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "l3-network",
-			"to": "network-policy",
-			"label": "uses",
+			"from": "logical-link",
+			"to": "lag-link",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -769,95 +745,95 @@
 			"default": "true"
 		},
 		{
-			"from": "vce",
-			"to": "port-group",
-			"label": "hasPortGroup",
+			"from": "logical-link",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "vce",
-			"to": "complex",
-			"label": "locatedIn",
+			"from": "logical-link",
+			"to": "pnf",
+			"label": "org.onap.relationships.inventory.BridgedTo",
 			"direction": "OUT",
 			"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": "generic-vnf",
-			"to": "vnf-image",
-			"label": "usesVnfImage",
+			"from": "logical-link",
+			"to": "pserver",
+			"label": "org.onap.relationships.inventory.BridgedTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "site-pair-set",
-			"to": "routing-instance",
-			"label": "hasRoutingInstance",
+			"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": "vlan",
-			"to": "logical-link",
-			"label": "usesLogicalLink",
+			"from": "constrained-element-set",
+			"to": "model-element",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
-			"contains-other-v": "NONE",
-			"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": "l-interface",
-			"label": "hasLInterface",
+			"from": "model-constraint",
+			"to": "model-element",
+			"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": "l-interface",
-			"to": "l3-interface-ipv6-address-list",
-			"label": "hasIpAddress",
+			"from": "model-element",
+			"to": "model-element",
+			"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": "vce",
-			"to": "availability-zone",
-			"label": "hasAvailabilityZone",
+			"from": "named-query",
+			"to": "model",
+			"label": "org.onap.relationships.inventory.AppliesTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "NONE",
@@ -865,285 +841,273 @@
 			"default": "true"
 		},
 		{
-			"from": "vce",
-			"to": "vserver",
-			"label": "runsOnVserver",
+			"from": "named-query-element",
+			"to": "named-query",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
+			"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",
+			"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}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "volume-group",
-			"label": "uses",
+			"from": "named-query-element",
+			"to": "named-query-element",
+			"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": "logical-link",
-			"to": "pserver",
-			"label": "bridgedTo",
+			"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": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "oam-network",
-			"label": "has",
+			"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": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "dvs-switch",
-			"label": "has",
+			"from": "l-interface",
+			"to": "newvce",
+			"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": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "l3-network",
-			"label": "uses",
+			"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",
-			"default": "true"
-		},
-		{
-			"from": "cloud-region",
-			"to": "group-assignment",
-			"label": "has",
-			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "${direction}",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "group-assignment",
-			"to": "tenant",
-			"label": "has",
+			"from": "oam-network",
+			"to": "service-capability",
+			"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": "l-interface",
-			"to": "logical-link",
-			"label": "usesLogicalLink",
+			"to": "p-interface",
+			"label": "tosca.relationships.network.BindsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"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": "virtual-data-center",
+			"from": "p-interface",
 			"to": "logical-link",
-			"label": "contains",
+			"label": "tosca.relationships.network.LinksTo",
 			"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": "named-query-element",
-			"to": "named-query-element",
-			"label": "connectsTo",
+			"from": "p-interface",
+			"to": "physical-link",
+			"label": "tosca.relationships.network.LinksTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "service-instance",
-			"to": "connector",
-			"label": "uses",
+			"from": "lag-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": "lag-interface",
-			"to": "lag-link",
-			"label": "usesLAGLink",
+			"from": "p-interface",
+			"to": "pnf",
+			"label": "tosca.relationships.network.BindsTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"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": "pserver",
-			"to": "cloud-region",
-			"label": "locatedIn",
+			"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": "logical-link",
-			"to": "generic-vnf",
-			"label": "bridgedTo",
+			"from": "cvlan-tag",
+			"to": "port-group",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"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": "vf-module",
-			"to": "l3-network",
-			"label": "uses",
+			"from": "lag-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
 			"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": "l-interface",
-			"to": "sriov-vf",
-			"label": "has",
+			"from": "p-interface",
+			"to": "pserver",
+			"label": "tosca.relationships.network.BindsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
-			"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": "named-query-element",
-			"to": "model",
-			"label": "isA",
+			"from": "pserver",
+			"to": "availability-zone",
+			"label": "org.onap.relationships.inventory.MemberOf",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
 			"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": "pserver",
+			"to": "cloud-region",
+			"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": "!${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "snapshot",
-			"label": "has",
+			"from": "pserver",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "${direction}",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "tenant",
-			"label": "has",
+			"from": "site-pair",
+			"to": "routing-instance",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2MANY",
-			"contains-other-v": "${direction}",
-			"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": "cloud-region",
-			"to": "image",
-			"label": "has",
+			"from": "metadatum",
+			"to": "service-instance",
+			"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": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
 			"from": "service-instance",
-			"to": "cvlan-tag",
-			"label": "hasIPAGFacingVLAN",
+			"to": "connector",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -1153,93 +1117,105 @@
 			"default": "true"
 		},
 		{
-			"from": "vserver",
-			"to": "l-interface",
-			"label": "hasLInterface",
+			"from": "service-instance",
+			"to": "cvlan-tag",
+			"label": "org.onap.relationships.inventory.ComposedOf",
 			"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": "pnf",
-			"to": "lag-interface",
-			"label": "has",
+			"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": "${direction}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "vserver",
-			"to": "snapshot",
-			"label": "uses",
+			"from": "service-instance",
+			"to": "service-instance",
+			"label": "org.onap.relationships.inventory.ComposedOf",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "${direction}",
+			"SVC-INFRA": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "model-element",
-			"to": "model",
-			"label": "isA",
+			"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",
-			"prevent-delete": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "named-query-element",
-			"to": "property-constraint",
-			"label": "uses",
+			"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": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "service-subscription",
-			"to": "service-instance",
-			"label": "hasInstance",
+			"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}",
-			"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": "service-subscription",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.Uses",
 			"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",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -1250,44 +1226,56 @@
 		},
 		{
 			"from": "vserver",
-			"to": "pserver",
-			"label": "runsOnPserver",
+			"to": "tenant",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
 			"multiplicity": "MANY2ONE",
-			"contains-other-v": "NONE",
+			"contains-other-v": "!${direction}",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
+			"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": "vlan",
-			"label": "dependsOn",
+			"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": "service-instance",
-			"to": "metadatum",
-			"label": "hasMetaData",
+			"from": "vce",
+			"to": "availability-zone",
+			"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": "NONE",
-			"prevent-delete": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "availability-zone",
-			"label": "hasAvailabilityZone",
+			"from": "vce",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -1297,11 +1285,11 @@
 			"default": "true"
 		},
 		{
-			"from": "logical-link",
-			"to": "lag-link",
-			"label": "usesLAGLink",
+			"from": "vce",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
@@ -1309,45 +1297,45 @@
 			"default": "true"
 		},
 		{
-			"from": "l3-network",
-			"to": "subnet",
-			"label": "hasSubnet",
+			"from": "vf-module",
+			"to": "l3-network",
+			"label": "org.onap.relationships.inventory.DependsOn",
 			"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": "${direction}",
 			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "volume-group",
-			"to": "tenant",
-			"label": "belongsTo",
+			"from": "vf-module",
+			"to": "vnfc",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
 			"SVC-INFRA": "${direction}",
-			"prevent-delete": "NONE",
+			"prevent-delete": "${direction}",
 			"default": "true"
 		},
 		{
-			"from": "cloud-region",
-			"to": "complex",
-			"label": "locatedIn",
+			"from": "vf-module",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+			"multiplicity": "ONE2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
 			"from": "generic-vnf",
-			"to": "l3-network",
-			"label": "usesL3Network",
+			"to": "virtual-data-center",
+			"label": "org.onap.relationships.inventory.LocatedIn",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -1357,57 +1345,57 @@
 			"default": "true"
 		},
 		{
-			"from": "availability-zone",
-			"to": "complex",
-			"label": "groupsResourcesIn",
+			"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": "NONE",
-			"prevent-delete": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "lag-interface",
-			"to": "l-interface",
-			"label": "hasLInterface",
+			"from": "l3-interface-ipv4-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": "named-query",
-			"to": "named-query-element",
-			"label": "startsWith",
+			"from": "l3-interface-ipv6-address-list",
+			"to": "vlan",
+			"label": "org.onap.relationships.inventory.BelongsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
-			"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": "generic-vnf",
-			"to": "ipsec-configuration",
-			"label": "uses",
+			"from": "vlan",
+			"to": "logical-link",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2ONE",
+			"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": "site-pair-set",
-			"label": "hasSitePairSet",
+			"from": "vlan",
+			"to": "multicast-configuration",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
 			"multiplicity": "MANY2MANY",
 			"contains-other-v": "NONE",
@@ -1417,191 +1405,203 @@
 			"default": "true"
 		},
 		{
-			"from": "model",
-			"to": "model-element",
-			"label": "startsWith",
+			"from": "tenant",
+			"to": "volume-group",
+			"label": "org.onap.relationships.inventory.DependsOn",
 			"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": "connector",
-			"to": "metadatum",
-			"label": "hasMetaData",
+			"from": "volume-group",
+			"to": "complex",
+			"label": "org.onap.relationships.inventory.LocatedIn",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
-			"prevent-delete": "NONE",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "generic-vnf",
-			"to": "network-profile",
-			"label": "hasNetworkProfile",
+			"from": "lag-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
 			"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": "vf-module",
-			"to": "volume-group",
-			"label": "uses",
+			"from": "p-interface",
+			"to": "vpls-pe",
+			"label": "tosca.relationships.network.BindsTo",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
-			"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": "logical-link",
-			"to": "logical-link",
-			"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": "${direction}",
-			"prevent-delete": "NONE",
+			"SVC-INFRA": "NONE",
+			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "l3-interface-ipv6-address-list",
-			"to": "l3-network",
-			"label": "isMemberOf",
+			"from": "vpls-pe",
+			"to": "ctag-pool",
+			"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": "port-group",
-			"to": "cvlan-tag",
-			"label": "hasCTag",
+			"from": "l-interface",
+			"to": "vserver",
+			"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": "vpls-pe",
-			"to": "p-interface",
-			"label": "hasPinterface",
+			"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": "image",
-			"to": "metadatum",
-			"label": "hasMetaDatum",
+			"from": "vnfc",
+			"to": "vserver",
+			"label": "tosca.relationships.HostedOn",
 			"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": "license-key-resource",
-			"label": "uses",
+			"from": "vserver",
+			"to": "flavor",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
+			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "l3-network",
-			"to": "vpn-binding",
-			"label": "usesVpnBinding",
+			"from": "vserver",
+			"to": "image",
+			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
 			"delete-other-v": "NONE",
-			"SVC-INFRA": "NONE",
+			"SVC-INFRA": "${direction}",
 			"prevent-delete": "!${direction}",
 			"default": "true"
 		},
 		{
-			"from": "complex",
-			"to": "l3-network",
-			"label": "usesL3Network",
+			"from": "model-element",
+			"to": "model",
+			"label": "isA",
 			"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": "oam-network",
-			"to": "complex",
-			"label": "definedFor",
+			"from": "model",
+			"to": "model-element",
+			"label": "startsWith",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "NONE",
-			"delete-other-v": "NONE",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "${direction}",
+			"delete-other-v": "${direction}",
 			"SVC-INFRA": "NONE",
-			"prevent-delete": "!${direction}",
+			"prevent-delete": "NONE",
 			"default": "true"
 		},
 		{
-			"from": "vlan",
-			"to": "l3-interface-ipv4-address-list",
-			"label": "hasIpAddress",
+			"from": "metadatum",
+			"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": "vserver",
+			"to": "pserver",
+			"label": "tosca.relationships.HostedOn",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
-			"contains-other-v": "${direction}",
-			"delete-other-v": "${direction}",
-			"SVC-INFRA": "NONE",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"SVC-INFRA": "${direction}",
+			"prevent-delete": "!${direction}",
+			"default": "true"
+		},
+		{
+			"from": "vserver",
+			"to": "snapshot",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"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",
+			"from": "vserver",
+			"to": "volume",
+			"label": "tosca.relationships.AttachesTo",
 			"direction": "OUT",
-			"multiplicity": "MANY2MANY",
+			"multiplicity": "ONE2MANY",
 			"contains-other-v": "${direction}",
 			"delete-other-v": "${direction}",
 			"SVC-INFRA": "${direction}",