From: gaurav <gaurav.agrawal@huawei.com>
Date: Wed, 18 Jul 2018 08:41:29 +0000 (+0530)
Subject: New allotted resource for connectivity attachment.
X-Git-Tag: 1.4.0~17
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=sdnc%2Fnorthbound.git;a=commitdiff_plain;h=bfae9369f0cf673f3d0948cafd3245e25e14154c

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 3b751b13..a6a44263 100644
--- 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 {
 	       }
 	   }
    }
+
+   grouping connection-attachment-operation-information {
+      uses sdnc-request-header;
+      uses request-information;
+      uses service-information;
+      uses allotted-resource-information;
+      uses connection-attachment-request-input;
+   }
+
+   grouping connection-attachment-request-input {
+      container connection-attachment-request-input {
+         uses param;
+      }
+   }
+
+   grouping connection-attachment-topology {
+      container brg-topology {
+         uses allotted-resource-identifiers;
+         uses onap-model-information;
+         uses connection-attachment-assignments;
+         container connection-attachment-parameters {
+            uses param;
+         }
+      }
+   }
+
+   grouping connection-attachment-assignments {
+      container connection-attachment-assignments {
+      }
+   }
+
    grouping allotted-resource-information {
       container allotted-resource-information {
          leaf allotted-resource-id {
@@ -1248,6 +1279,11 @@ module GENERIC-RESOURCE-API {
            uses instance-reference;
        }
    }
+   grouping connection-attachment-response-information {
+      container connection-attachment-response-information {
+         uses instance-reference;
+      }
+   }
    grouping preload-model-information {
       list vnf-preload-list {
          key "vnf-name vnf-type";
@@ -1728,6 +1764,26 @@ module GENERIC-RESOURCE-API {
            uses allotted-resource-status;
        }
    }
+   container connection-attachment-allotted-resources {
+      list connection-attachment-allotted-resource {
+         key "allotted-resource-id";
+         leaf allotted-resource-id {
+            type string;
+            mandatory true;
+         }
+         container allotted-resource-data {
+            container allotted-resource-operation-information {
+               uses connection-attachment-operation-information;
+            }
+            uses connection-attachment-topology;
+            container connection-attachment-parameters {
+               uses param;
+            }
+            uses allotted-resource-oper-status;
+         }
+         uses allotted-resource-status;
+      }
+   }
    rpc service-topology-operation {
       input {
          uses service-operation-information;
@@ -1832,4 +1888,15 @@ module GENERIC-RESOURCE-API {
       }
    }
 
+   rpc connection-attachment-topology-operation {
+       input {
+           uses connection-attachment-operation-information;
+       }
+       output {
+           uses topology-response-common;
+           uses connection-attachment-response-information;
+           uses service-response-information;
+       }
+   }
+
 } ////closes the module
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 50367ce5..aea201ed 100644
--- 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()) {