Add aggregate routes and VNR rebuild to GR Yang

Add aggregate routes and VNR rebuild to Generic Resource Yang and fix error in reporting MD-SAL write errors in preload APIs

Change-Id: I46273d6010c3681483dc6ac69d1c1ed105a6d4c9
Issue-ID: SDNC-484
Signed-off-by: Brandon, Bruce (bb2697) <bb2697@att.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 a6f8db9..b03196c 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
@@ -385,6 +385,7 @@ module GENERIC-RESOURCE-API {
                type string;\r
             }\r
          }\r
+         uses aggregate-routes;\r
          uses subnets;\r
          leaf subnet-key-value {\r
             description "key-value provided to EIPAM when  creating shared subnet";\r
@@ -1513,6 +1514,25 @@ module GENERIC-RESOURCE-API {
          }\r
       }\r
    }\r
+   grouping aggregate-routes {\r
+      list aggregate-routes {\r
+         key "route-id";\r
+         leaf route-id {\r
+            description "Unique id";\r
+            type string;\r
+         }\r
+         leaf start-address {\r
+            type inet:ip-address;\r
+         }\r
+         leaf cidr-mask {\r
+            type string;\r
+         }\r
+         leaf ip-version {\r
+            description "Use values 4 or 6.";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
    grouping pnf-information {\r
       container pnf-information {\r
          leaf pnf-name {\r
@@ -1865,6 +1885,16 @@ module GENERIC-RESOURCE-API {
          container input-parameters {\r
             uses param;\r
          }\r
+         leaf rebuild {\r
+            description "Value will indicate what to rebuild";\r
+            type string;\r
+         }\r
+         list configuration-ids {\r
+            key "configuration-id";\r
+            leaf configuration-id {\r
+               type string;\r
+            }\r
+         }\r
       }\r
    }\r
    grouping vnr-parameters {\r
@@ -2014,6 +2044,43 @@ module GENERIC-RESOURCE-API {
       }\r
    }\r
 \r
+   grouping vnf-vnr-rebuild-data {\r
+      container vnf-vnr-rebuild-data {\r
+         leaf vnf-id {\r
+            type string;\r
+         }\r
+         leaf vnf-service-instance-id {\r
+            type string;\r
+         }\r
+         list vnrs-data {\r
+            key "configuration-id";\r
+            leaf configuration-id {\r
+               type string;\r
+            }\r
+            leaf network-instance-group-id {\r
+               type string;\r
+            }\r
+            leaf network-id {\r
+               type string;\r
+            }\r
+            leaf vnfc-instance-group-function {\r
+               type string;\r
+            }\r
+            leaf network-instance-group-function {\r
+               type string;\r
+            }\r
+            leaf parent-port-role {\r
+               type string;\r
+            }\r
+            leaf upper-tag-id {\r
+               type uint32;\r
+            }\r
+            leaf lower-tag-id {\r
+               type uint32;\r
+            }\r
+         }\r
+      }\r
+   }\r
    grouping allotted-resource-information {\r
       container allotted-resource-information {\r
          leaf allotted-resource-id {\r
@@ -2229,6 +2296,7 @@ module GENERIC-RESOURCE-API {
                enum "enable";\r
                enum "update";\r
                enum "reoptimize";\r
+               enum "rebuild";\r
             }\r
          }\r
          leaf svc-notification-url {\r
@@ -2283,6 +2351,7 @@ module GENERIC-RESOURCE-API {
                enum "DeletePortMirrorConfigurationInstance";\r
                enum "ChangePortMirrorConfigurationInstance";\r
                enum "CreateGenericConfigurationInstance";\r
+               enum "RebuildGenericConfigurationInstance";\r
                enum "DeleteGenericConfigurationInstance";\r
                enum "PreloadVfModuleRequest";\r
                enum "DeletePreloadVfModuleRequest";\r
@@ -2848,6 +2917,7 @@ module GENERIC-RESOURCE-API {
             type string;\r
          }\r
          uses vnr-parameters;\r
+         uses vnf-vnr-rebuild-data;\r
       }\r
    }\r
    container services {\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 d29e674..ef5b9e4 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
@@ -2276,7 +2276,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC
             responseBuilder.setAckFinalIndicator("Y");
             log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
             RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
-                    .<PreloadNetworkTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
+                    .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
             return Futures.immediateFuture(rpcResult);
         }
 
@@ -2455,7 +2455,7 @@ public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURC
             responseBuilder.setAckFinalIndicator("Y");
             log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
             RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
-                    .<PreloadVfModuleTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
+                    .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
             return Futures.immediateFuture(rpcResult);
         }