New allotted resource for connectivity attachment.

Addition of a new allotted resource "connectivity attachment" to
generic-resource-api schema. Connectivity attachment will be provided
by Connectivity service and will be allotted to Site service as part
of CCVPN use case. This new allotted-resource can serve for both
SOTNAttachment and SDWANAttachment.

Change-Id: Iff5ad46a72d55bc83ca36e4703d439e43fe948ce
Issue-ID: SDNC-384
Signed-off-by: Gaurav Agrawal <gaurav.agrawal@huawei.com>

diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
index 3b751b1..a6a4426 100644 (file)
--- a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
+++ b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
@@ -880,6 +880,37 @@ module GENERIC-RESOURCE-API {
               }\r
           }\r
    }\r
+\r
+   grouping connection-attachment-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses allotted-resource-information;\r
+      uses connection-attachment-request-input;\r
+   }\r
+\r
+   grouping connection-attachment-request-input {\r
+      container connection-attachment-request-input {\r
+         uses param;\r
+      }\r
+   }\r
+\r
+   grouping connection-attachment-topology {\r
+      container brg-topology {\r
+         uses allotted-resource-identifiers;\r
+         uses onap-model-information;\r
+         uses connection-attachment-assignments;\r
+         container connection-attachment-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+\r
+   grouping connection-attachment-assignments {\r
+      container connection-attachment-assignments {\r
+      }\r
+   }\r
+\r
    grouping allotted-resource-information {\r
       container allotted-resource-information {\r
          leaf allotted-resource-id {\r
@@ -1248,6 +1279,11 @@ module GENERIC-RESOURCE-API {
            uses instance-reference;\r
        }\r
    }\r
+   grouping connection-attachment-response-information {\r
+      container connection-attachment-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
    grouping preload-model-information {\r
       list vnf-preload-list {\r
          key "vnf-name vnf-type";\r
@@ -1728,6 +1764,26 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;\r
        }\r
    }\r
+   container connection-attachment-allotted-resources {\r
+      list connection-attachment-allotted-resource {\r
+         key "allotted-resource-id";\r
+         leaf allotted-resource-id {\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         container allotted-resource-data {\r
+            container allotted-resource-operation-information {\r
+               uses connection-attachment-operation-information;\r
+            }\r
+            uses connection-attachment-topology;\r
+            container connection-attachment-parameters {\r
+               uses param;\r
+            }\r
+            uses allotted-resource-oper-status;\r
+         }\r
+         uses allotted-resource-status;\r
+      }\r
+   }\r
    rpc service-topology-operation {\r
       input {\r
          uses service-operation-information;\r
@@ -1832,4 +1888,15 @@ module GENERIC-RESOURCE-API {
       }\r
    }\r
 \r
+   rpc connection-attachment-topology-operation {\r
+       input {\r
+           uses connection-attachment-operation-information;\r
+       }\r
+       output {\r
+           uses topology-response-common;\r
+           uses connection-attachment-response-information;\r
+           uses service-response-information;\r
+       }\r
+   }\r
+\r
 } ////closes the module\r

diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
index 50367ce..aea201e 100644 (file)
--- a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
+++ b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
@@ -25,6 +25,8 @@ import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.re
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.BrgTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ConnectionAttachmentTopologyOperationOutput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInput;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutput;
@@ -1795,6 +1797,13 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC
         return Futures.immediateFuture(rpcResult);
     }
 
+    @Override
+    public Future<RpcResult<ConnectionAttachmentTopologyOperationOutput>> connectionAttachmentTopologyOperation(
+        ConnectionAttachmentTopologyOperationInput input) {
+        //TODO after YANG review
+        return null;
+    }
+
     private void trySetResponseMessage(TunnelxconnTopologyOperationOutputBuilder responseBuilder,
         ResponseObject error) {
         if (!error.getMessage().isEmpty()) {