Add aggregate routes and VNR rebuild to GR Yang

[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 c1ad9b9..b03196c 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
@@ -1513,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
@@ -1865,6 +1885,16 @@ module GENERIC-RESOURCE-API {
          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
@@ -2014,6 +2044,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
@@ -2228,6 +2295,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
@@ -2282,6 +2351,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
@@ -2306,6 +2376,7 @@ module GENERIC-RESOURCE-API {
                enum "ActivateSDWANAttachmentInstance";\r
                enum "DeactivateSDWANAttachmentInstance";\r
                enum "DeleteSDWANAttachmentInstance";\r
+               enum "ReoptimizeSOTNInstance";\r
             }\r
          }\r
          leaf source {\r
@@ -2376,6 +2447,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
@@ -2460,6 +2535,7 @@ module GENERIC-RESOURCE-API {
             enum "deactivate";\r
             enum "create";\r
             enum "changeassign";\r
+            enum "reoptimize";\r
          }\r
       }\r
       leaf last-action {\r
@@ -2526,6 +2602,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
@@ -2840,6 +2917,7 @@ module GENERIC-RESOURCE-API {
             type string;\r
          }\r
          uses vnr-parameters;\r
+         uses vnf-vnr-rebuild-data;\r
       }\r
    }\r
    container services {\r