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=e45447e3aa93a48f76d4b801c41bdfe7b4f02c7a;hb=d20371cb9c1a5f72f6bdf18e9a63709e07197443;hp=b03196c3908d73b231267047849bb1f88a40670b;hpb=a5b461ee63d898f8d6fb22ec5987b728d1f05e41;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..e45447e3 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;
@@ -703,6 +707,21 @@ module GENERIC-RESOURCE-API {
             }
          }
          uses vlan-vnfc-instance-groups;
+         container dhcp-subnet-assignments {
+            list dhcp-subnet-assignment {
+               key "neutron-subnet-id";
+               leaf neutron-subnet-id {
+                  description "Same as subnet-id in subnet-data structure";
+                  type string;
+               }
+               leaf network-role {
+                  type string;
+               }
+               leaf ip-version {
+                  type string;
+               }
+            }
+         }
       }
    }
    grouping vm-topology-data {
@@ -1292,6 +1311,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 +1365,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 +1919,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 +1943,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 +2361,7 @@ module GENERIC-RESOURCE-API {
             type enumeration {
                enum "CreateNetworkInstance";
                enum "ActivateNetworkInstance";
+               enum "DeActivateNetworkInstance";
                enum "CreateServiceInstance";
                enum "DeleteServiceInstance";
                enum "DeleteNetworkInstance";
@@ -2360,10 +2406,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";
@@ -2372,11 +2414,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 {
@@ -2543,6 +2594,7 @@ module GENERIC-RESOURCE-API {
          type enumeration {
             enum "CreateNetworkInstance";
             enum "ActivateNetworkInstance";
+            enum "DeActivateNetworkInstance";
             enum "CreateServiceInstance";
             enum "DeleteServiceInstance";
             enum "DeleteNetworkInstance";
@@ -2586,10 +2638,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";
@@ -2598,11 +2646,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 {