Code Review / sdnc / northbound.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
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 d94dd8a..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
@@ -385,6 +385,7 @@ module GENERIC-RESOURCE-API {
                type string;\r
             }\r
          }\r
+         uses aggregate-routes;\r
          uses subnets;\r
          leaf subnet-key-value {\r
             description "key-value provided to EIPAM when  creating shared subnet";\r
@@ -398,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
@@ -702,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
@@ -881,6 +901,28 @@ module GENERIC-RESOURCE-API {
             ordered-by user;\r
          }\r
       }\r
+      container sriov-parameters {\r
+         container heat-vlan-filters {\r
+            leaf-list heat-vlan-filter {\r
+               type string;\r
+               ordered-by user;\r
+            }\r
+         }\r
+         container application-tags {\r
+            container c-tags {\r
+               leaf-list c-tag {\r
+                  type string;\r
+                  ordered-by user;\r
+               }\r
+            }\r
+            container s-tags {\r
+               leaf-list s-tag {\r
+                  type string;\r
+                  ordered-by user;\r
+               }\r
+            }\r
+         }\r
+      }\r
       leaf is-trunked {\r
          type boolean;\r
       }\r
@@ -1269,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
@@ -1309,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
@@ -1472,7 +1532,7 @@ module GENERIC-RESOURCE-API {
             description "port-index when multiple CPs connect to same network. Default zero (0)";\r
             type string;\r
          }\r
-         list vlan-tags {\r
+         list vlan-data {\r
             key "vlan-uuid";\r
             leaf vlan-uuid {\r
                description "Key to vlan-tag uuid object in A&AI Generated by vlan mS";\r
@@ -1491,6 +1551,25 @@ module GENERIC-RESOURCE-API {
          }\r
       }\r
    }\r
+   grouping aggregate-routes {\r
+      list aggregate-routes {\r
+         key "route-id";\r
+         leaf route-id {\r
+            description "Unique id";\r
+            type string;\r
+         }\r
+         leaf start-address {\r
+            type inet:ip-address;\r
+         }\r
+         leaf cidr-mask {\r
+            type string;\r
+         }\r
+         leaf ip-version {\r
+            description "Use values 4 or 6.";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
    grouping pnf-information {\r
       container pnf-information {\r
          leaf pnf-name {\r
@@ -1840,9 +1919,23 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {\r
             type string;\r
          }\r
+         leaf vf-module-id {\r
+            description "This is mandatory in case of rebuild";\r
+            type string;\r
+         }\r
          container input-parameters {\r
             uses param;\r
          }\r
+         leaf rebuild {\r
+            description "Value will indicate what to rebuild";\r
+            type string;\r
+         }\r
+         list configuration-ids {\r
+            key "configuration-id";\r
+            leaf configuration-id {\r
+               type string;\r
+            }\r
+         }\r
       }\r
    }\r
    grouping vnr-parameters {\r
@@ -1850,6 +1943,10 @@ module GENERIC-RESOURCE-API {
          leaf vnf-id {\r
             type string;\r
          }\r
+         leaf vf-module-id {\r
+            description "This is mandatory in case of rebuild";\r
+            type string;\r
+         }\r
          leaf vnf-service-instance-id {\r
             type string;\r
          }\r
@@ -1992,6 +2089,43 @@ module GENERIC-RESOURCE-API {
       }\r
    }\r
 \r
+   grouping vnf-vnr-rebuild-data {\r
+      container vnf-vnr-rebuild-data {\r
+         leaf vnf-id {\r
+            type string;\r
+         }\r
+         leaf vnf-service-instance-id {\r
+            type string;\r
+         }\r
+         list vnrs-data {\r
+            key "configuration-id";\r
+            leaf configuration-id {\r
+               type string;\r
+            }\r
+            leaf network-instance-group-id {\r
+               type string;\r
+            }\r
+            leaf network-id {\r
+               type string;\r
+            }\r
+            leaf vnfc-instance-group-function {\r
+               type string;\r
+            }\r
+            leaf network-instance-group-function {\r
+               type string;\r
+            }\r
+            leaf parent-port-role {\r
+               type string;\r
+            }\r
+            leaf upper-tag-id {\r
+               type uint32;\r
+            }\r
+            leaf lower-tag-id {\r
+               type uint32;\r
+            }\r
+         }\r
+      }\r
+   }\r
    grouping allotted-resource-information {\r
       container allotted-resource-information {\r
          leaf allotted-resource-id {\r
@@ -2206,6 +2340,8 @@ module GENERIC-RESOURCE-API {
                enum "disable";\r
                enum "enable";\r
                enum "update";\r
+               enum "reoptimize";\r
+               enum "rebuild";\r
             }\r
          }\r
          leaf svc-notification-url {\r
@@ -2225,6 +2361,7 @@ module GENERIC-RESOURCE-API {
             type enumeration {\r
                enum "CreateNetworkInstance";\r
                enum "ActivateNetworkInstance";\r
+               enum "DeActivateNetworkInstance";\r
                enum "CreateServiceInstance";\r
                enum "DeleteServiceInstance";\r
                enum "DeleteNetworkInstance";\r
@@ -2260,6 +2397,7 @@ module GENERIC-RESOURCE-API {
                enum "DeletePortMirrorConfigurationInstance";\r
                enum "ChangePortMirrorConfigurationInstance";\r
                enum "CreateGenericConfigurationInstance";\r
+               enum "RebuildGenericConfigurationInstance";\r
                enum "DeleteGenericConfigurationInstance";\r
                enum "PreloadVfModuleRequest";\r
                enum "DeletePreloadVfModuleRequest";\r
@@ -2268,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
@@ -2280,10 +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
@@ -2354,6 +2498,10 @@ module GENERIC-RESOURCE-API {
          description "The AIC cloud region which maps to contrail versions";\r
          type string;\r
       }\r
+      leaf cloud-owner {\r
+         description "The cloud owner provided by the caller";\r
+         type string;\r
+      }\r
       leaf aic-clli {\r
          description "Not expected to be used";\r
          type string;\r
@@ -2438,6 +2586,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";\r
             enum "create";\r
             enum "changeassign";\r
+            enum "reoptimize";\r
          }\r
       }\r
       leaf last-action {\r
@@ -2445,6 +2594,7 @@ module GENERIC-RESOURCE-API {
          type enumeration {\r
             enum "CreateNetworkInstance";\r
             enum "ActivateNetworkInstance";\r
+            enum "DeActivateNetworkInstance";\r
             enum "CreateServiceInstance";\r
             enum "DeleteServiceInstance";\r
             enum "DeleteNetworkInstance";\r
@@ -2488,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
@@ -2500,10 +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
@@ -2818,6 +2974,7 @@ module GENERIC-RESOURCE-API {
             type string;\r
          }\r
          uses vnr-parameters;\r
+         uses vnf-vnr-rebuild-data;\r
       }\r
    }\r
    container services {\r
SDNC northbound adaptors