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=2d7fe246d21b09f56ac2a7e38fbfbbf04382dde1;hb=82acfbc1c1f72312b315212d9fb7613aeb0409a3;hp=a6f8db995eca53fe054d5562f07cd1ce2f439ad7;hpb=1feec7f98f36d13a95e8105b70dfab448d87c902;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 a6f8db99..2d7fe246 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 @@ -385,6 +385,7 @@ module GENERIC-RESOURCE-API { type string; } } + uses aggregate-routes; uses subnets; leaf subnet-key-value { description "key-value provided to EIPAM when creating shared subnet"; @@ -1513,6 +1514,25 @@ module GENERIC-RESOURCE-API { } } } + grouping aggregate-routes { + list aggregate-routes { + key "route-id"; + leaf route-id { + description "Unique id"; + type string; + } + leaf start-address { + type inet:ip-address; + } + leaf cidr-mask { + type string; + } + leaf ip-version { + description "Use values 4 or 6."; + type string; + } + } + } grouping pnf-information { container pnf-information { leaf pnf-name { @@ -1862,9 +1882,23 @@ 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; } + leaf rebuild { + description "Value will indicate what to rebuild"; + type string; + } + list configuration-ids { + key "configuration-id"; + leaf configuration-id { + type string; + } + } } } grouping vnr-parameters { @@ -1872,6 +1906,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; } @@ -2014,6 +2052,43 @@ module GENERIC-RESOURCE-API { } } + grouping vnf-vnr-rebuild-data { + container vnf-vnr-rebuild-data { + leaf vnf-id { + type string; + } + leaf vnf-service-instance-id { + type string; + } + list vnrs-data { + key "configuration-id"; + leaf configuration-id { + type string; + } + leaf network-instance-group-id { + type string; + } + leaf network-id { + type string; + } + leaf vnfc-instance-group-function { + type string; + } + leaf network-instance-group-function { + type string; + } + leaf parent-port-role { + type string; + } + leaf upper-tag-id { + type uint32; + } + leaf lower-tag-id { + type uint32; + } + } + } + } grouping allotted-resource-information { container allotted-resource-information { leaf allotted-resource-id { @@ -2229,6 +2304,7 @@ module GENERIC-RESOURCE-API { enum "enable"; enum "update"; enum "reoptimize"; + enum "rebuild"; } } leaf svc-notification-url { @@ -2248,6 +2324,7 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; enum "DeleteNetworkInstance"; @@ -2283,6 +2360,7 @@ module GENERIC-RESOURCE-API { enum "DeletePortMirrorConfigurationInstance"; enum "ChangePortMirrorConfigurationInstance"; enum "CreateGenericConfigurationInstance"; + enum "RebuildGenericConfigurationInstance"; enum "DeleteGenericConfigurationInstance"; enum "PreloadVfModuleRequest"; enum "DeletePreloadVfModuleRequest"; @@ -2474,6 +2552,7 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; enum "DeleteNetworkInstance"; @@ -2848,6 +2927,7 @@ module GENERIC-RESOURCE-API { type string; } uses vnr-parameters; + uses vnf-vnr-rebuild-data; } } container services {