Add support for vlan range and vlan tag

Also sync up the older versions to match internal

Issue-ID: AAI-3127
Change-Id: I7cfcf576ae151b6bad7a08f7d18f0e48db8d667b
Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>

6 files changed, 488 insertions, 3 deletions

diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
index 2d448aa..34dc328 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v15/DbEdgeRules_v15.json
@@ -3166,6 +3166,72 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""		
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
 		}
 		
 	]
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
index 2d448aa..7c905db 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v16/DbEdgeRules_v16.json
@@ -3166,7 +3166,72 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""		
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
 		}
-		
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
index 2d448aa..34dc328 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v17/DbEdgeRules_v17.json
@@ -3166,6 +3166,72 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""		
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
 		}
 		
 	]
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
index 61c6887..1f33c7b 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v18/DbEdgeRules_v18.json
@@ -3188,6 +3188,72 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
 		}
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
index 4c74bb0..575c853 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v19/DbEdgeRules_v19.json
@@ -3261,6 +3261,72 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
 		}
 	]
 }
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
index 5067fd3..ee10797 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v20/DbEdgeRules_v20.json
@@ -289,6 +289,18 @@
 			"description":""
 		},
 		{
+ 			"from": "line-of-business",
+ 			"to": "cloud-region",
+ 			"label": "org.onap.relationships.inventory.Uses",
+ 			"direction": "OUT",
+ 			"multiplicity": "MANY2MANY",
+ 			"contains-other-v": "NONE",
+ 			"delete-other-v": "NONE",
+ 			"prevent-delete": "NONE",
+ 			"default": "true",
+ 			"description":""
+		},
+		{
 			"from": "volume-group",
 			"to": "cloud-region",
 			"label": "org.onap.relationships.inventory.BelongsTo",
@@ -329,9 +341,9 @@
 			"to": "allotted-resource",
 			"label": "org.onap.relationships.inventory.Uses",
 			"direction": "OUT",
-			"multiplicity": "ONE2ONE",
+			"multiplicity": "MANY2ONE",
 			"contains-other-v": "NONE",
-			"delete-other-v": "${direction}",
+			"delete-other-v": "NONE",
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
@@ -3278,6 +3290,18 @@
 			"description":""
 		},
 		{
+                        "from": "configuration",
+                        "to": "lag-interface",
+                        "label": "org.onap.relationships.inventory.AppliesTo",
+                        "direction": "OUT",
+                        "multiplicity": "MANY2ONE",
+                        "contains-other-v": "NONE",
+                        "delete-other-v": "NONE",
+                        "prevent-delete": "NONE",
+                        "default": "true",
+                        "description":""
+                },
+		{
 			"from": "communication-service-profile",
 			"to": "service-instance",
 			"label": "org.onap.relationships.inventory.BelongsTo",
@@ -3359,6 +3383,138 @@
 			"prevent-delete": "NONE",
 			"default": "true",
 			"description":""
+		},{
+			"from": "vlan-tag",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan-tag belongs to a vlan-range."
+		},{
+			"from": "l3-network",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A l3-network Uses vlan-tag."
+		},{
+			"from": "l-interface",
+			"to": "vlan-tag",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "!${direction}",
+			"default": "true",
+			"description":"An sub-interface that uses a vlan-tag."
+		},{
+			"from": "vlan-range",
+			"to": "cloud-region",
+			"label": "org.onap.relationships.inventory.BelongsTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "!${direction}",
+			"delete-other-v": "!${direction}",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A vlan range belongs to a cloud-region."
+		},{
+			"from": "owning-entity",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"An owning-entity uses a vlan-range."
+		},{
+			"from": "line-of-business",
+			"to": "vlan-range",
+			"label": "org.onap.relationships.inventory.Uses",
+			"direction": "OUT",
+			"multiplicity": "ONE2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description":"A line-of uses a vlan-range"
+		},{
+			"from": "fqdn",
+			"to": "l3-interface-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a l3-interface-ipv4-address-list."
+		},{
+			"from": "fqdn",
+			"to": "l3-interface-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a l3-interface-ipv6-address-list."
+		},{
+			"from": "fqdn",
+			"to": "vip-ipv4-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a vip-ipv4-address-list."
+		},{
+			"from": "fqdn",
+			"to": "vip-ipv6-address-list",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "ONE2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a vip-ipv6-address-list."
+		},{
+			"from": "fqdn",
+			"to": "generic-vnf",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2ONE",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The fqdn that applies to a generic-vnf."
+		},{
+			"from": "fqdn",
+			"to": "fqdn",
+			"label": "org.onap.relationships.inventory.network.AppliesTo",
+			"direction": "OUT",
+			"multiplicity": "MANY2MANY",
+			"contains-other-v": "NONE",
+			"delete-other-v": "NONE",
+			"prevent-delete": "NONE",
+			"default": "true",
+			"description": "The dns cname record that applies to an A-record (ipv4) and/or quad-A-record (ipv6)."
 		}
 
 	]