summaryrefslogtreecommitdiffstats
path: root/aai-schema/src/main
diff options
context:
space:
mode:
authorKajur, Harish (vk250x) <vk250x@att.com>2020-09-03 11:21:34 -0400
committerKajur, Harish (vk250x) <vk250x@att.com>2020-09-03 11:21:51 -0400
commitd8d59a12a9b1309b8d7f0db8c6c19b708ecc5e3e (patch)
tree18746f059cf95c8c8dbcbf05e1e3ff945d54a2f1 /aai-schema/src/main
parentd2bba7dda46fedebb876d1f041ca51a363d29932 (diff)
Fix the ip address list and remove edge rules
Issue-ID: AAI-3128 Change-Id: I11f1ce8de13397dafe61b5845e66448beb297743 Signed-off-by: Kajur, Harish (vk250x) <vk250x@att.com>
Diffstat (limited to 'aai-schema/src/main')
-rw-r--r--aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json366
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml2
-rw-r--r--aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml3
3 files changed, 2 insertions, 369 deletions
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
index 677c75f..fd91b61 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
@@ -4145,19 +4145,6 @@
},
{
"from": "cloud-region",
- "to": "endpoint",
- "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": "cloud-region",
"to": "geo-region",
"label": "org.onap.relationships.inventory.MemberOf",
"direction": "OUT",
@@ -4207,32 +4194,6 @@
"description": ""
},
{
- "from": "community-list",
- "to": "object-group",
- "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",
- "description": ""
- },
- {
- "from": "complex",
- "to": "endpoint",
- "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": "complex",
"to": "geo-region",
"label": "org.onap.relationships.inventory.MemberOf",
@@ -4406,19 +4367,6 @@
"description": "The bgp-neighbor associated to a generic-vnf."
},
{
- "from": "generic-vnf",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "A relationship that ties the device to the prefix-list/community-list."
- },
- {
"from": "host-aggregate",
"to": "cloud-region",
"label": "org.onap.relationships.inventory.BelongsTo",
@@ -4505,19 +4453,6 @@
},
{
"from": "ip-address-list",
- "to": "object-group",
- "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",
- "description": ""
- },
- {
- "from": "ip-address-list",
"to": "policy",
"label": "org.onap.relationships.inventory.BelongsTo",
"direction": "OUT",
@@ -4826,18 +4761,6 @@
},
{
"from": "mapping",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.MemberOf",
- "direction": "OUT",
- "multiplicity": "ONE2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "The mapping associated to an object-group"
- },
- {
- "from": "mapping",
"to": "pnf",
"label": "org.onap.relationships.inventory.MemberOf",
"direction": "OUT",
@@ -4922,18 +4845,6 @@
},
{
"from": "network-route",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.MemberOf",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "${direction}",
- "default": "true",
- "description": "The route is part of part of a route-list that is modeled in an object-group."
- },
- {
- "from": "network-route",
"to": "subnet",
"label": "org.onap.relationships.inventory.MemberOf",
"direction": "OUT",
@@ -4957,79 +4868,6 @@
"description": ""
},
{
- "from": "object-group",
- "to": "cloud-region",
- "label": "org.onap.relationships.inventory.LocatedIn",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "The object-group is located in a cloud-region"
- },
- {
- "from": "object-group",
- "to": "complex",
- "label": "org.onap.relationships.inventory.LocatedIn",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "The object-group is located in a complex"
- },
- {
- "from": "object-group",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "The object-gorup that applies to an object-group"
- },
- {
- "from": "object-group",
- "to": "pnf",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": ""
- },
- {
- "from": "object-group",
- "to": "vrf",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "${direction}",
- "default": "true",
- "description": "The object-group to VRF for various route types."
- },
- {
- "from": "object-group",
- "to": "zone",
- "label": "org.onap.relationships.inventory.LocatedIn",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "The object-group is located in a zone"
- },
- {
"from": "pdu",
"to": "hardware-catalog-item",
"label": "org.onap.relationships.inventory.IsA",
@@ -5172,19 +5010,6 @@
},
{
"from": "pnf",
- "to": "endpoint",
- "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": "pnf",
"to": "hw-component",
"label": "org.onap.relationships.inventory.MemberOf",
"direction": "OUT",
@@ -5312,18 +5137,6 @@
},
{
"from": "policy",
- "to": "object-group",
- "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": "policy",
"to": "rule",
"label": "org.onap.relationships.inventory.Implements",
"direction": "OUT",
@@ -5376,32 +5189,6 @@
},
{
"from": "port-list",
- "to": "endpoint",
- "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",
- "description": ""
- },
- {
- "from": "port-list",
- "to": "object-group",
- "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",
- "description": ""
- },
- {
- "from": "port-list",
"to": "rule",
"label": "org.onap.relationships.inventory.BelongsTo",
"direction": "OUT",
@@ -5531,19 +5318,6 @@
},
{
"from": "profile",
- "to": "endpoint",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "${direction}",
- "default": "true",
- "description": "A profile (set of characteristics) applies to the endpoint."
- },
- {
- "from": "profile",
"to": "hardware-catalog-item",
"label": "org.onap.relationships.inventory.AppliesTo",
"direction": "OUT",
@@ -5622,18 +5396,6 @@
},
{
"from": "profile",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "${direction}",
- "default": "true",
- "description": "The profile (set of characteristics) classifies the object-group."
- },
- {
- "from": "profile",
"to": "pdu",
"label": "org.onap.relationships.inventory.AppliesTo",
"direction": "OUT",
@@ -5803,19 +5565,6 @@
},
{
"from": "pserver",
- "to": "endpoint",
- "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": "pserver",
"to": "hw-component",
"label": "org.onap.relationships.inventory.MemberOf",
"direction": "OUT",
@@ -5930,30 +5679,6 @@
},
{
"from": "relationship-rule",
- "to": "endpoint",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "${direction}",
- "default": "true",
- "description": "Details relationships endpoint requires"
- },
- {
- "from": "relationship-rule",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "prevent-delete": "NONE",
- "default": "true",
- "description": "Details relationships object-group requires"
- },
- {
- "from": "relationship-rule",
"to": "policy",
"label": "org.onap.relationships.inventory.AppliesTo",
"direction": "OUT",
@@ -5989,84 +5714,6 @@
"description": "The rule that is used by the next-hop. For CG-NAT these are the ACL policies."
},
{
- "from": "rule",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.AppliesTo",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "!${direction}",
- "default": "false",
- "description": ""
- },
- {
- "from": "rule",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.Destination",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "!${direction}",
- "default": "false",
- "description": ""
- },
- {
- "from": "rule",
- "to": "object-group",
- "label": "org.onap.relationships.inventory.Source",
- "direction": "OUT",
- "multiplicity": "MANY2MANY",
- "contains-other-v": "NONE",
- "delete-other-v": "NONE",
- "SVC-INFRA": "NONE",
- "prevent-delete": "!${direction}",
- "default": "false",
- "description": ""
- },
- {
- "from": "rule",
- "to": "object-group",
- "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": "selector-list",
- "to": "endpoint",
- "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",
- "description": ""
- },
- {
- "from": "selector-list",
- "to": "object-group",
- "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",
- "description": ""
- },
- {
"from": "selector-list",
"to": "policy",
"label": "org.onap.relationships.inventory.BelongsTo",
@@ -6276,19 +5923,6 @@
},
{
"from": "zone",
- "to": "endpoint",
- "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": "zone",
"to": "service-instance",
"label": "org.onap.relationships.inventory.Uses",
"direction": "OUT",
diff --git a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
index fb6f889..d289ac7 100644
--- a/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v20/aai_oxm_v20.xml
@@ -10133,7 +10133,7 @@
<xml-property name="uniqueProps" value="ip-address"/>
<xml-property name="indexedProps" value="ip-address"/>
<xml-property name="container" value="ip-address-list"/>
- <xml-property name="uriTemplate" value="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}"/>
+ <xml-property name="uriTemplate" value="/ip-address-list/ip-address/{ip-address}"/>
<xml-property name="searcheable" value="ip-address"/>
</xml-properties>
</java-type>
diff --git a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
index 8735a40..ae3761e 100644
--- a/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v21/aai_oxm_v21.xml
@@ -5666,7 +5666,6 @@
</xml-properties>
</xml-element>
<xml-element java-attribute="hostRoutes" name="host-routes" type="inventory.aai.onap.org.v21.HostRoutes"/>
- <xml-element container-type="java.util.ArrayList" java-attribute="ipAddressList" name="ip-address-list" type="inventory.aai.onap.org.v21.IpAddressList"/>
<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v21.RelationshipList"/>
<xml-element java-attribute="bgpNeighbors" name="bgp-neighbors" type="inventory.aai.onap.org.v21.BgpNeighbors"/>
</java-attributes>
@@ -12608,7 +12607,7 @@
<xml-property name="uniqueProps" value="ip-address"/>
<xml-property name="indexedProps" value="ip-address"/>
<xml-property name="container" value="ip-address-list"/>
- <xml-property name="uriTemplate" value="/endpoints/endpoint/{endpoint-id}/ip-address-list/ip-address/{ip-address}"/>
+ <xml-property name="uriTemplate" value="/ip-address-list/ip-address/{ip-address}"/>
<xml-property name="searcheable" value="ip-address"/>
</xml-properties>
</java-type>