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=86458994ea556323b37b2d4d899e60786dee4749;hb=8e1d45becd2846910805fed633bd49f2fc90a917;hp=a6f8db995eca53fe054d5562f07cd1ce2f439ad7;hpb=2f496435d249baf544abdcb2c5e8a467cfa18f5a;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..86458994 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; } @@ -51,6 +51,20 @@ module GENERIC-RESOURCE-API { } } } + container pnfs { + list pnf { + key "pnf-id"; + leaf pnf-id { + type string; + mandatory true; + } + container pnf-data { + uses pnf-operation-information; + uses pnf-topology; + uses pnf-level-oper-status; + } + } + } container vnfs { list vnf { key "vnf-id"; @@ -385,6 +399,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 +413,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; @@ -424,6 +443,79 @@ module GENERIC-RESOURCE-API { uses oper-status-data; } } + grouping pnf-operation-information { + uses sdnc-request-header; + uses request-information; + uses service-information; + uses pnf-details; + uses pnf-request-input; + } + grouping pnf-details { + container pnf-details { + leaf pnf-id { + description "pnfId*Identifier of this Pnf information element. CORRELATIONID = PNF-NAME (A&AI)"; + type string; + mandatory true; + } + leaf pnf-type { + description "pnfType (template)*Type of Resource. NEW type: PNF (pre-defined in SDC)"; + type string; + } + leaf pnf-name { + type string; + } + uses onap-model-information; + } + } + grouping pnf-request-input { + container pnf-request-input { + leaf request-version { + description "keep this? e.g. 1702"; + type string; + } + leaf pnf-name { + type string; + } + uses region-identifier; + container pnf-input-parameters { + uses param; + } + } + } + grouping pnf-topology { + container pnf-topology { + uses pnf-topology-identifier-structure; + uses region-identifier; + uses onap-model-information; + container pnf-parameters-data { + uses param; + } + leaf sdnc-generated-cloud-resources { + description "Indicate if source is sdnc generated cloud param.When true, the parameters are literal HEAT template parameter names;When false, the parameters need to be converted to HEAT format"; + type boolean; + } + } + } + grouping pnf-topology-identifier-structure { + container pnf-topology-identifier-structure { + leaf pnf-id { + type string; + } + leaf pnf-type { + description "In preload tree, this label is used for the vf-module-type"; + type string; + } + leaf pnf-name { + description "optionally comes from pnf-request-input container or is assigned by sdn-c"; + type string; + } + } + } + grouping pnf-level-oper-status { + container pnf-level-oper-status { + uses oper-status-data; + } + } grouping vnf-operation-information { uses sdnc-request-header; uses request-information; @@ -702,6 +794,21 @@ module GENERIC-RESOURCE-API { } } uses vlan-vnfc-instance-groups; + container dhcp-subnet-assignments { + list dhcp-subnet-assignment { + key "neutron-subnet-id"; + leaf neutron-subnet-id { + description "Same as subnet-id in subnet-data structure"; + type string; + } + leaf network-role { + type string; + } + leaf ip-version { + type string; + } + } + } } } grouping vm-topology-data { @@ -1291,6 +1398,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 +1452,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; @@ -1513,6 +1638,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 +2006,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 +2030,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 +2176,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 +2428,7 @@ module GENERIC-RESOURCE-API { enum "enable"; enum "update"; enum "reoptimize"; + enum "rebuild"; } } leaf svc-notification-url { @@ -2248,12 +2448,16 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; enum "DeleteNetworkInstance"; enum "CreateVnfInstance"; enum "ActivateVnfInstance"; enum "DeleteVnfInstance"; + enum "CreatePnfInstance"; + enum "ActivatePnfInstance"; + enum "DeletePnfInstance"; enum "CreateVfModuleInstance"; enum "ActivateVfModuleInstance"; enum "DeleteVfModuleInstance"; @@ -2283,6 +2487,7 @@ module GENERIC-RESOURCE-API { enum "DeletePortMirrorConfigurationInstance"; enum "ChangePortMirrorConfigurationInstance"; enum "CreateGenericConfigurationInstance"; + enum "RebuildGenericConfigurationInstance"; enum "DeleteGenericConfigurationInstance"; enum "PreloadVfModuleRequest"; enum "DeletePreloadVfModuleRequest"; @@ -2291,10 +2496,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"; @@ -2303,11 +2504,25 @@ 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"; + enum "CreateAccessConnectivityInstance"; + enum "DeleteAccessConnectivityInstance"; + enum "CreateInternetProfileInstance"; + enum "ChangeInternetProfileInstance"; + enum "DeleteInternetProfileInstance"; } } leaf source { @@ -2474,12 +2689,16 @@ module GENERIC-RESOURCE-API { type enumeration { enum "CreateNetworkInstance"; enum "ActivateNetworkInstance"; + enum "DeActivateNetworkInstance"; + enum "DeleteNetworkInstance"; enum "CreateServiceInstance"; enum "DeleteServiceInstance"; - enum "DeleteNetworkInstance"; enum "CreateVnfInstance"; enum "ActivateVnfInstance"; enum "DeleteVnfInstance"; + enum "CreatePnfInstance"; + enum "ActivatePnfInstance"; + enum "DeletePnfInstance"; enum "CreateVfModuleInstance"; enum "ActivateVfModuleInstance"; enum "DeleteVfModuleInstance"; @@ -2517,10 +2736,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"; @@ -2529,11 +2744,25 @@ 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"; + enum "CreateAccessConnectivityInstance"; + enum "DeleteAccessConnectivityInstance"; + enum "CreateInternetProfileInstance"; + enum "ChangeInternetProfileInstance"; + enum "DeleteInternetProfileInstance"; } } leaf last-svc-request-id { @@ -2579,6 +2808,11 @@ module GENERIC-RESOURCE-API { uses instance-reference; } } + grouping pnf-response-information { + container pnf-response-information { + uses instance-reference; + } + } grouping contrail-route-response-information { container contrail-route-response-information { uses instance-reference; @@ -2848,6 +3082,7 @@ module GENERIC-RESOURCE-API { type string; } uses vnr-parameters; + uses vnf-vnr-rebuild-data; } } container services { @@ -3023,6 +3258,16 @@ module GENERIC-RESOURCE-API { uses service-response-information; } } + rpc pnf-topology-operation { + input { + uses pnf-operation-information; + } + output { + uses topology-response-common; + uses pnf-response-information; + uses service-response-information; + } + } rpc contrail-route-topology-operation { input { uses contrail-route-operation-information;