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=26f48c8175fdcbca57dbb096c031831adede53f8;hb=8c8634e2b272a625bf7434e428c85ac91793c068;hp=1332887bcced199b59fb1fe0b8567c5032808171;hpb=fc7132985898981337055ae4cef3104836fd16d1;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 1332887b..26f48c81 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 @@ -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,17 @@ module GENERIC-RESOURCE-API { type string; } } + container aggregate-route-policy { + leaf aggregate-route-policy-name { + type string; + } + leaf ipv4-aggregate-route-level { + type string; + } + leaf ipv6-aggregate-route-level { + type string; + } + } uses aggregate-routes; uses subnets; leaf subnet-key-value { @@ -429,6 +454,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; @@ -707,6 +805,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 { @@ -2353,6 +2466,9 @@ module GENERIC-RESOURCE-API { enum "CreateVnfInstance"; enum "ActivateVnfInstance"; enum "DeleteVnfInstance"; + enum "CreatePnfInstance"; + enum "ActivatePnfInstance"; + enum "DeletePnfInstance"; enum "CreateVfModuleInstance"; enum "ActivateVfModuleInstance"; enum "DeleteVfModuleInstance"; @@ -2391,10 +2507,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"; @@ -2403,11 +2515,37 @@ 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"; + enum "CreateSOTNUnderlayInstance"; + enum "ActivateSOTNUnderlayInstance"; + enum "DeactivateSOTNUnderlayInstance"; + enum "DeleteSOTNUnderlayInstance"; + enum "CreateSOTNUniInstance"; + enum "ActivateSOTNUniInstance"; + enum "DeactivateSOTNUniInstance"; + enum "DeleteSOTNUniInstance"; + enum "CreateSOTNL2VpnInstance"; + enum "ActivateSOTNL2VpnInstance"; + enum "DeactivateSOTNL2VpnInstance"; + enum "DeleteSOTNL2VpnInstance"; } } leaf source { @@ -2575,12 +2713,15 @@ module GENERIC-RESOURCE-API { 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"; @@ -2618,10 +2759,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"; @@ -2630,11 +2767,37 @@ 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"; + enum "CreateSOTNUnderlayInstance"; + enum "ActivateSOTNUnderlayInstance"; + enum "DeactivateSOTNUnderlayInstance"; + enum "DeleteSOTNUnderlayInstance"; + enum "CreateSOTNUniInstance"; + enum "ActivateSOTNUniInstance"; + enum "DeactivateSOTNUniInstance"; + enum "DeleteSOTNUniInstance"; + enum "CreateSOTNL2VpnInstance"; + enum "ActivateSOTNL2VpnInstance"; + enum "DeactivateSOTNL2VpnInstance"; + enum "DeleteSOTNL2VpnInstance"; } } leaf last-svc-request-id { @@ -2680,6 +2843,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; @@ -3125,6 +3293,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;