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>

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 (file)
--- a/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v21/DbEdgeRules_v21.json
@@ -4143,19 +4143,6 @@
                        "default": "true",
                        "description": "A chassis uses space in a rack (aka one or more rack-units)."
                },
-               {
-                       "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",
@@ -4206,32 +4193,6 @@
                        "default": "true",
                        "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",
@@ -4405,19 +4366,6 @@
                        "default": "true",
                        "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",
@@ -4503,19 +4451,6 @@
                        "default": "true",
                        "description": "This edge relates an object-group's ip-address-list through reference from DLP data to an ip-address from FCT in the l3-interface-ipv6-address-list of an R-Leaf's l-interface that is for VLAN 2"
                },
-               {
-                       "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",
@@ -4824,18 +4759,6 @@
                        "default": "true",
                        "description": "The mapping associated to a mapping"
                },
-               {
-                       "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",
@@ -4920,18 +4843,6 @@
                        "default": "true",
                        "description": "The network-route that is used by the next-hop."
                },
-               {
-                       "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",
@@ -4956,79 +4867,6 @@
                        "default": "true",
                        "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",
@@ -5170,19 +5008,6 @@
                        "default": "false",
                        "description": "used for CSP pnf to cloud-region."
                },
-               {
-                       "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",
@@ -5310,18 +5135,6 @@
                        "default": "true",
                        "description": "The policy applies to an l-interface."
                },
-               {
-                       "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",
@@ -5374,32 +5187,6 @@
                        "default": "true",
                        "description": ""
                },
-               {
-                       "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",
@@ -5529,19 +5316,6 @@
                        "default": "true",
                        "description": ""
                },
-               {
-                       "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",
@@ -5620,18 +5394,6 @@
                        "default": "true",
                        "description": "A profile (set of characteristics) applies to the logical-link."
                },
-               {
-                       "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",
@@ -5801,19 +5563,6 @@
                        "default": "true",
                        "description": "A profile (set of characteristics) applies to the vrf."
                },
-               {
-                       "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",
@@ -5928,30 +5677,6 @@
                        "default": "true",
                        "description": "Defines the traversal needed to reach the node of relationship-rule"
                },
-               {
-                       "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",
@@ -5988,84 +5713,6 @@
                        "default": "true",
                        "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",
@@ -6274,19 +5921,6 @@
                        "default": "true",
                        "description": "The sw-component associated to a vserver"
                },
-               {
-                       "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",

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 (file)
--- 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 (file)
--- 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>