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>

2 files changed, 72 insertions, 2 deletions

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 a6f8db99..b03196c3 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
@@ -385,6 +385,7 @@ module GENERIC-RESOURCE-API {
                type string;

             }

          }

+         uses aggregate-routes;

          uses subnets;

          leaf subnet-key-value {

             description "key-value provided to EIPAM when  creating shared subnet";

@@ -1513,6 +1514,25 @@ module GENERIC-RESOURCE-API {
          }

       }

    }

+   grouping aggregate-routes {

+      list aggregate-routes {

+         key "route-id";

+         leaf route-id {

+            description "Unique id";

+            type string;

+         }

+         leaf start-address {

+            type inet:ip-address;

+         }

+         leaf cidr-mask {

+            type string;

+         }

+         leaf ip-version {

+            description "Use values 4 or 6.";

+            type string;

+         }

+      }

+   }

    grouping pnf-information {

       container pnf-information {

          leaf pnf-name {

@@ -1865,6 +1885,16 @@ module GENERIC-RESOURCE-API {
          container input-parameters {

             uses param;

          }

+         leaf rebuild {

+            description "Value will indicate what to rebuild";

+            type string;

+         }

+         list configuration-ids {

+            key "configuration-id";

+            leaf configuration-id {

+               type string;

+            }

+         }

       }

    }

    grouping vnr-parameters {

@@ -2014,6 +2044,43 @@ module GENERIC-RESOURCE-API {
       }

    }

 

+   grouping vnf-vnr-rebuild-data {

+      container vnf-vnr-rebuild-data {

+         leaf vnf-id {

+            type string;

+         }

+         leaf vnf-service-instance-id {

+            type string;

+         }

+         list vnrs-data {

+            key "configuration-id";

+            leaf configuration-id {

+               type string;

+            }

+            leaf network-instance-group-id {

+               type string;

+            }

+            leaf network-id {

+               type string;

+            }

+            leaf vnfc-instance-group-function {

+               type string;

+            }

+            leaf network-instance-group-function {

+               type string;

+            }

+            leaf parent-port-role {

+               type string;

+            }

+            leaf upper-tag-id {

+               type uint32;

+            }

+            leaf lower-tag-id {

+               type uint32;

+            }

+         }

+      }

+   }

    grouping allotted-resource-information {

       container allotted-resource-information {

          leaf allotted-resource-id {

@@ -2229,6 +2296,7 @@ module GENERIC-RESOURCE-API {
                enum "enable";

                enum "update";

                enum "reoptimize";

+               enum "rebuild";

             }

          }

          leaf svc-notification-url {

@@ -2283,6 +2351,7 @@ module GENERIC-RESOURCE-API {
                enum "DeletePortMirrorConfigurationInstance";

                enum "ChangePortMirrorConfigurationInstance";

                enum "CreateGenericConfigurationInstance";

+               enum "RebuildGenericConfigurationInstance";

                enum "DeleteGenericConfigurationInstance";

                enum "PreloadVfModuleRequest";

                enum "DeletePreloadVfModuleRequest";

@@ -2848,6 +2917,7 @@ module GENERIC-RESOURCE-API {
             type string;

          }

          uses vnr-parameters;

+         uses vnf-vnr-rebuild-data;

       }

    }

    container services {

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 d29e674d..ef5b9e47 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
@@ -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);
         }