Add dhcp-subnet-assignments container

[sdnc/northbound.git] / generic-resource-api / model / src / main / yang / GENERIC-RESOURCE-API.yang

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 2d7fe24..e45447e 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
@@ -4,7 +4,7 @@ module GENERIC-RESOURCE-API {
 \r
    prefix generic-resource-api;\r
 \r
-   import ietf-inet-types { prefix "inet"; revision-date "2010-09-24"; }\r
+   import ietf-inet-types { prefix "inet"; revision-date "2013-07-15"; }\r
 \r
    import ietf-yang-types { prefix yang; }\r
 \r
@@ -399,6 +399,10 @@ module GENERIC-RESOURCE-API {
                   type string;\r
                   mandatory true;\r
                }\r
+               leaf neutron-network-id {\r
+                  description "Neutron-network-id assigned by PO/RO";\r
+                  type string;\r
+               }\r
                uses vpn-bindings;\r
                leaf vlan-tag-id {\r
                   type uint32;\r
@@ -703,6 +707,21 @@ module GENERIC-RESOURCE-API {
             }\r
          }\r
          uses vlan-vnfc-instance-groups;\r
+         container dhcp-subnet-assignments {\r
+            list dhcp-subnet-assignment {\r
+               key "neutron-subnet-id";\r
+               leaf neutron-subnet-id {\r
+                  description "Same as subnet-id in subnet-data structure";\r
+                  type string;\r
+               }\r
+               leaf network-role {\r
+                  type string;\r
+               }\r
+               leaf ip-version {\r
+                  type string;\r
+               }\r
+            }\r
+         }\r
       }\r
    }\r
    grouping vm-topology-data {\r
@@ -1292,6 +1311,20 @@ module GENERIC-RESOURCE-API {
             description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI";\r
             type string;\r
          }\r
+         container networks {\r
+            list network {\r
+               key "network-id";\r
+               leaf network-id {\r
+                  description "Index into network-topology-identifier structure";\r
+                  type string;\r
+                  mandatory true;\r
+               }\r
+               leaf neutron-network-id {\r
+                  description "Neutron-network-id assigned by PO/RO";\r
+                  type string;\r
+               }\r
+            }\r
+         }\r
          container vnf-floating-ip {\r
             uses ip-addresses;\r
          }\r
@@ -1332,6 +1365,10 @@ module GENERIC-RESOURCE-API {
             type string;\r
             mandatory true;\r
          }\r
+         leaf neutron-network-id {\r
+            description "Neutron network id assigned by PO/RP";\r
+            type string;\r
+         }\r
          leaf network-name {\r
             description "Subinterface network name";\r
             type uint32;\r
@@ -2369,10 +2406,6 @@ module GENERIC-RESOURCE-API {
                enum "CreateForwardingPathInstance";\r
                enum "DeleteForwardingPathInstance";\r
                enum "UpdateForwardingPathInstance";\r
-               enum "CreateSDWANConnectivityInstance";\r
-               enum "ActivateSDWANConnectivityInstance";\r
-               enum "DeactivateSDWANConnectivityInstance";\r
-               enum "DeleteSDWANConnectivityInstance";\r
                enum "CreateSDWANDeviceInstance";\r
                enum "ActivateSDWANDeviceInstance";\r
                enum "DeactivateSDWANDeviceInstance";\r
@@ -2381,11 +2414,20 @@ module GENERIC-RESOURCE-API {
                enum "ActivateSDWANPortInstance";\r
                enum "DeactivateSDWANPortInstance";\r
                enum "DeleteSDWANPortInstance";\r
-               enum "CreateSDWANAttachmentInstance";\r
-               enum "ActivateSDWANAttachmentInstance";\r
-               enum "DeactivateSDWANAttachmentInstance";\r
-               enum "DeleteSDWANAttachmentInstance";\r
                enum "ReoptimizeSOTNInstance";\r
+               enum "CreateSDWANLanPortInstance";\r
+               enum "ActivateSDWANLanPortInstance";\r
+               enum "DeactivateSDWANLanPortInstance";\r
+               enum "DeleteSDWANLanPortInstance";\r
+               enum "CreateSDWANVpnInstance";\r
+               enum "ActivateSDWANVpnInstance";\r
+               enum "DeactivateSDWANVpnInstance";\r
+               enum "DeleteSDWANVpnInstance";\r
+               enum "CreateSDWANSiteInstance";\r
+               enum "ActivateSDWANSiteInstance";\r
+               enum "DeactivateSDWANSiteInstance";\r
+               enum "DeleteSDWANSiteInstance";\r
+               enum "SdwanBandwidthChange";\r
             }\r
          }\r
          leaf source {\r
@@ -2596,10 +2638,6 @@ module GENERIC-RESOURCE-API {
             enum "CreateForwardingPathInstance";\r
             enum "DeleteForwardingPathInstance";\r
             enum "UpdateForwardingPathInstance";\r
-            enum "CreateSDWANConnectivityInstance";\r
-            enum "ActivateSDWANConnectivityInstance";\r
-            enum "DeactivateSDWANConnectivityInstance";\r
-            enum "DeleteSDWANConnectivityInstance";\r
             enum "CreateSDWANDeviceInstance";\r
             enum "ActivateSDWANDeviceInstance";\r
             enum "DeactivateSDWANDeviceInstance";\r
@@ -2608,11 +2646,20 @@ module GENERIC-RESOURCE-API {
             enum "ActivateSDWANPortInstance";\r
             enum "DeactivateSDWANPortInstance";\r
             enum "DeleteSDWANPortInstance";\r
-            enum "CreateSDWANAttachmentInstance";\r
-            enum "ActivateSDWANAttachmentInstance";\r
-            enum "DeactivateSDWANAttachmentInstance";\r
-            enum "DeleteSDWANAttachmentInstance";\r
             enum "ReoptimizeSOTNInstance";\r
+            enum "CreateSDWANLanPortInstance";\r
+            enum "ActivateSDWANLanPortInstance";\r
+            enum "DeactivateSDWANLanPortInstance";\r
+            enum "DeleteSDWANLanPortInstance";\r
+            enum "CreateSDWANVpnInstance";\r
+            enum "ActivateSDWANVpnInstance";\r
+            enum "DeactivateSDWANVpnInstance";\r
+            enum "DeleteSDWANVpnInstance";\r
+            enum "CreateSDWANSiteInstance";\r
+            enum "ActivateSDWANSiteInstance";\r
+            enum "DeactivateSDWANSiteInstance";\r
+            enum "DeleteSDWANSiteInstance";\r
+            enum "SdwanBandwidthChange";\r
          }\r
       }\r
       leaf last-svc-request-id {\r