X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=generic-resource-api%2Fmodel%2Fsrc%2Fmain%2Fyang%2FGENERIC-RESOURCE-API.yang;h=e1958aac83ba80494ce09dbb3e030fb47a96dada;hb=refs%2Fchanges%2F93%2F75293%2F1;hp=b03196c3908d73b231267047849bb1f88a40670b;hpb=3df91c638c31f756ed1dfcb47ce635a5c8458b35;p=sdnc%2Fnorthbound.git

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 b03196c3..e1958aac 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
@@ -399,6 +399,10 @@ module GENERIC-RESOURCE-API {
                   type string;
                   mandatory true;
                }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
                uses vpn-bindings;
                leaf vlan-tag-id {
                   type uint32;
@@ -1292,6 +1296,20 @@ module GENERIC-RESOURCE-API {
             description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI";
             type string;
          }
+         container networks {
+            list network {
+               key "network-id";
+               leaf network-id {
+                  description "Index into network-topology-identifier structure";
+                  type string;
+                  mandatory true;
+               }
+               leaf neutron-network-id {
+                  description "Neutron-network-id assigned by PO/RO";
+                  type string;
+               }
+            }
+         }
          container vnf-floating-ip {
             uses ip-addresses;
          }
@@ -1332,6 +1350,10 @@ module GENERIC-RESOURCE-API {
             type string;
             mandatory true;
          }
+         leaf neutron-network-id {
+            description "Neutron network id assigned by PO/RP";
+            type string;
+         }
          leaf network-name {
             description "Subinterface network name";
             type uint32;
@@ -1882,6 +1904,10 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {
             type string;
          }
+         leaf vf-module-id {
+            description "This is mandatory in case of rebuild";
+            type string;
+         }
          container input-parameters {
             uses param;
          }
@@ -1902,6 +1928,10 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {
             type string;
          }
+         leaf vf-module-id {
+            description "This is mandatory in case of rebuild";
+            type string;
+         }
          leaf vnf-service-instance-id {
             type string;
          }
@@ -2316,6 +2346,7 @@ module GENERIC-RESOURCE-API {
             type enumeration {
                enum "CreateNetworkInstance";
                enum "ActivateNetworkInstance";
+               enum "DeActivateNetworkInstance";
                enum "CreateServiceInstance";
                enum "DeleteServiceInstance";
                enum "DeleteNetworkInstance";
@@ -2543,6 +2574,7 @@ module GENERIC-RESOURCE-API {
          type enumeration {
             enum "CreateNetworkInstance";
             enum "ActivateNetworkInstance";
+            enum "DeActivateNetworkInstance";
             enum "CreateServiceInstance";
             enum "DeleteServiceInstance";
             enum "DeleteNetworkInstance";