Merge "Add classifier to repo zip"
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
--- 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 @@
}
}
}
+
+ 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 @@
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 @@
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 @@
}
}
+ 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 50367ce..aea201e 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.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 @@
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()) {