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=62d8c7bc2a42ed52c2ad19a2716113f9d34b43c9;hb=96b73dc371d805e658311c1544538bf11de80868;hp=3cc2dfb45613b061c42ac87c6fede8574fe8e723;hpb=42fd8811e27f007ea07ced3718003713f49767f5;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 3cc2dfb4..62d8c7bc 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
@@ -4,7 +4,7 @@ module GENERIC-RESOURCE-API {
 
    prefix generic-resource-api;
 
-   import ietf-inet-types { prefix "inet"; revision-date "2010-09-24"; }
+   import ietf-inet-types { prefix "inet"; revision-date "2013-07-15"; }
 
    import ietf-yang-types { prefix 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;
@@ -2324,6 +2346,7 @@ module GENERIC-RESOURCE-API {
             type enumeration {
                enum "CreateNetworkInstance";
                enum "ActivateNetworkInstance";
+               enum "DeActivateNetworkInstance";
                enum "CreateServiceInstance";
                enum "DeleteServiceInstance";
                enum "DeleteNetworkInstance";
@@ -2368,10 +2391,6 @@ module GENERIC-RESOURCE-API {
                enum "CreateForwardingPathInstance";
                enum "DeleteForwardingPathInstance";
                enum "UpdateForwardingPathInstance";
-               enum "CreateSDWANConnectivityInstance";
-               enum "ActivateSDWANConnectivityInstance";
-               enum "DeactivateSDWANConnectivityInstance";
-               enum "DeleteSDWANConnectivityInstance";
                enum "CreateSDWANDeviceInstance";
                enum "ActivateSDWANDeviceInstance";
                enum "DeactivateSDWANDeviceInstance";
@@ -2380,11 +2399,20 @@ module GENERIC-RESOURCE-API {
                enum "ActivateSDWANPortInstance";
                enum "DeactivateSDWANPortInstance";
                enum "DeleteSDWANPortInstance";
-               enum "CreateSDWANAttachmentInstance";
-               enum "ActivateSDWANAttachmentInstance";
-               enum "DeactivateSDWANAttachmentInstance";
-               enum "DeleteSDWANAttachmentInstance";
                enum "ReoptimizeSOTNInstance";
+               enum "CreateSDWANLanPortInstance";
+               enum "ActivateSDWANLanPortInstance";
+               enum "DeactivateSDWANLanPortInstance";
+               enum "DeleteSDWANLanPortInstance";
+               enum "CreateSDWANVpnInstance";
+               enum "ActivateSDWANVpnInstance";
+               enum "DeactivateSDWANVpnInstance";
+               enum "DeleteSDWANVpnInstance";
+               enum "CreateSDWANSiteInstance";
+               enum "ActivateSDWANSiteInstance";
+               enum "DeactivateSDWANSiteInstance";
+               enum "DeleteSDWANSiteInstance";
+               enum "SdwanBandwidthChange";
             }
          }
          leaf source {
@@ -2551,6 +2579,7 @@ module GENERIC-RESOURCE-API {
          type enumeration {
             enum "CreateNetworkInstance";
             enum "ActivateNetworkInstance";
+            enum "DeActivateNetworkInstance";
             enum "CreateServiceInstance";
             enum "DeleteServiceInstance";
             enum "DeleteNetworkInstance";
@@ -2594,10 +2623,6 @@ module GENERIC-RESOURCE-API {
             enum "CreateForwardingPathInstance";
             enum "DeleteForwardingPathInstance";
             enum "UpdateForwardingPathInstance";
-            enum "CreateSDWANConnectivityInstance";
-            enum "ActivateSDWANConnectivityInstance";
-            enum "DeactivateSDWANConnectivityInstance";
-            enum "DeleteSDWANConnectivityInstance";
             enum "CreateSDWANDeviceInstance";
             enum "ActivateSDWANDeviceInstance";
             enum "DeactivateSDWANDeviceInstance";
@@ -2606,11 +2631,20 @@ module GENERIC-RESOURCE-API {
             enum "ActivateSDWANPortInstance";
             enum "DeactivateSDWANPortInstance";
             enum "DeleteSDWANPortInstance";
-            enum "CreateSDWANAttachmentInstance";
-            enum "ActivateSDWANAttachmentInstance";
-            enum "DeactivateSDWANAttachmentInstance";
-            enum "DeleteSDWANAttachmentInstance";
             enum "ReoptimizeSOTNInstance";
+            enum "CreateSDWANLanPortInstance";
+            enum "ActivateSDWANLanPortInstance";
+            enum "DeactivateSDWANLanPortInstance";
+            enum "DeleteSDWANLanPortInstance";
+            enum "CreateSDWANVpnInstance";
+            enum "ActivateSDWANVpnInstance";
+            enum "DeactivateSDWANVpnInstance";
+            enum "DeleteSDWANVpnInstance";
+            enum "CreateSDWANSiteInstance";
+            enum "ActivateSDWANSiteInstance";
+            enum "DeactivateSDWANSiteInstance";
+            enum "DeleteSDWANSiteInstance";
+            enum "SdwanBandwidthChange";
          }
       }
       leaf last-svc-request-id {