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=62d8c7bc2a42ed52c2ad19a2716113f9d34b43c9;hb=96b73dc371d805e658311c1544538bf11de80868;hp=b13091ba4a3803818e7461bef667f8eff2a3cd65;hpb=546d07903ece8dfbfcb9ecf987b42df417a65fb9;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 b13091ba..62d8c7bc 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 @@ -4,7 +4,7 @@ module GENERIC-RESOURCE-API { prefix generic-resource-api; - import ietf-inet-types { prefix "inet"; revision-date "2010-09-24"; } + import ietf-inet-types { prefix "inet"; revision-date "2013-07-15"; } import ietf-yang-types { prefix 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"; @@ -398,6 +399,10 @@ module GENERIC-RESOURCE-API { type string; mandatory true; } + leaf neutron-network-id { + description "Neutron-network-id assigned by PO/RO"; + type string; + } uses vpn-bindings; leaf vlan-tag-id { type uint32; @@ -1291,6 +1296,20 @@ module GENERIC-RESOURCE-API { description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI"; type string; } + container networks { + list network { + key "network-id"; + leaf network-id { + description "Index into network-topology-identifier structure"; + type string; + mandatory true; + } + leaf neutron-network-id { + description "Neutron-network-id assigned by PO/RO"; + type string; + } + } + } container vnf-floating-ip { uses ip-addresses; } @@ -1331,6 +1350,10 @@ module GENERIC-RESOURCE-API { type string; mandatory true; } + leaf neutron-network-id { + description "Neutron network id assigned by PO/RP"; + type string; + } leaf network-name { description "Subinterface network name"; type uint32; @@ -1494,7 +1517,7 @@ module GENERIC-RESOURCE-API { description "port-index when multiple CPs connect to same network. Default zero (0)"; type string; } - list vlan-tags { + list vlan-data { key "vlan-uuid"; leaf vlan-uuid { description "Key to vlan-tag uuid object in A&AI Generated by vlan mS"; @@ -1513,6 +1536,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 +1904,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 +1928,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 +2074,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 { @@ -2228,6 +2325,8 @@ module GENERIC-RESOURCE-API { enum "disable"; enum "enable"; enum "update"; + enum "reoptimize"; + enum "rebuild"; } } leaf svc-notification-url { @@ -2247,6 +2346,7 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; enum "DeleteNetworkInstance"; @@ -2282,6 +2382,7 @@ module GENERIC-RESOURCE-API { enum "DeletePortMirrorConfigurationInstance"; enum "ChangePortMirrorConfigurationInstance"; enum "CreateGenericConfigurationInstance"; + enum "RebuildGenericConfigurationInstance"; enum "DeleteGenericConfigurationInstance"; enum "PreloadVfModuleRequest"; enum "DeletePreloadVfModuleRequest"; @@ -2290,10 +2391,6 @@ module GENERIC-RESOURCE-API { enum "CreateForwardingPathInstance"; enum "DeleteForwardingPathInstance"; enum "UpdateForwardingPathInstance"; - enum "CreateSDWANConnectivityInstance"; - enum "ActivateSDWANConnectivityInstance"; - enum "DeactivateSDWANConnectivityInstance"; - enum "DeleteSDWANConnectivityInstance"; enum "CreateSDWANDeviceInstance"; enum "ActivateSDWANDeviceInstance"; enum "DeactivateSDWANDeviceInstance"; @@ -2302,10 +2399,20 @@ module GENERIC-RESOURCE-API { enum "ActivateSDWANPortInstance"; enum "DeactivateSDWANPortInstance"; enum "DeleteSDWANPortInstance"; - enum "CreateSDWANAttachmentInstance"; - enum "ActivateSDWANAttachmentInstance"; - enum "DeactivateSDWANAttachmentInstance"; - enum "DeleteSDWANAttachmentInstance"; + enum "ReoptimizeSOTNInstance"; + enum "CreateSDWANLanPortInstance"; + enum "ActivateSDWANLanPortInstance"; + enum "DeactivateSDWANLanPortInstance"; + enum "DeleteSDWANLanPortInstance"; + enum "CreateSDWANVpnInstance"; + enum "ActivateSDWANVpnInstance"; + enum "DeactivateSDWANVpnInstance"; + enum "DeleteSDWANVpnInstance"; + enum "CreateSDWANSiteInstance"; + enum "ActivateSDWANSiteInstance"; + enum "DeactivateSDWANSiteInstance"; + enum "DeleteSDWANSiteInstance"; + enum "SdwanBandwidthChange"; } } leaf source { @@ -2376,6 +2483,10 @@ module GENERIC-RESOURCE-API { description "The AIC cloud region which maps to contrail versions"; type string; } + leaf cloud-owner { + description "The cloud owner provided by the caller"; + type string; + } leaf aic-clli { description "Not expected to be used"; type string; @@ -2460,6 +2571,7 @@ module GENERIC-RESOURCE-API { enum "deactivate"; enum "create"; enum "changeassign"; + enum "reoptimize"; } } leaf last-action { @@ -2467,6 +2579,7 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; enum "DeleteNetworkInstance"; @@ -2510,10 +2623,6 @@ module GENERIC-RESOURCE-API { enum "CreateForwardingPathInstance"; enum "DeleteForwardingPathInstance"; enum "UpdateForwardingPathInstance"; - enum "CreateSDWANConnectivityInstance"; - enum "ActivateSDWANConnectivityInstance"; - enum "DeactivateSDWANConnectivityInstance"; - enum "DeleteSDWANConnectivityInstance"; enum "CreateSDWANDeviceInstance"; enum "ActivateSDWANDeviceInstance"; enum "DeactivateSDWANDeviceInstance"; @@ -2522,10 +2631,20 @@ module GENERIC-RESOURCE-API { enum "ActivateSDWANPortInstance"; enum "DeactivateSDWANPortInstance"; enum "DeleteSDWANPortInstance"; - enum "CreateSDWANAttachmentInstance"; - enum "ActivateSDWANAttachmentInstance"; - enum "DeactivateSDWANAttachmentInstance"; - enum "DeleteSDWANAttachmentInstance"; + enum "ReoptimizeSOTNInstance"; + enum "CreateSDWANLanPortInstance"; + enum "ActivateSDWANLanPortInstance"; + enum "DeactivateSDWANLanPortInstance"; + enum "DeleteSDWANLanPortInstance"; + enum "CreateSDWANVpnInstance"; + enum "ActivateSDWANVpnInstance"; + enum "DeactivateSDWANVpnInstance"; + enum "DeleteSDWANVpnInstance"; + enum "CreateSDWANSiteInstance"; + enum "ActivateSDWANSiteInstance"; + enum "DeactivateSDWANSiteInstance"; + enum "DeleteSDWANSiteInstance"; + enum "SdwanBandwidthChange"; } } leaf last-svc-request-id { @@ -2840,6 +2959,7 @@ module GENERIC-RESOURCE-API { type string; } uses vnr-parameters; + uses vnf-vnr-rebuild-data; } } container services {