Add vf-module-id to gc-request-input and response

[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 a9c5cd6..3cc2dfb 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
@@ -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
@@ -881,6 +882,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
@@ -1472,7 +1495,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 +1514,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 +1882,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 +1906,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
@@ -1977,7 +2037,7 @@ module GENERIC-RESOURCE-API {
    }\r
 \r
    grouping connection-attachment-topology {\r
-      container brg-topology {\r
+      container connection-attachment-topology {\r
          uses allotted-resource-identifiers;\r
          uses onap-model-information;\r
          uses connection-attachment-assignments;\r
@@ -1992,6 +2052,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 +2303,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
@@ -2260,6 +2359,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
@@ -2284,6 +2384,7 @@ module GENERIC-RESOURCE-API {
                enum "ActivateSDWANAttachmentInstance";\r
                enum "DeactivateSDWANAttachmentInstance";\r
                enum "DeleteSDWANAttachmentInstance";\r
+               enum "ReoptimizeSOTNInstance";\r
             }\r
          }\r
          leaf source {\r
@@ -2354,6 +2455,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 +2543,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";\r
             enum "create";\r
             enum "changeassign";\r
+            enum "reoptimize";\r
          }\r
       }\r
       leaf last-action {\r
@@ -2504,6 +2610,7 @@ module GENERIC-RESOURCE-API {
             enum "ActivateSDWANAttachmentInstance";\r
             enum "DeactivateSDWANAttachmentInstance";\r
             enum "DeleteSDWANAttachmentInstance";\r
+            enum "ReoptimizeSOTNInstance";\r
          }\r
       }\r
       leaf last-svc-request-id {\r
@@ -2818,6 +2925,7 @@ module GENERIC-RESOURCE-API {
             type string;\r
          }\r
          uses vnr-parameters;\r
+         uses vnf-vnr-rebuild-data;\r
       }\r
    }\r
    container services {\r