Integrate aai-schema-ingest library into aai-core

[aai/aai-common.git] / aai-schema / src / main / resources / onap / dbedgerules / v14 / DbEdgeRules_v14.json

diff --git a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
similarity index 87%
rename from aai-core/src/main/resources/dbedgerules/DbEdgeRules_v14.json
rename to aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
index d684367..b407c87 100644 (file)
--- a/aai-core/src/main/resources/dbedgerules/DbEdgeRules_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_v14.json
@@ -1,78 +1,5 @@
 {
        "rules": [
-               {
-                       "from": "esr-system-info",
-                       "to": "esr-ems",
-                       "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": "esr-system-info",
-                       "to": "esr-vnfm",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "esr-system-info",
-                       "to": "esr-thirdparty-sdnc",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "esr-thirdparty-sdnc",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true"
-               },
-               {
-                       "from": "esr-system-info",
-                       "to": "cloud-region",
-                       "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": "allotted-resource",
-                       "to": "allotted-resource",
-                       "label": "tosca.relationships.network.BindsTo",
-                       "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
-                       "default": "true",
-                       "description":""
-               },
                {
                        "from": "allotted-resource",
                        "to": "generic-vnf",
@@ -81,7 +8,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -94,7 +20,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -107,7 +32,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -120,7 +44,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -133,7 +56,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -146,7 +68,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -159,7 +80,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -172,7 +92,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -185,7 +104,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -198,7 +116,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -211,7 +128,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -224,7 +140,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -237,7 +152,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -250,7 +164,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -263,7 +176,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -276,50 +188,10 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description":""
-               },
-               {
-                       "from": "hpa-capability",
-                       "to": "flavor",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "!${direction}",
-                       "default": "true",
-                       "description":""
-               },
-               {
-                       "from": "hpa-capability",
-                       "to": "cloud-region",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
-                       "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
                },
-               {
-                       "from": "hpa-feature-attributes",
-                       "to": "hpa-capability",
-                       "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",
-                       "description":""
-               },
                {
                        "from": "group-assignment",
                        "to": "cloud-region",
@@ -328,7 +200,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -341,7 +212,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -354,7 +224,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -367,7 +236,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -380,7 +248,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -393,7 +260,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -406,7 +272,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -419,7 +284,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -432,7 +296,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -445,7 +308,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -458,7 +320,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -471,7 +332,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -484,7 +344,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -497,7 +356,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -510,7 +368,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -523,7 +380,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -536,7 +392,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -549,7 +404,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -562,7 +416,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -575,7 +428,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -588,7 +440,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -601,7 +452,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -614,7 +464,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -627,7 +476,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -640,7 +488,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -653,7 +500,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -666,7 +512,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -679,24 +524,10 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
-               {
-                       "from": "generic-vnf",
-                       "to": "license-key-resource",
-                       "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",
-                       "description":""
-               },
                {
                        "from": "generic-vnf",
                        "to": "pnf",
@@ -705,7 +536,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -718,7 +548,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -731,7 +560,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -744,7 +572,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -757,7 +584,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -770,7 +596,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -783,7 +608,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -796,7 +620,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -809,7 +632,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -822,7 +644,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -835,7 +656,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -848,7 +668,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -861,7 +680,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -874,7 +692,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "${direction}",
                        "default": "true",
                        "description":""
@@ -887,7 +704,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -900,7 +716,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -913,7 +728,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -926,7 +740,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -939,7 +752,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -952,7 +764,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -965,7 +776,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -978,7 +788,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -991,7 +800,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1004,7 +812,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1017,7 +824,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1030,7 +836,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1043,7 +848,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1056,7 +860,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1069,7 +872,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1082,7 +884,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1095,7 +896,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1108,7 +908,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1121,7 +920,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1134,7 +932,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1147,7 +944,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1160,11 +956,22 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
+               {
+                       "from": "lag-interface",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "false",
+                       "description":""
+               },
                {
                        "from": "line-of-business",
                        "to": "generic-vnf",
@@ -1173,7 +980,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1186,7 +992,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1199,7 +1004,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1212,7 +1016,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1225,7 +1028,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1238,7 +1040,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1248,10 +1049,9 @@
                        "to": "l-interface",
                        "label": "org.onap.relationships.inventory.Source",
                        "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "false",
                        "description":""
@@ -1261,10 +1061,9 @@
                        "to": "l-interface",
                        "label": "org.onap.relationships.inventory.Destination",
                        "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "false",
                        "description":""
@@ -1277,7 +1076,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1290,7 +1088,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1303,7 +1100,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1316,7 +1112,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1329,7 +1124,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1342,7 +1136,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1355,7 +1148,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1368,7 +1160,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1381,7 +1172,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1394,7 +1184,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1407,7 +1196,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1420,7 +1208,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1433,7 +1220,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1446,7 +1232,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1459,7 +1244,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1472,7 +1256,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1485,7 +1268,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1498,7 +1280,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1511,7 +1292,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1524,7 +1304,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1537,7 +1316,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1550,7 +1328,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1563,7 +1340,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1576,7 +1352,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1589,7 +1364,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1602,7 +1376,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1612,10 +1385,9 @@
                        "to": "operational-environment",
                        "label": "org.onap.relationships.inventory.Uses",
                        "direction": "OUT",
-                       "multiplicity": "ONE2ONE",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1628,7 +1400,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1641,7 +1412,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1654,7 +1424,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1667,7 +1436,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1680,7 +1448,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1693,7 +1460,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1706,7 +1472,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1719,7 +1484,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1732,7 +1496,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1745,7 +1508,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1758,7 +1520,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1771,7 +1532,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1784,7 +1544,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1797,7 +1556,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1810,7 +1568,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1823,7 +1580,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1836,7 +1592,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1849,7 +1604,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -1862,7 +1616,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1875,7 +1628,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1888,7 +1640,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1901,7 +1652,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1914,7 +1664,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1927,7 +1676,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1940,7 +1688,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1953,7 +1700,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1966,7 +1712,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1979,7 +1724,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -1989,10 +1733,9 @@
                        "to": "logical-link",
                        "label": "org.onap.relationships.inventory.Uses",
                        "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2005,7 +1748,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2018,7 +1760,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2031,7 +1772,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2044,7 +1784,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2057,7 +1796,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2070,7 +1808,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2083,7 +1820,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2096,7 +1832,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2109,7 +1844,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2122,7 +1856,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2135,7 +1868,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2148,7 +1880,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2161,7 +1892,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2174,7 +1904,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2187,7 +1916,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2200,7 +1928,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2213,7 +1940,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2226,7 +1952,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2239,7 +1964,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2252,7 +1976,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2265,7 +1988,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "${direction}",
                        "default": "true",
                        "description":""
@@ -2278,7 +2000,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2291,7 +2012,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2304,7 +2024,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2317,7 +2036,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2330,7 +2048,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2343,7 +2060,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2356,7 +2072,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2369,7 +2084,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2382,7 +2096,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2395,7 +2108,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2408,7 +2120,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2421,7 +2132,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2434,7 +2144,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2447,7 +2156,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2460,7 +2168,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2473,7 +2180,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2486,7 +2192,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2499,7 +2204,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2512,7 +2216,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2525,7 +2228,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2538,7 +2240,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2551,7 +2252,6 @@
                        "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2564,7 +2264,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2577,7 +2276,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2590,7 +2288,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2603,7 +2300,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2616,7 +2312,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2629,7 +2324,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2642,7 +2336,6 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
@@ -2655,7 +2348,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2668,7 +2360,6 @@
                        "multiplicity": "ONE2MANY",
                        "contains-other-v": "${direction}",
                        "delete-other-v": "${direction}",
-                       "SVC-INFRA": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
@@ -2681,233 +2372,263 @@
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "allotted-resource",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "configuration",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
+                       "multiplicity": "ONE2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "generic-vnf",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "configuration",
+                       "to": "pnf",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "l3-network",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "forwarder",
+                       "to": "forwarding-path",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
-                       "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "logical-link",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "forwarding-path",
+                       "to": "service-instance",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
+                       "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "!${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "service-instance",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "forwarder",
+                       "to": "l-interface",
+                       "label": "org.onap.relationships.inventory.ForwardsTo",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "vf-module",
-                       "to": "model-ver",
-                       "label": "org.onap.relationships.inventory.IsA",
+                       "from": "forwarder",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
                        "direction": "OUT",
-                       "multiplicity": "Many2One",
+                       "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "configuration",
-                       "to": "l-interface",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
+                       "from": "forwarding-path",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.Uses",
                        "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "${direction}",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "configuration",
-                       "to": "pnf",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
+                       "from": "forwarder",
+                       "to": "lag-interface",
+                       "label": "org.onap.relationships.inventory.ForwardsTo",
                        "direction": "OUT",
-                       "multiplicity": "ONE2MANY",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarder",
-                       "to": "forwarding-path",
+                       "from": "evc",
+                       "to": "configuration",
                        "label": "org.onap.relationships.inventory.BelongsTo",
                        "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "ONE2ONE",
                        "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarding-path",
-                       "to": "service-instance",
-                       "label": "org.onap.relationships.inventory.AppliesTo",
+                       "from": "forwarder-evc",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
                        "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
-                       "contains-other-v": "NONE",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "!${direction}",
                        "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
                        "from": "forwarder",
-                       "to": "l-interface",
+                       "to": "p-interface",
                        "label": "org.onap.relationships.inventory.ForwardsTo",
                        "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "generic-vnf",
+                       "to": "nos-server",
+                       "label": "tosca.relationships.HostedOn",
+                       "direction": "OUT",
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarder",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
+                       "from": "nos-server",
+                       "to": "pserver",
+                       "label": "tosca.relationships.HostedOn",
                        "direction": "OUT",
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
-                       "prevent-delete": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "!${direction}",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarding-path",
+                       "from": "nos-server",
+                       "to": "tenant",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "!${direction}",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "configuration",
                        "to": "configuration",
-                       "label": "org.onap.relationships.inventory.Uses",
+                       "label": "tosca.relationships.network.BindsTo",
                        "direction": "OUT",
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
-                       "delete-other-v": "${direction}",
-                       "SVC-INFRA": "NONE",
+                       "delete-other-v": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarder",
-                       "to": "lag-interface",
-                       "label": "org.onap.relationships.inventory.ForwardsTo",
+                       "from": "configuration",
+                       "to": "vpn-binding",
+                       "label": "org.onap.relationships.inventory.Uses",
                        "direction": "OUT",
                        "multiplicity": "MANY2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "evc",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "from": "configuration",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.PartOf",
                        "direction": "OUT",
                        "multiplicity": "ONE2ONE",
-                       "contains-other-v": "!${direction}",
-                       "delete-other-v": "!${direction}",
-                       "SVC-INFRA": "NONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarder-evc",
-                       "to": "configuration",
-                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "from": "vpn-binding",
+                       "to": "customer",
+                       "label": "org.onap.relationships.inventory.Uses",
                        "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",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description":""
                },
                {
-                       "from": "forwarder",
-                       "to": "p-interface",
-                       "label": "org.onap.relationships.inventory.ForwardsTo",
+                       "from": "service-instance",
+                       "to": "configuration",
+                       "label": "org.onap.relationships.inventory.ComposedOf",
                        "direction": "OUT",
-                       "multiplicity": "MANY2ONE",
+                       "multiplicity": "MANY2MANY",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
-                       "default": "true",
+                       "default": "false",
                        "description":""
                },
                {
+                       "from": "forwarder",
+                       "to": "generic-vnf",
+                       "label": "org.onap.relationships.inventory.AppliesTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description": "Points to the generic-vnf(s) involved in this forwarding step."
+               },
+        {
+            "from": "cloud-region",
+            "to": "instance-group",
+            "label": "org.onap.relationships.inventory.Uses",
+            "direction": "OUT",
+            "multiplicity": "ONE2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+         },
+                {
                        "from": "collection",
                        "to": "instance-group",
                        "label": "org.onap.relationships.inventory.MemberOf",
@@ -2915,7 +2636,6 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description": ""
@@ -2928,10 +2648,337 @@
                        "multiplicity": "ONE2ONE",
                        "contains-other-v": "NONE",
                        "delete-other-v": "NONE",
-                       "SVC-INFRA": "NONE",
                        "prevent-delete": "NONE",
                        "default": "true",
                        "description": ""
-                }
+                },
+                {
+                       "from": "vlan-mapping",
+                       "to": "forwarder-evc",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description": ""
+                },
+         {
+             "from": "allotted-resource",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "configuration",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "connector",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "generic-vnf",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "instance-group",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "l3-network",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "logical-link",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "service-instance",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "vf-module",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+         {
+             "from": "vnfc",
+             "to": "model-ver",
+             "label": "org.onap.relationships.inventory.IsA",
+             "direction": "OUT",
+             "multiplicity": "MANY2ONE",
+             "contains-other-v": "NONE",
+             "delete-other-v": "NONE",
+             "SVC-INFRA": "NONE",
+             "prevent-delete": "!${direction}",
+             "private": "true"
+         },
+               {
+                       "from": "pnf",
+                       "to": "model-ver",
+                       "label": "org.onap.relationships.inventory.IsA",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
+                       "private": "true"
+               },
+               {
+                       "from": "collection",
+                       "to": "model-ver",
+                       "label": "org.onap.relationships.inventory.IsA",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "!${direction}",
+                       "private": "true"
+               },
+               {
+                       "from": "configuration",
+                       "to": "vnfc",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "!${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vnfc",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2MANY",
+                       "contains-other-v": "${direction}",
+                       "delete-other-v": "${direction}",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":"cp is child of vnfc"
+               },
+               {
+                       "from": "l3-interface-ipv4-address-list",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "l3-interface-ipv6-address-list",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vip-ipv4-address-list",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vip-ipv6-address-list",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.network.MemberOf",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "!${direction}",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vlan-tag",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vlan-tag",
+                       "to": "cloud-region",
+                       "label": "org.onap.relationships.inventory.BelongsTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "vlan-tag",
+                       "to": "cp",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "l-interface",
+                       "to": "cp",
+                       "label": "tosca.relationships.network.LinksTo",
+                       "direction": "OUT",
+                       "multiplicity": "ONE2ONE",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "l3-network",
+                       "to": "cp",
+                       "label": "tosca.relationships.network.LinksTo",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "line-of-business",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "platform",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               },
+               {
+                       "from": "l3-network",
+                       "to": "l3-network",
+                       "label": "org.onap.relationships.inventory.Uses",
+                       "direction": "OUT",
+                       "multiplicity": "MANY2MANY",
+                       "contains-other-v": "NONE",
+                       "delete-other-v": "NONE",
+                       "SVC-INFRA": "NONE",
+                       "prevent-delete": "NONE",
+                       "default": "true",
+                       "description":""
+               }
+               
        ]
 }