AAI schema changes for Cells

Cell and Neighbour objects added with required
relationships.

Issue-ID: AAI-3625
Signed-off-by: Aleem Raja <aleem.raja@t-systems.com>
Change-Id: Iaece7985ae2d35a4f9b150b8f33686db4ac3319e

4 files changed, 540 insertions, 2 deletions

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v27.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v27.xsd
index 075dcb9..689ad51 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v27.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v27.xsd
@@ -12781,6 +12781,206 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="neighbour">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose Neighbour Cell object",indexedProps="neighbour-id,neighbour-cell-id,neighbour-cell-name,data-owner,data-source,data-source-version",searchable="neighbour-id,neighbour-cell-id,neighbour-cell-name",uniqueProps="neighbour-id",container="neighbours",dependentOn="cell",uriTemplate="/neighbours/neighbour/{neighbour-id}",requiredProps="neighbour-id,neighbour-cell-id,neighbour-cell-name")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="neighbour-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of Neighbour.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="neighbour-cell-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Unique id of Neighbour Cell.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="neighbour-cell-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of Neighbour Cell.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the extended object properties.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-owner" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-source" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-source-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="neighbours">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Cell Neighbours")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:neighbour" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cell">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="General purpose Cell object",nameProps="cell-name",indexedProps="cell-id,cell-name,radio-access-technology,cell-type,mno-id,cell-local-id,node-id,mnc,mcc,longitude,latitude,frequency-band,coverage-area,data-owner,data-source,data-source-version",searchable="cell-id,cell-name,cell-local-id,mno-id,node-id,radio-access-technology",uniqueProps="cell-id",container="cells",namespace="network",containsSuggestibleProps="true",uriTemplate="/network/cells/cell/{cell-id}",requiredProps="cell-id,cell-name,radio-access-technology")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="cell-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Unique id of Cell.  This is unique across the graph.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cell-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Name of Cell.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="radio-access-technology" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Radio access technology of the Cell, i.e. 5G.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cell-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Type of Cell.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cell-local-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Local id of Cell.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="mno-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Operator specific Cell identifier.",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="node-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Cell's node id (like gNodeb id, eNodeb id).",suggestibleOnSearch="true")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="coverage-area" type="xs:string" minOccurs="0"/>
+        <xs:element name="frequency-band" type="xs:string" minOccurs="0"/>
+        <xs:element name="latitude" type="xs:float" minOccurs="0"/>
+        <xs:element name="longitude" type="xs:float" minOccurs="0"/>
+        <xs:element name="mcc" type="xs:string" minOccurs="0"/>
+        <xs:element name="mnc" type="xs:string" minOccurs="0"/>
+        <xs:element name="height" type="xs:float" minOccurs="0"/>
+        <xs:element name="azimuth" type="xs:int" minOccurs="0"/>
+        <xs:element name="beamwidth" type="xs:float" minOccurs="0"/>
+        <xs:element name="mechanical-tilt" type="xs:float" minOccurs="0"/>
+        <xs:element name="electrical-tilt" type="xs:float" minOccurs="0"/>
+        <xs:element name="selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Path to the extended object properties.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-owner" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the entity that is responsible managing this inventory object.",ownerCheck="N/A")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-source" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the upstream source of the data.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="data-source-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Identifies the version of the upstream source.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="resource-version" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Used for optimistic concurrency.  Must be empty on create, valid on update and delete.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+        <xs:element ref="tns:neighbours" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="cells">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of Cells")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:cell" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="lag-link">
     <xs:complexType>
       <xs:annotation>
@@ -18469,6 +18669,7 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:l3-networks" minOccurs="0"/>
         <xs:element ref="tns:network-policies" minOccurs="0"/>
         <xs:element ref="tns:generic-vnfs" minOccurs="0"/>
+        <xs:element ref="tns:cells" minOccurs="0"/>
         <xs:element ref="tns:lag-links" minOccurs="0"/>
         <xs:element ref="tns:newvces" minOccurs="0"/>
         <xs:element ref="tns:pnfs" minOccurs="0"/>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_ccvpn_v27.json b/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_ccvpn_v27.json
index a8b1936..8aa9ac9 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_ccvpn_v27.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_ccvpn_v27.json
@@ -1,4 +1,3 @@
-
 {
   "rules": [
 	{
@@ -170,6 +169,19 @@
 		"description":"For CCVPN Usecase"
 	},
 	{
+		"from": "site-resource",
+		"to": "site-resource",
+		"label": "org.onap.relationships.inventory.Supports",
+		"direction": "OUT",
+		"multiplicity": "MANY2MANY",
+		"contains-other-v": "NONE",
+		"delete-other-v": "NONE",
+		"SVC-INFRA": "NONE",
+		"prevent-delete": "NONE",
+		"default": "true",
+		"description": "For Cell Usecase"
+	},
+	{
 		"from": "sdwan-vpn",
 		"to": "service-instance",
 		"label": "org.onap.relationships.inventory.PartOf",
@@ -278,6 +290,18 @@
 		"description":"For CCVPN Usecase"
 	},
 	{
+		"from": "site-resource",
+		"to": "pnf",
+		"label": "org.onap.relationships.inventory.PartOf",
+		"direction": "OUT",
+		"multiplicity": "MANY2MANY",
+		"contains-other-v": "NONE",
+		"delete-other-v": "NONE",
+		"prevent-delete": "NONE",
+		"default": "true",
+		"description":"For Cell Usecase"
+	},
+	{
 		"from": "wan-port-config",
 		"to": "generic-vnf",
 		"label": "org.onap.relationships.inventory.PartOf",
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_v27.json b/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_v27.json
index 6ae0dc6..e649dba 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_v27.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v27/DbEdgeRules_v27.json
@@ -457,6 +457,139 @@
             "description": ""
         },
         {
+            "from": "cell",
+            "to": "complex",
+            "label": "org.onap.relationships.inventory.LocatedIn",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "!${direction}",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cell",
+            "to": "geo-region",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "The cell associated to a geo-region"
+        },
+	{
+            "from": "cell",
+            "to": "object-groups",
+            "label": "org.onap.relationships.inventory.MemberOf",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "neighbour",
+            "to": "cell",
+            "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": "neighbour",
+            "to": "cell",
+            "label": "org.onap.relationships.inventory.Destination",
+            "direction": "OUT",
+            "multiplicity": "MANY2ONE",
+            "contains-other-v": "NONE",
+            "delete-other-v": "!${direction}",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cell",
+            "to": "service-instance",
+            "label": "org.onap.relationships.inventory.ControlledBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cell",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.ControlledBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "generic-vnf",
+            "to": "generic-vnf",
+            "label": "org.onap.relationships.inventory.Supports",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "SVC-INFRA": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": "For Cell Use Case"
+        },
+        {
+            "from": "cell",
+            "to": "pnf",
+            "label": "org.onap.relationships.inventory.ControlledBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cell",
+            "to": "site-resource",
+            "label": "org.onap.relationships.inventory.ControlledBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
+            "from": "cell",
+            "to": "allotted-resource",
+            "label": "org.onap.relationships.inventory.ControlledBy",
+            "direction": "OUT",
+            "multiplicity": "MANY2MANY",
+            "contains-other-v": "NONE",
+            "delete-other-v": "NONE",
+            "prevent-delete": "NONE",
+            "default": "true",
+            "description": ""
+        },
+        {
             "from": "generic-vnf",
             "to": "availability-zone",
             "label": "org.onap.relationships.inventory.Uses",
diff --git a/aai-schema/src/main/resources/onap/oxm/v27/aai_oxm_v27.xml b/aai-schema/src/main/resources/onap/oxm/v27/aai_oxm_v27.xml
index bca47ac..7da6d13 100644
--- a/aai-schema/src/main/resources/onap/oxm/v27/aai_oxm_v27.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v27/aai_oxm_v27.xml
@@ -5384,6 +5384,7 @@
                 <xml-element java-attribute="l3Networks" name="l3-networks" type="inventory.aai.onap.org.v27.L3Networks"/>
                 <xml-element java-attribute="networkPolicies" name="network-policies" type="inventory.aai.onap.org.v27.NetworkPolicies"/>
                 <xml-element java-attribute="genericVnfs" name="generic-vnfs" type="inventory.aai.onap.org.v27.GenericVnfs"/>
+                <xml-element java-attribute="cells" name="cells" type="inventory.aai.onap.org.v27.Cells"/>
                 <xml-element java-attribute="lagLinks" name="lag-links" type="inventory.aai.onap.org.v27.LagLinks"/>
                 <xml-element java-attribute="newvces" name="newvces" type="inventory.aai.onap.org.v27.Newvces"/>
                 <xml-element java-attribute="pnfs" name="pnfs" type="inventory.aai.onap.org.v27.Pnfs"/>
@@ -7242,6 +7243,186 @@
             </xml-properties>
         </java-type>
 
+        <java-type name="Cells">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Cells"/>
+            </xml-properties>
+            <xml-root-element name="cells"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="cell" name="cell" type="inventory.aai.onap.org.v27.Cell"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Cell">
+            <xml-root-element name="cell"/>
+            <java-attributes>
+                <xml-element java-attribute="cellId" name="cell-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Cell.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cellName" name="cell-name" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Cell."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="radioAccessTechnology" name="radio-access-technology" required="true" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Radio access technology of the Cell, i.e. 5G."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cellType" name="cell-type" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Type of Cell."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="cellLocalId" name="cell-local-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Local id of Cell."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="mnoId" name="mno-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Operator specific Cell identifier."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="nodeId" name="node-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Cell's node id (like gNodeb id, eNodeb id)."/>
+                        <xml-property name="suggestibleOnSearch" value="true"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="coverageArea" name="coverage-area" type="java.lang.String"/>
+                <xml-element java-attribute="frequencyBand" name="frequency-band" type="java.lang.String"/>
+                <xml-element java-attribute="latitude" name="latitude" type="java.lang.Float"/>
+                <xml-element java-attribute="longitude" name="longitude" type="java.lang.Float"/>
+                <xml-element java-attribute="mcc" name="mcc" type="java.lang.String"/>
+                <xml-element java-attribute="mnc" name="mnc" type="java.lang.String"/>
+                <xml-element java-attribute="height" name="height" type="java.lang.Float"/>
+                <xml-element java-attribute="azimuth" name="azimuth" type="java.lang.Integer"/>
+                <xml-element java-attribute="beamwidth" name="beamwidth" type="java.lang.Float"/>
+                <xml-element java-attribute="mechanicalTilt" name="mechanical-tilt" type="java.lang.Float"/>
+                <xml-element java-attribute="electricalTilt" name="electrical-tilt" type="java.lang.Float"/>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the extended object properties."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v27.RelationshipList"/>
+                <xml-element java-attribute="neighbours" name="neighbours" type="inventory.aai.onap.org.v27.Neighbours"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose Cell object"/>
+                <xml-property name="nameProps" value="cell-name"/>
+                <xml-property name="indexedProps" value="cell-id,cell-name,radio-access-technology,cell-type,mno-id,cell-local-id,node-id,mnc,mcc,longitude,latitude,frequency-band,coverage-area,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="cell-id,cell-name,cell-local-id,mno-id,node-id,radio-access-technology"/>
+                <xml-property name="uniqueProps" value="cell-id"/>
+                <xml-property name="container" value="cells"/>
+                <xml-property name="namespace" value="network"/>
+                <xml-property name="containsSuggestibleProps" value="true"/>
+                <xml-property name="uriTemplate" value="/network/cells/cell/{cell-id}"/>
+                <xml-property name="requiredProps" value="cell-id,cell-name,radio-access-technology"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Neighbours">
+            <xml-properties>
+                <xml-property name="description" value="Collection of Cell Neighbours"/>
+            </xml-properties>
+            <xml-root-element name="neighbours"/>
+            <java-attributes>
+                <xml-element container-type="java.util.ArrayList" java-attribute="neighbour" name="neighbour" type="inventory.aai.onap.org.v27.Neighbour"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="maximumDepth" value="0"/>
+            </xml-properties>
+        </java-type>
+        <java-type name="Neighbour">
+            <xml-root-element name="neighbour"/>
+            <java-attributes>
+                <xml-element java-attribute="neighbourId" name="neighbour-id" required="true" type="java.lang.String" xml-key="true">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Neighbour.  This is unique across the graph."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neighbourCellId" name="neighbour-cell-id" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Unique id of Neighbour Cell."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="neighbourCellName" name="neighbour-cell-name" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Name of Neighbour Cell."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="selflink" name="selflink" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Path to the extended object properties."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataOwner" name="data-owner" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the entity that is responsible managing this inventory object."/>
+                        <xml-property name="ownerCheck" value="N/A"/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSource" name="data-source" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the upstream source of the data."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="dataSourceVersion" name="data-source-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Identifies the version of the upstream source."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
+                    <xml-properties>
+                        <xml-property name="description" value="Used for optimistic concurrency.  Must be empty on create, valid on update and delete."/>
+                    </xml-properties>
+                </xml-element>
+                <xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v27.RelationshipList"/>
+            </java-attributes>
+            <xml-properties>
+                <xml-property name="description" value="General purpose Neighbour Cell object"/>
+                <xml-property name="indexedProps" value="neighbour-id,neighbour-cell-id,neighbour-cell-name,data-owner,data-source,data-source-version"/>
+                <xml-property name="searchable" value="neighbour-id,neighbour-cell-id,neighbour-cell-name"/>
+                <xml-property name="uniqueProps" value="neighbour-id"/>
+                <xml-property name="container" value="neighbours"/>
+                <xml-property name="dependentOn" value="cell"/>
+                <xml-property name="uriTemplate" value="/neighbours/neighbour/{neighbour-id}"/>
+                <xml-property name="requiredProps" value="neighbour-id,neighbour-cell-id,neighbour-cell-name"/>
+            </xml-properties>
+        </java-type>
+
+
         <java-type name="GenericVnfs">
             <xml-properties>
                 <xml-property name="description" value="Collection of VNFs"/>
@@ -17004,4 +17185,3 @@
 
     </java-types>
 </xml-bindings>
-