From a6872c558e2e584422bc4dc24e233e6757c34281 Mon Sep 17 00:00:00 2001
From: Keong Lim <keong.lim@huawei.com>
Date: Mon, 13 Aug 2018 15:49:04 +1000
Subject: [PATCH] AAI-1468 -1480 Add Conn /lan-port-config for CCVPN

Issue-ID: AAI-1480
Add lan-port-config schema element to network namespace
Add dhcp-service schema element
Add CCVPN EdgeRules for lan-port-config to service-instance and
dhcp-service
Update lan-port-config with ipv4-address and ipv6-address.
Update dhcp-service with server-ipv4-address and server-ipv6-address.

Accidentally squashed another two commits together:
Issue-ID: AAI-1468
Add connectivities sub-component to "network" namespace.
Add connectivities element, which is sequence of "connectivity".
Add connectivity element, which has numerous properties.
Add CCVPN EdgeRules for connectivity to service-instance and vpn-binding

Change-Id: I78f4cdc906e43750bb319ba4f3bdb6483ed7ea24
Signed-off-by: Keong Lim <keong.lim@huawei.com>
---
 .../resources/onap/aai_schema/aai_schema_v14.xsd   | 377 ++++++++++++++++++++-
 .../dbedgerules/v14/DbEdgeRules_ccvpn_v14.json     |  48 +++
 .../main/resources/onap/oxm/v14/aai_oxm_v14.xml    | 311 ++++++++++++++++-
 3 files changed, 728 insertions(+), 8 deletions(-)

diff --git a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
index c7c5eee1..3b34c959 100644
--- a/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
+++ b/aai-schema/src/main/resources/onap/aai_schema/aai_schema_v14.xsd
@@ -5084,17 +5084,17 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-version-id for this object.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
-        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
           <xs:annotation>
             <xs:appinfo>
-              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-invariant-id for this object.")</annox:annotate>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</annox:annotate>
             </xs:appinfo>
           </xs:annotation>
         </xs:element>
@@ -8392,6 +8392,373 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
       </xs:sequence>
     </xs:complexType>
   </xs:element>
+  <xs:element name="connectivity">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a connectivity",indexedProps="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status",nameProps="etht-svc-name",searchable="connectivity-id",uniqueProps="connectivity-id",container="connectivities",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="connectivity-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this connectivity by id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="bandwidth-profile-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of a bandwidth profile.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vpn-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the type of a bandwidth profile.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cir" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CIR of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="eir" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EIR of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cbs" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the CBS of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ebs" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the EBS of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="color-aware" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the color-awareness of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="coupling-flag" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the coupling flag of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="etht-svc-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="The ethernet service name for this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="access-provider-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access provider of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="access-client-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access client of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="access-topology-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access topology of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="access-node-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access node of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="access-ltp-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the id of the access ltp of this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="connectivity-selflink" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the link to get more information for this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="cvlan" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the cvlan for this connectivity.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="operational-status" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the operational-status for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-customization-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the model-customization-id for this object.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-invariant-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model id for this resource or service model.",visibility="deployment",requires="model-version-id",dbAlias="model-invariant-id-local")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="model-version-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="the ASDC model version for this resource or service model.",visibility="deployment",requires="model-invariant-id",dbAlias="model-version-id-local",privateEdge="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}")</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="connectivities">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of connectivities")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:connectivity" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="dhcp-service">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a dhcp-service",indexedProps="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address",nameProps="domain-name",searchable="dhcp-service-id",uniqueProps="dhcp-service-id",container="dhcp-services",dependentOn="lan-port-config",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="dhcp-service-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this dhcp-service by id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="server-ipv4-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ip4-address of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="server-ipv6-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the server-ipv6-address of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="service-enable" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the service-enable of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="dhcp-service-type" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dhcp-service-type of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="lease-time" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the lease-time of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="domain-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the domain-name of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="dns" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the dns of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ntp-primary" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-primary of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ntp-secondary" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ntp-secondary of this dhcp-service.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="nbns" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the nbns of this dhcp-service.")</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="dhcp-services">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of dhcp-services")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:dhcp-service" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lan-port-config">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Instance of a lan-port-config",indexedProps="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag",nameProps="lan-port-config-name",searchable="lan-port-config-id",uniqueProps="lan-port-config-id",container="lan-port-configs",namespace="network")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element name="lan-port-config-id" type="xs:string">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(isKey=true,description="Uniquely identifies this lan-port-config by id")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="lan-port-config-name" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the name of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="description" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the description of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="device-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the device-id of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="port-id" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the port-id of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv4-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv4-address of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="ipv6-address" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the ipv6-address of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="vlan-tag" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the vlan-tag of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="input-bandwidth" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the input-bandwidth of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element name="output-bandwidth" type="xs:string" minOccurs="0">
+          <xs:annotation>
+            <xs:appinfo>
+              <annox:annotate target="field">@org.onap.aai.annotations.Metadata(description="Store the output-bandwidth of this lan-port-config.")</annox:annotate>
+            </xs:appinfo>
+          </xs:annotation>
+        </xs:element>
+        <xs:element ref="tns:dhcp-services" minOccurs="0"/>
+        <xs:element ref="tns:relationship-list" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+  <xs:element name="lan-port-configs">
+    <xs:complexType>
+      <xs:annotation>
+        <xs:appinfo>
+          <annox:annotate target="class">@org.onap.aai.annotations.Metadata(description="Collection of lan-port-configs")</annox:annotate>
+        </xs:appinfo>
+      </xs:annotation>
+      <xs:sequence>
+        <xs:element ref="tns:lan-port-config" minOccurs="0" maxOccurs="5000"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
   <xs:element name="network">
     <xs:complexType>
       <xs:annotation>
@@ -8422,6 +8789,8 @@ xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
         <xs:element ref="tns:forwarding-paths" minOccurs="0"/>
         <xs:element ref="tns:collections" minOccurs="0"/>
         <xs:element ref="tns:vlan-tags" minOccurs="0"/>
+        <xs:element ref="tns:connectivities" minOccurs="0"/>
+        <xs:element ref="tns:lan-port-configs" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>
   </xs:element>
diff --git a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
index 468e6a8d..c5f2f1d1 100644
--- a/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
+++ b/aai-schema/src/main/resources/onap/dbedgerules/v14/DbEdgeRules_ccvpn_v14.json
@@ -23,6 +23,54 @@
 		"prevent-delete": "NONE",
 		"default": "true",
 		"description":"For CCVPN Usecase"
+	},
+	{
+		"from": "connectivity",
+		"to": "service-instance",
+		"label": "org.onap.relationships.inventory.PartOf",
+		"direction": "OUT",
+		"multiplicity": "ONE2MANY",
+		"contains-other-v": "NONE",
+		"delete-other-v": "NONE",
+		"prevent-delete": "NONE",
+		"default": "true",
+		"description":"For CCVPN Usecase"
+	},
+	{
+		"from": "connectivity",
+		"to": "vpn-binding",
+		"label": "org.onap.relationships.inventory.PartOf",
+		"direction": "OUT",
+		"multiplicity": "ONE2MANY",
+		"contains-other-v": "NONE",
+		"delete-other-v": "NONE",
+		"prevent-delete": "NONE",
+		"default": "true",
+		"description":"For CCVPN Usecase"
+	},
+	{
+		"from": "lan-port-config",
+		"to": "service-instance",
+		"label": "org.onap.relationships.inventory.PartOf",
+		"direction": "OUT",
+		"multiplicity": "ONE2MANY",
+		"contains-other-v": "NONE",
+		"delete-other-v": "NONE",
+		"prevent-delete": "NONE",
+		"default": "true",
+		"description":"For CCVPN Usecase"
+	},
+	{
+		"from": "lan-port-config",
+		"to": "dhcp-service",
+		"label": "org.onap.relationships.inventory.Uses",
+		"direction": "OUT",
+		"multiplicity": "ONE2MANY",
+		"contains-other-v": "${direction}",
+		"delete-other-v": "${direction}",
+		"prevent-delete": "!${direction}",
+		"default": "true",
+		"description":"For CCVPN Usecase"
 	}
   ]
 }
diff --git a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
index a11298bf..3dde2409 100644
--- a/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
+++ b/aai-schema/src/main/resources/onap/oxm/v14/aai_oxm_v14.xml
@@ -3085,6 +3085,8 @@
                 <xml-element java-attribute="forwardingPaths" name="forwarding-paths" type="inventory.aai.onap.org.v14.ForwardingPaths"/>
                 <xml-element java-attribute="collections" name="collections" type="inventory.aai.onap.org.v14.Collections"/>
                 <xml-element java-attribute="vlanTags" name="vlan-tags" type="inventory.aai.onap.org.v14.VlanTags"/>
+				<xml-element java-attribute="connectivities" name="connectivities" type="inventory.aai.onap.org.v14.Connectivities" />
+				<xml-element java-attribute="lanPortConfigs" name="lan-port-configs" type="inventory.aai.onap.org.v14.LanPortConfigs" />
             </java-attributes>
         </java-type>
         <java-type name="Configurations">
@@ -3594,14 +3596,21 @@
 						<xml-property name="description" value="Store the model-customization-id for this object." />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-version-id for this object." />
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
 					</xml-properties>
 				</xml-element>
-				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
 					<xml-properties>
-						<xml-property name="description" value="Store the model-invariant-id for this object." />
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
 					</xml-properties>
 				</xml-element>
                 <xml-element java-attribute="resourceVersion" name="resource-version" type="java.lang.String">
@@ -7365,5 +7374,299 @@
             </java-attributes>
         </java-type>
 
+		<java-type name="Connectivity">
+			<xml-root-element name="connectivity" />
+			<java-attributes>
+				<xml-element java-attribute="connectivityId" name="connectivity-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Uniquely identifies this connectivity by id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="bandwidthProfileName" name="bandwidth-profile-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the name of a bandwidth profile." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vpnType" name="vpn-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the type of a bandwidth profile." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cir" name="cir" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the CIR of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="eir" name="eir" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the EIR of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cbs" name="cbs" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the CBS of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ebs" name="ebs" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the EBS of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="colorAware" name="color-aware" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the color-awareness of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="couplingFlag" name="coupling-flag" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the coupling flag of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ethtSvcName" name="etht-svc-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="The ethernet service name for this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="accessProviderId" name="access-provider-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the access provider of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="accessClientId" name="access-client-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the access client of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="accessTopologyId" name="access-topology-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the access topology of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="accessNodeId" name="access-node-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the access node of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="accessLtpId" name="access-ltp-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the id of the access ltp of this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="connectivitySelflink" name="connectivity-selflink" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the link to get more information for this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="cvlan" name="cvlan" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the cvlan for this connectivity." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="operationalStatus" name="operational-status" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the operational-status for this object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelCustomizationId" name="model-customization-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the model-customization-id for this object." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelInvariantId" name="model-invariant-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model id for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-version-id" />
+						<xml-property name="dbAlias" value="model-invariant-id-local" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="modelVersionId" name="model-version-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="the ASDC model version for this resource or service model." />
+						<xml-property name="visibility" value="deployment" />
+						<xml-property name="requires" value="model-invariant-id" />
+						<xml-property name="dbAlias" value="model-version-id-local" />
+						<xml-property name="privateEdge" value="service-design-and-creation/models/model/{model-invariant-id}/model-vers/model-ver/{model-version-id}"/>
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Instance of a connectivity" />
+				<xml-property name="indexedProps" value="connectivity-id,etht-svc-name,bandwidth-profile-name,vpn-type,color-aware,coupling-flag,access-provider-id,access-client-id,access-topology-id,access-node-id,access-ltp-id,operational-status" />
+				<xml-property name="nameProps" value="etht-svc-name" />
+				<xml-property name="searchable" value="connectivity-id" />
+				<xml-property name="uniqueProps" value="connectivity-id" />
+				<xml-property name="container" value="connectivities" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="Connectivities">
+			<xml-root-element name="connectivities" />
+			<xml-properties>
+				<xml-property name="description" value="Collection of connectivities" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="connectivity" name="connectivity" type="inventory.aai.onap.org.v14.Connectivity" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="LanPortConfig">
+			<xml-root-element name="lan-port-config" />
+			<java-attributes>
+				<xml-element java-attribute="lanPortConfigId" name="lan-port-config-id" required="true" type="java.lang.String" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Uniquely identifies this lan-port-config by id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="lanPortConfigName" name="lan-port-config-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the name of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="description" name="description" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the description of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="deviceId" name="device-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the device-id of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="portId" name="port-id" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the port-id of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv4Address" name="ipv4-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the ipv4-address of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ipv6Address" name="ipv6-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the ipv6-address of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="vlanTag" name="vlan-tag" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the vlan-tag of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="inputBandwidth" name="input-bandwidth" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the input-bandwidth of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="outputBandwidth" name="output-bandwidth" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the output-bandwidth of this lan-port-config." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dhcpServices" name="dhcp-services" type="inventory.aai.onap.org.v14.DhcpServices" />
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Instance of a lan-port-config" />
+				<xml-property name="indexedProps" value="lan-port-config-id,lan-port-config-name,device-id,port-id,ipv4-address,ipv6-address,vlan-tag" />
+				<xml-property name="nameProps" value="lan-port-config-name" />
+				<xml-property name="searchable" value="lan-port-config-id" />
+				<xml-property name="uniqueProps" value="lan-port-config-id" />
+				<xml-property name="container" value="lan-port-configs" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="LanPortConfigs">
+			<xml-root-element name="lan-port-configs" />
+			<xml-properties>
+				<xml-property name="description" value="Collection of lan-port-configs" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="lanPortConfig" name="lan-port-config" type="inventory.aai.onap.org.v14.LanPortConfig" />
+			</java-attributes>
+		</java-type>
+
+		<java-type name="DhcpService">
+			<xml-root-element name="dhcp-service" />
+			<java-attributes>
+				<xml-element java-attribute="dhcpServiceId" name="dhcp-service-id" type="java.lang.String" required="true" xml-key="true">
+					<xml-properties>
+						<xml-property name="description" value="Uniquely identifies this dhcp-service by id" />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serverIpv4Address" name="server-ipv4-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the server-ip4-address of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serverIpv6Address" name="server-ipv6-address" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the server-ipv6-address of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="serviceEnable" name="service-enable" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the service-enable of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dhcpServiceType" name="dhcp-service-type" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the dhcp-service-type of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="leaseTime" name="lease-time" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the lease-time of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="domainName" name="domain-name" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the domain-name of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="dns" name="dns" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the dns of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ntpPrimary" name="ntp-primary" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the ntp-primary of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="ntpSecondary" name="ntp-secondary" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the ntp-secondary of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="nbns" name="nbns" type="java.lang.String">
+					<xml-properties>
+						<xml-property name="description" value="Store the nbns of this dhcp-service." />
+					</xml-properties>
+				</xml-element>
+				<xml-element java-attribute="relationshipList" name="relationship-list" type="inventory.aai.onap.org.v14.RelationshipList" />
+			</java-attributes>
+			<xml-properties>
+				<xml-property name="description" value="Instance of a dhcp-service" />
+				<xml-property name="indexedProps" value="dhcp-service-id,dhcp-service-type,domain-name,server-ipv4-address,server-ipv6-address" />
+				<xml-property name="nameProps" value="domain-name" />
+				<xml-property name="searchable" value="dhcp-service-id" />
+				<xml-property name="uniqueProps" value="dhcp-service-id" />
+				<xml-property name="container" value="dhcp-services" />
+				<xml-property name="dependentOn" value="lan-port-config" />
+				<xml-property name="namespace" value="network" />
+			</xml-properties>
+		</java-type>
+		<java-type name="DhcpServices">
+			<xml-root-element name="dhcp-services" />
+			<xml-properties>
+				<xml-property name="description" value="Collection of dhcp-services" />
+			</xml-properties>
+			<java-attributes>
+				<xml-element container-type="java.util.ArrayList" java-attribute="dhcpService" name="dhcp-service" type="inventory.aai.onap.org.v14.DhcpService" />
+			</java-attributes>
+		</java-type>
+
 	</java-types>
 </xml-bindings>
-- 
2.16.6