container vnf-data {\r
uses vnf-operation-information;\r
uses vnf-topology;\r
+ container vnf-network-collections {\r
+ uses vnf-network-collection;\r
+ }\r
+ container vnf-sub-interface-groups {\r
+ uses vnf-sub-interface-group;\r
+ }\r
container vnf-provided-allotted-resources {\r
leaf-list vnf-provided-ar-id {\r
description "List of allotted resources using capacity from this vnf";\r
uses allotted-resource-info;\r
}\r
}\r
+ container provided-configurations {\r
+ list provided-configuration {\r
+ key "configuration-id";\r
+ uses configuration-info;\r
+ }\r
+ }\r
+ container vnfc-instance-groups {\r
+ uses vnfc-instance-group;\r
+ }\r
+ container network-instance-groups {\r
+ uses network-instance-group;\r
+ }\r
+ container forwarding-paths {\r
+ list forwarding-path {\r
+ key "forwarding-path-id";\r
+ leaf forwarding-path-id {\r
+ description "Generated by SDNC";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ uses forwarding-path-information;\r
+ }\r
+ }\r
}\r
}\r
grouping service-status {\r
enum "delete";\r
enum "unassign";\r
enum "deactivate";\r
+ enum "create";\r
}\r
}\r
leaf response-timestamp {\r
leaf network-type {\r
type string;\r
}\r
+ leaf from-preload {\r
+ description "Indicates if source is preload data";\r
+ type boolean;\r
+ }\r
uses onap-model-information;\r
}\r
}\r
container network-input-parameters {\r
uses param;\r
}\r
+ leaf network-instance-group-id {\r
+ description "When network has instance-group role in service model";\r
+ type string;\r
+ }\r
}\r
}\r
grouping network-topology {\r
leaf network-type {\r
type string;\r
}\r
+ leaf network-instance-group-id {\r
+ description "When network is part of network instance-Group-data & instance Group in A&AI";\r
+ type string;\r
+ }\r
leaf network-technology {\r
- description "should we keep this?";\r
type string;\r
}\r
leaf eipam-v4-address-plan {\r
- description "??";\r
type string;\r
}\r
leaf eipam-v6-address-plan {\r
}\r
}\r
}\r
+ grouping network-instance-group {\r
+ list network-instance-group {\r
+ key "network-instance-group-id";\r
+ leaf network-instance-group-id {\r
+ description "Also a Key in Network Instance Group in A&AI";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf network-instance-group-function {\r
+ type string;\r
+ }\r
+ leaf service-instance-id {\r
+ type string;\r
+ }\r
+ uses onap-model-information;\r
+ container subnet-assignment-policy {\r
+ leaf subnet-use {\r
+ description "Current valid values - unique, shared (default)";\r
+ type string;\r
+ }\r
+ }\r
+ container vpn-binding-policy {\r
+ leaf vpn-binding {\r
+ type string;\r
+ }\r
+ leaf vpn-name {\r
+ type string;\r
+ }\r
+ leaf vpn-type {\r
+ type string;\r
+ }\r
+ leaf vpn-platform {\r
+ type string;\r
+ }\r
+ leaf global-route-target {\r
+ type string;\r
+ }\r
+ leaf route-target-role {\r
+ type string;\r
+ }\r
+ }\r
+ uses subnets;\r
+ leaf subnet-key-value {\r
+ description "key-value provided to EIPAM when creating shared subnet";\r
+ type string;\r
+ }\r
+ container networks {\r
+ list network {\r
+ key "network-id";\r
+ leaf network-id {\r
+ description "Index into network-topology-identifier structure";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ uses vpn-bindings;\r
+ leaf vlan-tag-id {\r
+ type uint32;\r
+ }\r
+ leaf network-status {\r
+ description "assigned, unassigned";\r
+ type string;\r
+ }\r
+ container customer-bonding-requests {\r
+ list customer-bonding-request {\r
+ key "configuration-id";\r
+ leaf configuration-id {\r
+ description "e.g. vlan network receptor configuration id";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
grouping network-level-oper-status {\r
container network-level-oper-status {\r
uses oper-status-data;\r
type string;\r
}\r
leaf vnf-type {\r
- description "vnf-model-id in Pats model?in Pats vnf submodule, contained within vnf-instance-topology-identifier grouping (along with vnf-name and vnf-instance-id)";\r
+ type string;\r
+ }\r
+ leaf vnf-name {\r
type string;\r
}\r
uses onap-model-information;\r
grouping vnf-request-input {\r
container vnf-request-input {\r
leaf request-version {\r
- description "keep this? e.g. 1702";\r
type string;\r
}\r
leaf vnf-name {\r
- description "in Pats vnf submodule, contained within vnf-instance-topology-identifier (along with vnf-model-id and vnf-instance-id)";\r
type string;\r
}\r
uses region-identifier;\r
uses vnf-network-data;\r
}\r
}\r
+ list vnf-network-instance-group-ids {\r
+ key "vnf-network-instance-group-id";\r
+ leaf vnf-network-instance-group-id {\r
+ description "List of vnf network-instance-group";\r
+ type string;\r
+ }\r
+ }\r
container vnf-input-parameters {\r
uses param;\r
}\r
container vnf-parameters-data {\r
uses param;\r
}\r
+ leaf sdnc-generated-cloud-resources {\r
+ description "Indicate if source is sdnc generated cloud param";\r
+ type boolean;\r
+ }\r
}\r
}\r
grouping vnf-topology-identifier-structure {\r
grouping vnf-resource-assignments {\r
container vnf-resource-assignments {\r
leaf vnf-status {\r
- description "Do we need this?Orchestration status from AAI - to be set by SDNCWill not be used for vIPR.";\r
+ description "Orchestration status from AAI - to be set by SDNC";\r
type string;\r
}\r
container availability-zones {\r
}\r
container subnets-data {\r
list subnet-data {\r
- key "ip-version";\r
+ key "sdnc-subnet-id";\r
+ leaf sdnc-subnet-id {\r
+ description "Unique SDNC generated UUID of the subnet. Key into A&AI instance.This maps to ipv4-key-subnet-id and ipv6-key-subnet-id in VNF-API";\r
+ type string;\r
+ }\r
+ leaf subnet-role {\r
+ description "Subnet Role for the subnet";\r
+ type string;\r
+ }\r
+ leaf subnet-name {\r
+ description "Populated for preload only";\r
+ type string;\r
+ }\r
leaf ip-version {\r
description "Should be ipv4 or ipv6";\r
type string;\r
description "subnet UUID to be passed into the HEAT template";\r
type string;\r
}\r
+ leaf dhcp-enabled {\r
+ description "Indicator to use this subnet for DHCP ";\r
+ type enumeration {\r
+ enum "Y";\r
+ enum "N";\r
+ }\r
+ }\r
}\r
}\r
}\r
leaf vf-module-type {\r
type string;\r
}\r
+ leaf from-preload {\r
+ description "Indicates if source is preload data";\r
+ type boolean;\r
+ }\r
uses onap-model-information;\r
}\r
}\r
container vf-module-parameters {\r
uses param;\r
}\r
+ leaf sdnc-generated-cloud-resources {\r
+ description "Indicate if source is sdnc-generated-cloud-resources.When true, the parameters are literal HEAT template parameter names;When false, the parameters need to be converted to HEAT format"; \r
+ type boolean;\r
+ }\r
}\r
}\r
grouping vf-module-topology-identifier {\r
type string;\r
}\r
leaf vf-module-type {\r
- description "In Pats model referred to as model-id";\r
type string;\r
}\r
}\r
grouping vf-module-assignments {\r
container vf-module-assignments {\r
leaf vf-module-status {\r
- description "Do we need this?Orchestration status from AAI - to be set by SDNCNot being used for vIPR.";\r
+ description "Orchestration status from AAI - to be set by SDNC";\r
type string;\r
}\r
container vms {\r
uses vm-topology-data;\r
}\r
}\r
+ uses vlan-vnfc-instance-groups;\r
}\r
}\r
grouping vm-topology-data {\r
}\r
container vm-names {\r
leaf-list vm-name {\r
- description "ordered-by: user";\r
type string;\r
ordered-by user;\r
}\r
+ list vnfc-names {\r
+ key "vnfc-name";\r
+ leaf vnfc-name {\r
+ type string;\r
+ }\r
+ container vnfc-networks {\r
+ uses vnfc-network-data;\r
+ }\r
+ }\r
}\r
container vm-networks {\r
list vm-network {\r
}\r
}\r
}\r
+ grouping vnfc-network-data {\r
+ list vnfc-network-data {\r
+ key "vnfc-network-role";\r
+ leaf vnfc-network-role {\r
+ description "e.g. dummy net - parent port network role ";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf vnfc-type {\r
+ description "Vm-type e.g. FW,";\r
+ type string;\r
+ }\r
+ container vnfc-ports {\r
+ list vnfc-port {\r
+ key "vnfc-port-id";\r
+ leaf vnfc-port-id {\r
+ description "Port(s) with a given network-role are assigned vnfc-port-id from series - 01, 02, 03 ...Example: VM with two ports with network-role =X and another 2 ports with network-role=Y vnfc-port-ids:01 - 1st port with network-role=X02 - 2nd port with network-role=X01 - 1st port with network-role=Y02 - 2nd port with network-role=Y";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf common-sub-interface-role {\r
+ description "If sub-interfaces have common interface role (network role)";\r
+ type string;\r
+ }\r
+ container vnic-sub-interfaces {\r
+ uses sub-interface-network-data;\r
+ }\r
+ }\r
+ }\r
+ list vnfc-subnet {\r
+ key "vnfc-subnet-role";\r
+ leaf vnfc-subnet-role {\r
+ description "Default value if subnet role is not defined.";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ list vnfc-ip-assignments {\r
+ key "vnfc-address-family";\r
+ leaf vnfc-address-family {\r
+ description "indicates if this is IpV4 or IpV6";\r
+ type enumeration {\r
+ enum "ipv4";\r
+ enum "ipv6";\r
+ }\r
+ }\r
+ leaf vnfc-subnet-dhcp {\r
+ description "Indicator to use DHCP for IP assignment. Unless dhcp=N, we wouldnt have any IPs here, since they would not be SDNC assigned ";\r
+ type enumeration {\r
+ enum "Y";\r
+ enum "N";\r
+ }\r
+ }\r
+ leaf vnfc-subnet-ip-count {\r
+ description "The number of IP addresses to be assigned per vnfc for this subnet role";\r
+ type uint8;\r
+ }\r
+ list vnfc-subnet-ip {\r
+ key "vnfc-ip-address";\r
+ leaf vnfc-ip-address {\r
+ description "Either IpV4 IP or IpV6 IP addresses should be present";\r
+ type inet:ip-address;\r
+ }\r
+ leaf vnfc-client-key {\r
+ type string;\r
+ }\r
+ leaf ip-type {\r
+ description "Capture what type of IP this is, if is virtual IP (AKA, floating IP) or Fixed IP. ";\r
+ type enumeration {\r
+ enum "FIXED";\r
+ enum "VIP";\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
grouping vm-network-data {\r
leaf network-role {\r
description "network (identified by role) that this VM connects to. Should also be included in the vnf-networks for the containing VNF";\r
}\r
container network-ips {\r
leaf-list network-ip {\r
- description "List of assigned ip addresses of type ip-version on a network. Is there a way to specify format to indicate ipv4 or ipv6 format?";\r
+ description "List of assigned ip addresses of type ip-version on a network";\r
type string;\r
ordered-by user;\r
}\r
type string;\r
}\r
}\r
- grouping contrail-route-operation-information {\r
+ grouping forwarding-path-operation-information {\r
uses sdnc-request-header;\r
uses request-information;\r
uses service-information;\r
- uses allotted-resource-information;\r
- uses contrail-route-request-input;\r
- }\r
- grouping contrail-route-request-input {\r
- container contrail-route-request-input {\r
- container source-network {\r
- uses network-info;\r
- }\r
- container dest-network {\r
- uses network-info;\r
- }\r
- container contrail-applied-service-info {\r
- leaf service-instance-id {\r
- description "The service-instance-id of the service in which the resource(s) providing the applied-service are. For vIPR, this is the service-instance-id of the vIPR-ATM service in which the vIPR-ATM VNF Contrail service is the applied service. MSO will populate with the input data.";\r
- type string;\r
- }\r
- leaf contrail-fqdn {\r
- description "For future use by MSO on input; MSO not expected to populate in 1707. If MSO can identify the contrail-fqdn of the Contrail applied service for this contrail-route, then it would be specified here on input. Otherwise, SDN-C will look it up by the vIPR-ATM VNF in the service-instance-id of the contrail-applied-service-info grouing.";\r
+ uses forwarding-path-request-input;\r
+ }\r
+ grouping forwarding-path-request-input {\r
+ container forwarding-path-request-input {\r
+ list forwarding-paths {\r
+ key "forwarding-path-name";\r
+ leaf forwarding-path-name {\r
+ description "Forwarding-path-name from tosca-model. ";\r
type string;\r
+ mandatory true;\r
}\r
- }\r
- container contrail-route-input-parameters {\r
- uses param;\r
+ uses onap-model-information;\r
}\r
}\r
}\r
- grouping network-info {\r
- leaf network-id {\r
+ grouping forwarding-path-information {\r
+ leaf forwarding-path-name {\r
+ description "Fowarding-path name from TOSCA model, or name generated by SDNC";\r
type string;\r
}\r
- leaf network-role {\r
- type string;\r
+ leaf forwarding-path-type {\r
+ description "Based on MySQL Forwarding_Path tables path_type value from related TOSCA model";\r
+ type enumeration {\r
+ enum "VNF";\r
+ enum "Service";\r
+ }\r
}\r
- }\r
- grouping contrail-route-topology {\r
- container contrail-route-topology {\r
- uses allotted-resource-identifiers;\r
- uses onap-model-information;\r
- uses contrail-route-assignments;\r
- container contrail-route-parameters {\r
- uses param;\r
+ uses onap-model-information;\r
+ container service-paths {\r
+ list service-path {\r
+ key "service-path-instance-id";\r
+ uses service-path-information;\r
}\r
}\r
}\r
- grouping contrail-route-assignments {\r
- container contrail-route-assignments {\r
- leaf fq-name {\r
- description "The Contrail fq-name of the network policy";\r
- type string;\r
- }\r
- leaf contrail-id {\r
- description "The ID assigned by Contrail to the network-policy (one for one with the fq-name)";\r
+ grouping service-path-information {\r
+ leaf service-path-instance-id {\r
+ description "Service path instance ID generated by SDNC. Identifies a service-path-instance within a forwarding-path definition";\r
+ type string;\r
+ }\r
+ leaf service-path-instance-name {\r
+ description "A unique name generated by SDNC ( forwarding-path-name + service-path-instance-id )";\r
+ type string;\r
+ }\r
+ leaf version {\r
+ description "Only one version of the service-path-instance data will be available in MD-SAL. version will be updated when the service-path-instance is reevaluated ";\r
+ type string;\r
+ }\r
+ list service {\r
+ key "service-instance-id";\r
+ leaf service-instance-id {\r
+ description "service-instance-id of each service-instance in the service-path-instance";\r
type string;\r
}\r
- container source-network {\r
- uses network-info;\r
- }\r
- container dest-network {\r
- uses network-info;\r
+ leaf service-path-sequence-id {\r
+ description "e.g. S1S2S3S5seq id=1 S1-S2seq id=2 S2S3seq id=3 S3S5Incremental integer value";\r
+ type uint32;\r
}\r
- container contrail-applied-service {\r
- leaf service-instance-id {\r
- description "The service-instance-id of the vnf from which the contrail applied service is coming";\r
- type string;\r
- }\r
- leaf vnf-id {\r
- description "The vnf representing the contrail applied service";\r
- type string;\r
- }\r
- leaf contrail-fqdn {\r
- description "This is the fq-name of the Contrail service instance through which the route is passing.";\r
- type string;\r
+ container vnfs {\r
+ list vnf {\r
+ key "vnf-instance-id";\r
+ uses vnf-path-information;\r
}\r
}\r
- leaf vlan-tag {\r
- description "Contrail-assigned vlan-tag to the vipr vm interface for this route.";\r
- type string;\r
- }\r
}\r
}\r
- grouping security-zone-operation-information {\r
- uses sdnc-request-header;\r
- uses request-information;\r
- uses service-information;\r
- uses allotted-resource-information;\r
- uses security-zone-request-input;\r
- }\r
- grouping security-zone-request-input {\r
- container security-zone-request-input {\r
- leaf vlan-tag {\r
- type string;\r
- }\r
- leaf trusted-network-role {\r
- description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+ grouping vnf-path-information {\r
+ leaf vnf-instance-id {\r
+ description "VNF instance ID in the path";\r
+ type string;\r
+ }\r
+ leaf vnf-path-sequence-id {\r
+ description "Sequence ID at the VNF instance levele.g. e.g. V1V2V3V5V6seq id=1 V1-V2seq id=2 V2V3seq id=3 V3V5seq id=4 V5V6incremental integer value.";\r
+ type uint32;\r
+ }\r
+ leaf left-network-name {\r
+ description "Every VNF instance in the path is connected to one or two VNFs.";\r
+ type string;\r
+ }\r
+ leaf left-network-role {\r
+ type string;\r
+ }\r
+ leaf right-network-name {\r
+ type string;\r
+ }\r
+ leaf right-network-role {\r
+ type string;\r
+ }\r
+ container vf-module-instance {\r
+ leaf vf-module-id {\r
type string;\r
}\r
- leaf untrusted-network-role {\r
- description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+ leaf vf-module-name {\r
type string;\r
}\r
- container security-zone-input-parameters {\r
- uses param;\r
- }\r
}\r
}\r
- grouping security-zone-topology {\r
- container security-zone-topology {\r
- uses allotted-resource-identifiers;\r
- uses onap-model-information;\r
- uses security-zone-assignments;\r
- container security-zone-parameters {\r
- uses param;\r
- }\r
+ grouping forwarding-path-level-oper-status { \r
+ container forwarding-path-level-oper-status { \r
+ uses oper-status-data; \r
+ } \r
+ }\r
+ grouping configuration-info {\r
+ leaf configuration-id {\r
+ type string;\r
+ }\r
+ leaf configuration-type {\r
+ description "Not an enum, but expected values are port-mirror-configuration, , vlan-network-receptor";\r
+ type string;\r
+ }\r
+ leaf configuration-sub-type {\r
+ description "Not an enum, but expected values are vprobe and pprobe";\r
+ type string;\r
+ }\r
+ leaf configuration-topology-link {\r
+ description "Pointer to the configurations topology";\r
+ type string;\r
}\r
}\r
- grouping security-zone-assignments {\r
- container security-zone-assignments {\r
- leaf trusted-network-role {\r
- description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+ grouping vnfc-instance-group {\r
+ list vnfc-instance-group {\r
+ key "instance-group-role nfc-naming-code configuration-id";\r
+ leaf instance-group-role {\r
+ description "i.e.TSBC_VNFC_group";\r
type string;\r
+ mandatory true;\r
}\r
- leaf security-zone-name-trusted {\r
+ leaf nfc-naming-code {\r
+ description "Set to nfc-naming-code from A&AI";\r
type string;\r
+ mandatory true;\r
}\r
- leaf untrusted-network-role {\r
- description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+ leaf configuration-id {\r
type string;\r
+ mandatory true;\r
}\r
- leaf security-zone-name-untrusted {\r
+ leaf group-type {\r
+ description " port-mirror-source or port-mirror-dest";\r
type string;\r
}\r
- leaf security-zone-service-instance-id {\r
+ uses vnfc-objects;\r
+ }\r
+ }\r
+ grouping vnfc-objects {\r
+ container vnfc-objects {\r
+ list vnfc-object {\r
+ key "vnfc-key";\r
+ leaf vnfc-key {\r
+ type string;\r
+ }\r
+ leaf vnfc-name {\r
+ description "Vnfc name as key in A&AI";\r
+ type string;\r
+ }\r
+ leaf vm-type {\r
+ type string;\r
+ }\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ leaf vserver-name {\r
+ type string;\r
+ }\r
+ leaf vserver-id {\r
+ type string;\r
+ }\r
+ container vnics {\r
+ list vnic {\r
+ key "vnic-port-name";\r
+ leaf vnic-port-name {\r
+ type string;\r
+ }\r
+ leaf vnic-port-id {\r
+ type string;\r
+ }\r
+ container capacity {\r
+ leaf vnic-capacity {\r
+ type uint32;\r
+ }\r
+ leaf used-capacity {\r
+ description "Updated for destination port when source port is mapped/unmapped.";\r
+ type uint32;\r
+ }\r
+ }\r
+ container vnic-ip-addresses {\r
+ uses ip-addresses;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping vnfcs {\r
+ container vnfcs {\r
+ list vnfc {\r
+ key "vnfc-name";\r
+ leaf vnfc-name {\r
+ description "Vnfc name as key in A&AI";\r
+ type string;\r
+ }\r
+ leaf vserver-name {\r
+ type string;\r
+ }\r
+ leaf vserver-id {\r
+ type string;\r
+ }\r
+ uses vnics;\r
+ }\r
+ }\r
+ }\r
+ grouping vnics {\r
+ container vnics {\r
+ list vnic {\r
+ key "vnic-port-name";\r
+ leaf vnic-port-name {\r
+ type string;\r
+ }\r
+ leaf vnic-port-id {\r
+ type string;\r
+ }\r
+ uses sub-interfaces;\r
+ }\r
+ }\r
+ }\r
+ grouping sub-interfaces {\r
+ container sub-interfaces {\r
+ list sub-interface {\r
+ key "sub-interface-port-name";\r
+ leaf sub-interface-port-name {\r
+ type string;\r
+ }\r
+ leaf sub-interface-port-id {\r
+ type string;\r
+ }\r
+ container sub-interface-ip-addresses {\r
+ uses ip-addresses;\r
+ }\r
+ uses vlan-tags;\r
+ container sub-interface-network {\r
+ leaf network-name {\r
+ type string;\r
+ }\r
+ leaf network-id {\r
+ type string;\r
+ }\r
+ }\r
+ leaf sub-interface-status {\r
+ description "NULL, unassigned, assigned";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping vlan-tags {\r
+ container vlan-tags {\r
+ leaf vlan-interface {\r
+ description "A&AI Key";\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
+ grouping vlan-vnfc-instance-groups {\r
+ container vlan-vnfc-instance-groups {\r
+ list vlan-vnfc-instance-group {\r
+ key "instance-group-id";\r
+ leaf instance-group-id {\r
+ description "A&AI ID";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf instance-group-function {\r
+ type string;\r
+ }\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ container vnfcs {\r
+ list vnfc {\r
+ key "vnfc-name";\r
+ leaf vnfc-name {\r
+ type string;\r
+ }\r
+ uses vnic-groups;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping vnic-groups {\r
+ container vnic-groups {\r
+ list vnic-group {\r
+ key "vnic-interface-role";\r
+ leaf vnic-interface-role {\r
+ description "Same as network-role of network where vnic is connected";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf network-instance-group-function {\r
+ description "network-instance-Group-function for network collection where vnics with vnic-interface-role will connect";\r
+ type string;\r
+ } \r
+ leaf vlan-assignment-policy-name {\r
+ description "Policy name in ASDC model & policy definition in Policy Engine";\r
+ type string;\r
+ }\r
+ leaf vlan-tag-index-next {\r
+ description "Next tag to be assigned";\r
+ type uint32;\r
+ }\r
+ container vlan-common-ip-addresses {\r
+ uses ip-addresses;\r
+ }\r
+ container vlan-vnics {\r
+ list vlan-vnic {\r
+ key "vnic-port-id";\r
+ leaf vnic-port-id {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ container vnic-sub-interfaces {\r
+ uses sub-interface-network-data;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping vnf-network-collection {\r
+ list vnf-network-collection {\r
+ key "network-instance-group-function";\r
+ leaf network-instance-group-function {\r
+ description "Network Instance-Group function in A&AI";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf network-instance-group-id {\r
+ description "Network Instance-Group id in A&AI";\r
+ type string;\r
+ }\r
+ leaf network-collection-service-instance-id {\r
+ description "Service-instance-id of service that created the network collection";\r
+ type string;\r
+ }\r
+ leaf network-collection-customization-uuid {\r
+ description "network-collection-customization-uuid stored in Network IsntanceGroup.customization-uuid in A&AI";\r
+ type string;\r
+ }\r
+ container vnf-floating-ip {\r
+ uses ip-addresses;\r
+ }\r
+ }\r
+ }\r
+ grouping vnf-sub-interface-group {\r
+ list vnf-sub-interface-group {\r
+ key "vnfc-instance-group-function network-instance-group-function parent-port-role";\r
+ leaf vnfc-instance-group-function {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf network-instance-group-function {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf parent-port-role {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ uses vnfcs;\r
+ container customer-bonding-requests {\r
+ list customer-bonding-request {\r
+ key "configuration-id";\r
+ leaf configuration-id {\r
+ description "e.g. vlan network receptor configuration id";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping sub-interface-network-data {\r
+ list sub-interface-network-data {\r
+ key "network-id";\r
+ leaf network-id {\r
+ description "Subinterface network id (UUID in A&AI)";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf network-name {\r
+ description "Subinterface network name";\r
+ type uint32;\r
+ }\r
+ leaf vlan-tag-id {\r
+ description "Vlan tag assigned to subinterface port";\r
+ type uint32;\r
+ }\r
+ leaf network-role {\r
+ description "e.g. untrusted ";\r
+ type string;\r
+ }\r
+ leaf network-role-tag {\r
+ description "Assuming HEAT template network role tag parameter - not used";\r
+ type string;\r
+ }\r
+ container network-information-items {\r
+ list network-information-item {\r
+ key "ip-version";\r
+ leaf ip-version {\r
+ description "Use ipv4 or ipv6";\r
+ type string;\r
+ }\r
+ leaf use-dhcp {\r
+ description "Indicator to use DHCP on this network for this VM - set to N for Vlan tagging";\r
+ type enumeration {\r
+ enum "Y";\r
+ enum "N";\r
+ }\r
+ }\r
+ leaf ip-count {\r
+ description "The number of ip addresses to be assigned per vm for this network role";\r
+ type uint8;\r
+ }\r
+ container network-ips {\r
+ leaf-list network-ip {\r
+ description "List of assigned ip addresses of type ip-version on a network.";\r
+ type inet:ip-address;\r
+ ordered-by user;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ container floating-ips {\r
+ leaf-list floating-ip-v4 {\r
+ description "Floating ipv4 for VMs of a given type on this network";\r
+ type inet:ip-address;\r
+ ordered-by user;\r
+ }\r
+ leaf-list floating-ip-v6 {\r
+ description "Floating ipv6 for VMs of a given type on this network";\r
+ type inet:ipv6-address;\r
+ ordered-by user;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping vnf-cloud-param {\r
+ leaf service-instance-id {\r
+ type string;\r
+ }\r
+ leaf service-instance-name {\r
+ type string;\r
+ }\r
+ list vnf {\r
+ key "vnf-id";\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ leaf vnf-name {\r
+ type string;\r
+ }\r
+ uses param;\r
+ list vf-module {\r
+ key "vf-module-id";\r
+ leaf vf-module-id {\r
+ type string;\r
+ }\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping vnf-get-resource-request-input-data {\r
+ list vnf {\r
+ key "vnf-id";\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ list vf-module {\r
+ key "vf-module-id";\r
+ leaf vf-module-id {\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping pnf-information {\r
+ container pnf-information {\r
+ leaf pnf-name {\r
+ description "Key for A&AI query";\r
+ type string;\r
+ }\r
+ leaf pnf-type {\r
+ type string;\r
+ }\r
+ uses onap-model-information;\r
+ }\r
+ }\r
+ grouping contrail-route-operation-information {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses allotted-resource-information;\r
+ uses contrail-route-request-input;\r
+ }\r
+ grouping contrail-route-request-input {\r
+ container contrail-route-request-input {\r
+ container source-network {\r
+ uses network-info;\r
+ }\r
+ container dest-network {\r
+ uses network-info;\r
+ }\r
+ container contrail-applied-service-info {\r
+ leaf service-instance-id {\r
+ description "The service-instance-id of the service in which the resource(s) providing the applied-service are. For vIPR, this is the service-instance-id of the vIPR-ATM service in which the vIPR-ATM VNF Contrail service is the applied service. MSO will populate with the input data.";\r
+ type string;\r
+ }\r
+ leaf contrail-fqdn {\r
+ description "For future use by MSO on input; MSO not expected to populate in 1707. If MSO can identify the contrail-fqdn of the Contrail applied service for this contrail-route, then it would be specified here on input. Otherwise, SDN-C will look it up by the vIPR-ATM VNF in the service-instance-id of the contrail-applied-service-info grouing.";\r
+ type string;\r
+ }\r
+ }\r
+ container contrail-route-input-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping network-info {\r
+ leaf network-id {\r
+ type string;\r
+ }\r
+ leaf network-role {\r
+ type string;\r
+ }\r
+ }\r
+ grouping contrail-route-topology {\r
+ container contrail-route-topology {\r
+ uses allotted-resource-identifiers;\r
+ uses onap-model-information;\r
+ uses contrail-route-assignments;\r
+ container contrail-route-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping contrail-route-assignments {\r
+ container contrail-route-assignments {\r
+ leaf fq-name {\r
+ description "The Contrail fq-name of the network policy";\r
+ type string;\r
+ }\r
+ leaf contrail-id {\r
+ description "The ID assigned by Contrail to the network-policy (one for one with the fq-name)";\r
+ type string;\r
+ }\r
+ container source-network {\r
+ uses network-info;\r
+ }\r
+ container dest-network {\r
+ uses network-info;\r
+ }\r
+ container contrail-applied-service {\r
+ leaf service-instance-id {\r
+ description "The service-instance-id of the vnf from which the contrail applied service is coming";\r
+ type string;\r
+ }\r
+ leaf vnf-id {\r
+ description "The vnf representing the contrail applied service";\r
+ type string;\r
+ }\r
+ leaf contrail-fqdn {\r
+ description "This is the fq-name of the Contrail service instance through which the route is passing.";\r
+ type string;\r
+ }\r
+ }\r
+ leaf vlan-tag {\r
+ description "Contrail-assigned vlan-tag to the vipr vm interface for this route.";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ grouping security-zone-operation-information {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses allotted-resource-information;\r
+ uses security-zone-request-input;\r
+ }\r
+ grouping security-zone-request-input {\r
+ container security-zone-request-input {\r
+ leaf vlan-tag {\r
+ type string;\r
+ }\r
+ leaf trusted-network-role {\r
+ description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+ type string;\r
+ }\r
+ leaf untrusted-network-role {\r
+ description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+ type string;\r
+ }\r
+ container security-zone-input-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping security-zone-topology {\r
+ container security-zone-topology {\r
+ uses allotted-resource-identifiers;\r
+ uses onap-model-information;\r
+ uses security-zone-assignments;\r
+ container security-zone-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping security-zone-assignments {\r
+ container security-zone-assignments {\r
+ leaf trusted-network-role {\r
+ description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+ type string;\r
+ }\r
+ leaf security-zone-name-trusted {\r
+ type string;\r
+ }\r
+ leaf untrusted-network-role {\r
+ description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+ type string;\r
+ }\r
+ leaf security-zone-name-untrusted {\r
+ type string;\r
+ }\r
+ leaf security-zone-service-instance-id {\r
description "Will be the same as the parent-service-instance-id";\r
type string;\r
}\r
}\r
}\r
}\r
+ grouping port-mirror-topology-operation-information {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses configuration-information;\r
+ uses port-mirror-configuration-request-input;\r
+ }\r
+ grouping port-mirror-configuration-request-input {\r
+ container port-mirror-configuration-request-input {\r
+ container source-port {\r
+ uses port-info;\r
+ leaf source-port-id {\r
+ description "needed for srv-action=disable/enable";\r
+ type string;\r
+ }\r
+ }\r
+ container dest-port {\r
+ uses port-info;\r
+ }\r
+ uses region-identifier;\r
+ container port-mirror-configuration-input-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping port-info {\r
+ leaf service-instance-id {\r
+ description "May not be need.";\r
+ type string;\r
+ }\r
+ uses pnf-information;\r
+ uses vnf-information;\r
+ }\r
+ grouping port-mirror-configuration-topology {\r
+ container port-mirror-configuration-topology {\r
+ uses configuration-identifiers;\r
+ uses onap-model-information;\r
+ uses port-mirror-configuration-assignments;\r
+ container port-mirror-configuration-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping port-mirror-configuration-assignments {\r
+ container port-mirror-configuration-assignments {\r
+ container contrail-vmi-params {\r
+ uses param;\r
+ }\r
+ leaf vnics-group-id {\r
+ type string;\r
+ }\r
+ leaf owning-entity {\r
+ type string;\r
+ }\r
+ leaf tenant-context {\r
+ description "From tenant object in A&AI";\r
+ type string;\r
+ }\r
+ leaf tenant {\r
+ description "Tenant name from A&AI for source VNF";\r
+ type string;\r
+ }\r
+ leaf tenant-id {\r
+ description "tenant-id from A&AI for source VNF";\r
+ type string;\r
+ }\r
+ leaf dest-tenant {\r
+ description "Tenant name from A&AI for destination VNF";\r
+ type string;\r
+ }\r
+ leaf dest-tenant-id {\r
+ description "tenant-id from A&AI for destination VNF";\r
+ type string;\r
+ }\r
+ leaf cloud-region-id {\r
+ type string;\r
+ }\r
+ leaf cloud-owner {\r
+ type string;\r
+ }\r
+ leaf dest-network-fqdn {\r
+ type string;\r
+ }\r
+ leaf source-network-fqdn {\r
+ type string;\r
+ }\r
+ leaf source-capacity {\r
+ description "Source port pps (packets per second) rating from tosca model";\r
+ type uint32;\r
+ }\r
+ leaf source-vnf-id {\r
+ type string;\r
+ }\r
+ leaf dest-vnf-id {\r
+ description "For vProbe";\r
+ type string;\r
+ }\r
+ leaf dest-pnf-name {\r
+ description "For pProbe";\r
+ type string;\r
+ }\r
+ leaf dest-p-interface {\r
+ description "For pProbe; from policy manager";\r
+ type string;\r
+ }\r
+ leaf dest-pnf-port-policy-name {\r
+ description "For pProbe; from tosca model";\r
+ type string;\r
+ }\r
+ leaf probe-type {\r
+ description "vprobe or pprobe; derived from configuration-information.configuration-sub-type";\r
+ type string;\r
+ }\r
+ leaf route-allotted-resource-id {\r
+ description "For vProbe";\r
+ type string;\r
+ }\r
+ container source-vnfc-instance-group-id {\r
+ leaf service-instance-id {\r
+ type string;\r
+ }\r
+ leaf nfc-naming-code {\r
+ type string;\r
+ }\r
+ leaf instance-group-role {\r
+ type string;\r
+ }\r
+ leaf configuration-id {\r
+ type string;\r
+ }\r
+ }\r
+ container dest-vnfc-instance-group-id {\r
+ leaf service-instance-id {\r
+ type string;\r
+ }\r
+ leaf nfc-naming-code {\r
+ type string;\r
+ }\r
+ leaf instance-group-role {\r
+ type string;\r
+ }\r
+ leaf configuration-id {\r
+ type string;\r
+ }\r
+ }\r
+ container source-to-dest-maps {\r
+ list source-to-dest-map {\r
+ key "source-port-id";\r
+ leaf source-port-id {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf source-port-name {\r
+ type string;\r
+ }\r
+ leaf source-vserver-id {\r
+ type string;\r
+ }\r
+ leaf dest-vserver-id {\r
+ type string;\r
+ }\r
+ leaf dest-port-id {\r
+ type string;\r
+ }\r
+ leaf dest-port-name {\r
+ type string;\r
+ }\r
+ leaf link-name {\r
+ type string;\r
+ }\r
+ container dest-ip-addresses {\r
+ uses ip-addresses;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping gc-topology-operation-information {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses configuration-information;\r
+ uses gc-request-input;\r
+ }\r
+ grouping gc-request-input {\r
+ container gc-request-input {\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ container input-parameters {\r
+ uses param;\r
+ }\r
+ }\r
+ }\r
+ grouping vnr-parameters {\r
+ container vnr-parameters {\r
+ leaf vnf-id {\r
+ type string;\r
+ }\r
+ leaf vnf-service-instance-id {\r
+ type string;\r
+ }\r
+ leaf network-collection-service-instance-id {\r
+ description "service instance id that created network-collection";\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
grouping tunnelxconn-operation-information {\r
uses sdnc-request-header;\r
uses request-information;\r
}\r
}\r
}\r
-\r
grouping connection-attachment-operation-information {\r
uses sdnc-request-header;\r
uses request-information;\r
}\r
}\r
}\r
+ grouping configuration-information {\r
+ container configuration-information {\r
+ leaf configuration-id {\r
+ type string;\r
+ }\r
+ leaf configuration-name {\r
+ type string;\r
+ }\r
+ leaf configuration-type {\r
+ description "Not an enum, but expected values are port-mirror-configuration, vlan-network-receptor";\r
+ type string;\r
+ }\r
+ leaf configuration-sub-type {\r
+ description "e.g. vprobe and pprobe when configuration-type=port-mirror-configuration";\r
+ type string;\r
+ }\r
+ uses onap-model-information;\r
+ }\r
+ }\r
+ grouping configuration-identifiers {\r
+ container configuration-identifiers {\r
+ leaf configuration-id {\r
+ type string;\r
+ }\r
+ leaf configuration-name {\r
+ type string;\r
+ }\r
+ leaf configuration-type {\r
+ description "Not an enum, but expected values are port-mirror-configuration.";\r
+ type string;\r
+ }\r
+ leaf configuration-sub-type {\r
+ description " vprobe and pprobe";\r
+ type string;\r
+ }\r
+ leaf parent-service-instance-id {\r
+ description "Service-instance-id of the parent service to which this resource belongs.";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ grouping configuration-oper-status {\r
+ container configuration-oper-status {\r
+ uses oper-status-data;\r
+ }\r
+ }\r
+ grouping configuration-status {\r
+ container configuration-status {\r
+ leaf response-code {\r
+ type string;\r
+ }\r
+ leaf response-message {\r
+ type string;\r
+ }\r
+ leaf final-indicator {\r
+ type string;\r
+ }\r
+ leaf request-status {\r
+ type enumeration {\r
+ enum "synccomplete";\r
+ enum "asynccomplete";\r
+ enum "notifycomplete";\r
+ }\r
+ }\r
+ leaf action {\r
+ description "value would one of possible request-actions; match the list in service-data oper-status";\r
+ type string;\r
+ }\r
+ leaf rpc-name {\r
+ type string;\r
+ }\r
+ leaf rpc-action {\r
+ description "this is the svc-action from the incoming request";\r
+ type enumeration {\r
+ enum "assign";\r
+ enum "activate";\r
+ enum "create";\r
+ enum "disable";\r
+ enum "enable";\r
+ enum "delete";\r
+ enum "unassign";\r
+ enum "deactivate";\r
+ }\r
+ }\r
+ leaf response-timestamp {\r
+ type string;\r
+ }\r
+ }\r
+ }\r
grouping topology-response-common {\r
leaf svc-request-id {\r
description "the request id from the request message for which this is the responseKeep as M";\r
type string;\r
}\r
leaf svc-action {\r
- description "Enumerated listThis is the rpcAction";\r
+ description "This is the rpcAction";\r
type enumeration {\r
enum "reserve";\r
enum "assign";\r
enum "deactivate";\r
enum "unassign";\r
enum "create";\r
+ enum "disable";\r
+ enum "enable";\r
+ enum "update";\r
}\r
}\r
leaf svc-notification-url {\r
enum "ActivateSiteInstance";\r
enum "DeactivateSiteInstance";\r
enum "DeleteSiteInstance";\r
+ enum "CreatePortMirrorConfigurationInstance";\r
+ enum "DeletePortMirrorConfigurationInstance";\r
+ enum "ChangePortMirrorConfigurationInstance";\r
+ enum "CreateGenericConfigurationInstance";\r
+ enum "DeleteGenericConfigurationInstance";\r
+ enum "PreloadVfModuleRequest";\r
+ enum "DeletePreloadVfModuleRequest";\r
+ enum "PreloadNetworkRequest";\r
+ enum "DeletePreloadNetworkRequest";\r
+ enum "CreateForwardingPathInstance";\r
+ enum "DeleteForwardingPathInstance";\r
+ enum "UpdateForwardingPathInstance";\r
}\r
}\r
leaf source {\r
leaf value {\r
type string;\r
}\r
+ container resource-resolution-data {\r
+ list resource-key {\r
+ key "name";\r
+ leaf name {\r
+ type string;\r
+ }\r
+ leaf value {\r
+ type string;\r
+ }\r
+ }\r
+ leaf status {\r
+ description "SUCCESS, FAILED, or PENDING - RA returned data as capability";\r
+ type string;\r
+ }\r
+ leaf capability-name {\r
+ description "Resource assignment resolution Capability name";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ }\r
+ grouping ip-addresses {\r
+ container ip-addresses {\r
+ leaf ipv4-address {\r
+ type inet:ip-address;\r
+ }\r
+ leaf ipv6-address {\r
+ type inet:ip-address;\r
+ }\r
+ leaf vipv4-address {\r
+ description "Virtual v4";\r
+ type inet:ip-address;\r
+ }\r
+ leaf vipv6-address {\r
+ description "Virtual v6";\r
+ type inet:ip-address;\r
+ }\r
}\r
}\r
grouping instance-reference {\r
enum "unassign";\r
enum "deactivate";\r
enum "create";\r
+ enum "changeassign";\r
}\r
}\r
leaf last-action {\r
enum "ActivateSiteInstance";\r
enum "DeactivateSiteInstance";\r
enum "DeleteSiteInstance";\r
+ enum "CreatePortMirrorConfigurationInstance";\r
+ enum "DeletePortMirrorConfigurationInstance";\r
+ enum "ChangePortMirrorConfigurationInstance";\r
+ enum "CreateGenericConfigurationInstance";\r
+ enum "DeleteGenericConfigurationInstance";\r
+ enum "PreloadVfModuleRequest";\r
+ enum "DeletePreloadVfModuleRequest";\r
+ enum "PreloadNetworkRequest";\r
+ enum "DeletePreloadNetworkRequest";\r
+ enum "CreateForwardingPathInstance";\r
+ enum "DeleteForwardingPathInstance";\r
+ enum "UpdateForwardingPathInstance";\r
}\r
}\r
leaf last-svc-request-id {\r
type string;\r
}\r
leaf last-order-status {\r
- description "fieldused by generic-resource-api";\r
type enumeration {\r
enum "Active";\r
enum "PendingAssignment";\r
uses instance-reference;\r
}\r
}\r
- grouping vf-module-response-information {\r
- container vf-module-response-information {\r
+ grouping vf-module-response-information {\r
+ container vf-module-response-information {\r
+ uses instance-reference;\r
+ }\r
+ }\r
+ grouping contrail-route-response-information {\r
+ container contrail-route-response-information {\r
+ uses instance-reference;\r
+ }\r
+ }\r
+ grouping security-zone-response-information {\r
+ container security-zone-response-information {\r
+ uses instance-reference;\r
+ }\r
+ }\r
+ grouping getpathsegment-response-information {\r
+ container getpathsegment-response-information {\r
uses instance-reference;\r
}\r
}\r
- grouping contrail-route-response-information {\r
- container contrail-route-response-information {\r
+ grouping port-mirror-response-information {\r
+ container port-mirror-response-information {\r
uses instance-reference;\r
}\r
}\r
- grouping security-zone-response-information {\r
- container security-zone-response-information {\r
+ grouping gc-response-information {\r
+ container gc-response-information {\r
uses instance-reference;\r
}\r
}\r
}\r
}\r
grouping preload-model-information {\r
- list vnf-preload-list {\r
- key "vnf-name vnf-type";\r
- leaf vnf-name {\r
+ list preload-list {\r
+ key "preload-id preload-type";\r
+ leaf preload-id {\r
description "vf-module-name or network name";\r
type string;\r
mandatory true;\r
}\r
- leaf vnf-type {\r
- description "vf-module-type or network type";\r
+ leaf preload-type {\r
+ description "network or vf-module";\r
type string;\r
mandatory true;\r
}\r
uses preload-data;\r
}\r
}\r
- grouping vnf-topology-response-body {\r
- leaf svc-request-id {\r
- type string;\r
- }\r
- leaf response-code {\r
- type string;\r
- }\r
- leaf response-message {\r
- type string;\r
- }\r
- leaf ack-final-indicator {\r
- type string;\r
- }\r
- }\r
grouping preload-data {\r
container preload-data {\r
- uses vnf-topology-information;\r
- uses network-topology-information;\r
- uses oper-status;\r
- }\r
- }\r
- grouping vnf-topology-information {\r
- container vnf-topology-information {\r
- uses vnf-topology-identifier;\r
- uses vnf-assignments;\r
- uses vnf-parameters;\r
- }\r
- }\r
- grouping vnf-topology-identifier {\r
- container vnf-topology-identifier {\r
- leaf service-type {\r
- type string;\r
- }\r
- leaf service-id {\r
- type string;\r
- }\r
- leaf vnf-name {\r
- description "vf-module-name";\r
- type string;\r
- }\r
- leaf vnf-type {\r
- description "vf-module-type";\r
- type string;\r
- }\r
- leaf generic-vnf-name {\r
- type string;\r
- }\r
- leaf generic-vnf-type {\r
- type string;\r
- }\r
- leaf generic-vnf-id {\r
- type string;\r
- }\r
- }\r
- }\r
- grouping vnf-assignments {\r
- container vnf-assignments {\r
- leaf vnf-status {\r
- description "Orchestration Status from AAI - to be set by SDNC";\r
- type string;\r
- }\r
- list availability-zones {\r
- key "availability-zone";\r
- leaf availability-zone {\r
- description "Openstack availability zone name or UUID";\r
- type string;\r
- }\r
- }\r
- list vnf-networks {\r
- key "network-role";\r
- uses vnf-network;\r
- uses sriov-vlan-filter-list;\r
- }\r
- uses vm-topology;\r
- }\r
- }\r
- grouping vm-topology {\r
- list vnf-vms {\r
- key "vm-type";\r
- leaf vm-type {\r
- type string;\r
- mandatory true;\r
- }\r
- leaf vm-count {\r
- type uint8;\r
- }\r
- list vm-names {\r
- key "vm-name";\r
- leaf vm-name {\r
- type string;\r
- }\r
- }\r
- list vm-networks {\r
- key "network-role";\r
- uses vm-network;\r
- }\r
- }\r
- }\r
- grouping vnf-network {\r
- leaf network-role {\r
- description "A Network Role to which a VNF must connect";\r
- type string;\r
- mandatory true;\r
- }\r
- leaf network-name {\r
- description "Unique Neutron UUID of an instance of the network role ";\r
- type string;\r
- }\r
- leaf neutron-id {\r
- description "Unique Neutron UUID of an instance of the network role ";\r
- type string;\r
- }\r
- leaf network-id {\r
- description "Unique Neutron UUID of an instance of the network role ";\r
- type string;\r
- }\r
- leaf subnet-id {\r
- description "ipv4 subnet UUID to be passed into the HEAT template";\r
- type string;\r
- }\r
- leaf subnet-name {\r
- description "ipv4 subnet-name that corresponds to the ipv4 subnet-id";\r
- type string;\r
- }\r
- leaf contrail-network-fqdn {\r
- description "contrail network policy object";\r
- type string;\r
- }\r
- leaf ipv6-subnet-id {\r
- description "ipv6 subnet UUID to be passed into the HEAT template";\r
- type string;\r
- }\r
- leaf ipv6-subnet-name {\r
- description "ipv6 subnet-name that corresponds to the ipv6 subnet-id";\r
- type string;\r
- }\r
- }\r
- grouping sriov-vlan-filter-list {\r
- list sriov-vlan-filter-list {\r
- key "sriov-vlan-filter";\r
- leaf sriov-vlan-filter {\r
- type string;\r
- }\r
- }\r
- }\r
- grouping vm-network {\r
- leaf network-role {\r
- description "network (identified by role) that this VM connects to. Should also be included in the vnf-networks for the containing VNF";\r
- type string;\r
- }\r
- leaf use-dhcp {\r
- description "Indicator to use DHCP on this network for this VM";\r
- type enumeration {\r
- enum "Y";\r
- enum "N";\r
- }\r
- }\r
- leaf ip-count {\r
- description "The number of ip addresses to be assigned per vm for this network role";\r
- type uint8;\r
- }\r
- list network-ips {\r
- key "ip-address";\r
- leaf ip-address {\r
- description "List of assigned ipv4 addresses on a network";\r
- type inet:ip-address;\r
- }\r
- }\r
- list network-ips-v6 {\r
- key "ip-address-ipv6";\r
- leaf ip-address-ipv6 {\r
- description "List of assigned ipv6 addresses on a network";\r
- type inet:ipv6-address;\r
- }\r
- }\r
- list network-macs {\r
- key "mac-address";\r
- leaf mac-address {\r
- description "List of network assignments for this VM (one per network)";\r
- type string;\r
- }\r
- }\r
- leaf floating-ip {\r
- description "Floating ipv4 for VMs of a given type on this network";\r
- type inet:ip-address;\r
- }\r
- leaf floating-ip-v6 {\r
- description "Floating ipv6 for VMs of a given type on this network";\r
- type inet:ipv6-address;\r
- }\r
- list interface-route-prefixes {\r
- key "interface-route-prefix-cidr";\r
- leaf interface-route-prefix-cidr {\r
- description "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes";\r
- type string;\r
- mandatory true;\r
- }\r
- leaf interface-route-prefix {\r
- description "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";\r
- type inet:ip-address;\r
- }\r
+ uses preload-vf-module-topology-information;\r
+ uses preload-network-topology-information;\r
+ uses preload-oper-status;\r
}\r
}\r
- grouping vnf-parameters {\r
- list vnf-parameters {\r
- key "vnf-parameter-name";\r
- leaf vnf-parameter-name {\r
- description "The name of an arbitrary instance-specific vnf-parameters";\r
- type string;\r
- }\r
- leaf vnf-parameter-value {\r
- description "The value of an arbitrary instance-specific vnf-parameters ";\r
- type string;\r
- }\r
+ grouping preload-vf-module-topology-information {\r
+ container preload-vf-module-topology-information {\r
+ uses vnf-topology-identifier-structure;\r
+ uses vnf-resource-assignments;\r
+ uses vf-module-topology;\r
}\r
}\r
- grouping network-topology-information {\r
- container network-topology-information {\r
- uses network-topology-identifier;\r
+ grouping preload-network-topology-information {\r
+ container preload-network-topology-information {\r
+ uses network-topology-identifier-structure;\r
uses subnets;\r
uses vpn-bindings;\r
uses network-policy;\r
uses route-table-reference;\r
+ uses host-routes;\r
uses provider-network-information;\r
}\r
}\r
- grouping network-topology-identifier {\r
- container network-topology-identifier {\r
- leaf service-type {\r
- type string;\r
- }\r
- leaf network-name {\r
- type string;\r
- }\r
- leaf network-role {\r
- type string;\r
- }\r
- leaf network-type {\r
- type string;\r
- }\r
- leaf network-technology {\r
- type string;\r
- }\r
- }\r
- }\r
grouping subnets {\r
list subnets {\r
key "start-address";\r
leaf dhcp-end-address {\r
type string;\r
}\r
+ leaf addr-from-start {\r
+ description "Default is N";\r
+ type enumeration {\r
+ enum "Y";\r
+ enum "N";\r
+ }\r
+ }\r
leaf subnet-name {\r
type string;\r
}\r
+ leaf subnet-role {\r
+ type string;\r
+ }\r
+ leaf subnet-sequence {\r
+ type uint8;\r
+ }\r
}\r
}\r
grouping vpn-bindings {\r
leaf vpn-binding-id {\r
type string;\r
}\r
+ leaf vpn-name {\r
+ type string;\r
+ }\r
leaf global-route-target {\r
type string;\r
}\r
+ leaf route-target-role {\r
+ type string;\r
+ }\r
+ leaf aic-zone {\r
+ description "AIC Zone the route target associated with";\r
+ type string;\r
+ }\r
}\r
}\r
grouping network-policy {\r
leaf is-shared-network {\r
type boolean;\r
}\r
- leaf is-external-network {\r
+ leaf is-external-network { \r
type boolean;\r
}\r
}\r
- grouping oper-status {\r
- container oper-status {\r
+ grouping host-routes {\r
+ list host-routes {\r
+ key "route-prefix";\r
+ leaf route-prefix {\r
+ type string;\r
+ }\r
+ leaf next-hop {\r
+ description "Could be ip-address or hostname or service-instance";\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ grouping preload-oper-status {\r
+ container preload-oper-status {\r
leaf order-status {\r
type enumeration {\r
enum "Active";\r
}\r
}\r
leaf last-action {\r
- description "this is preload request actions";\r
type enumeration {\r
- enum "VNFActivateRequest";\r
- enum "ChangeVNFActivateRequest";\r
- enum "VnfInstanceActivateRequest";\r
- enum "ChangeVnfInstanceActivateRequest";\r
- enum "VfModuleActivateRequest";\r
- enum "ChangeVfModuleActivateRequest";\r
- enum "DisconnectVNFRequest";\r
- enum "DisconnectVnfInstanceRequest";\r
- enum "DisconnectVfModuleRequest";\r
- enum "PreloadVNFRequest";\r
- enum "DeletePreloadVNFRequest";\r
- enum "PreloadVnfInstanceRequest";\r
- enum "DeletePreloadVnfInstanceRequest";\r
enum "PreloadVfModuleRequest";\r
enum "DeletePreloadVfModuleRequest";\r
+ enum "PreloadNetworkRequest";\r
+ enum "DeletePreloadNetworkRequest";\r
}\r
}\r
leaf last-svc-request-id {\r
}\r
}\r
}\r
+ grouping preload-topology-response-body {\r
+ leaf svc-request-id {\r
+ type string;\r
+ }\r
+ leaf response-code {\r
+ type string;\r
+ }\r
+ leaf response-message {\r
+ type string;\r
+ }\r
+ leaf ack-final-indicator {\r
+ type string;\r
+ }\r
+ }\r
+ rpc generic-configuration-notification {\r
+ input {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses configuration-information;\r
+ uses topology-response-common;\r
+ leaf configuration-topology-link {\r
+ description "Returns URL to generic-configuration-topology ";\r
+ type string;\r
+ }\r
+ uses vnr-parameters;\r
+ }\r
+ }\r
container services {\r
uses service-model-infrastructure;\r
}\r
uses allotted-resource-status;\r
}\r
}\r
+ container port-mirror-configurations {\r
+ list port-mirror-configuration {\r
+ key "configuration-id";\r
+ leaf configuration-id {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ container configuration-data {\r
+ container configuration-operation-information {\r
+ uses port-mirror-topology-operation-information;\r
+ }\r
+ uses port-mirror-configuration-topology;\r
+ uses configuration-oper-status;\r
+ }\r
+ uses configuration-status;\r
+ }\r
+ }\r
+ container generic-configurations {\r
+ list gc-configuration {\r
+ key "configuration-id";\r
+ leaf configuration-id {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ container configuration-data {\r
+ container configuration-operation-information {\r
+ uses gc-topology-operation-information;\r
+ }\r
+ uses configuration-oper-status;\r
+ }\r
+ uses configuration-status;\r
+ }\r
+ }\r
rpc service-topology-operation {\r
input {\r
uses service-operation-information;\r
uses service-response-information;\r
}\r
}\r
- container preload-vnfs {\r
+ rpc policy-update-notify-operation {\r
+ input {\r
+ leaf policy-name {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf version-id {\r
+ description "Map JSON versionNo to version-id";\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ leaf update-type {\r
+ type string;\r
+ mandatory true;\r
+ }\r
+ }\r
+ output {\r
+ leaf error-code {\r
+ type string;\r
+ }\r
+ leaf error-msg {\r
+ type string;\r
+ }\r
+ }\r
+ }\r
+ rpc getpathsegment-topology-operation {\r
+ input {\r
+ uses forwarding-path-operation-information;\r
+ }\r
+ output {\r
+ uses topology-response-common;\r
+ uses getpathsegment-response-information;\r
+ uses service-response-information;\r
+ }\r
+ }\r
+ rpc port-mirror-topology-operation {\r
+ input {\r
+ uses port-mirror-topology-operation-information;\r
+ }\r
+ output {\r
+ uses topology-response-common;\r
+ uses port-mirror-response-information;\r
+ uses service-response-information;\r
+ }\r
+ }\r
+ rpc generic-configuration-topology-operation {\r
+ input {\r
+ uses gc-topology-operation-information;\r
+ }\r
+ output {\r
+ uses topology-response-common;\r
+ uses gc-response-information;\r
+ uses service-response-information;\r
+ }\r
+ }\r
+ rpc vnf-get-resource-request {\r
+ input {\r
+ uses sdnc-request-header;\r
+ uses request-information;\r
+ uses service-information;\r
+ uses vnf-get-resource-request-input-data;\r
+ }\r
+ output {\r
+ container vnf-get-resource-response-information {\r
+ uses vnf-cloud-param;\r
+ }\r
+ }\r
+ }\r
+ container preload-information {\r
uses preload-model-information;\r
}\r
- rpc preload-vnf-topology-operation {\r
+ rpc preload-vf-module-topology-operation {\r
input {\r
uses sdnc-request-header;\r
uses request-information;\r
- uses vnf-topology-information;\r
+ uses preload-vf-module-topology-information;\r
}\r
output {\r
- uses vnf-topology-response-body;\r
+ uses preload-topology-response-body;\r
}\r
}\r
rpc preload-network-topology-operation {\r
input {\r
uses sdnc-request-header;\r
uses request-information;\r
- uses network-topology-information;\r
+ uses preload-network-topology-information;\r
}\r
output {\r
- uses vnf-topology-response-body;\r
+ uses preload-topology-response-body;\r
}\r
}\r
\r
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.Future;
+
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GENERICRESOURCEAPIService;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationNotificationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GenericConfigurationTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GetpathsegmentTopologyOperationOutputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PolicyUpdateNotifyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PortMirrorTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadInformation;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadInformationBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutput;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutputBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfs;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVfModuleTopologyOperationOutputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfGetResourceRequestOutputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutput;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.brg.response.information.BrgResponseInformationBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.connection.attachment.response.information.ConnectionAttachmentResponseInformationBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.contrail.route.response.information.ContrailRouteResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.gc.response.information.GcResponseInformationBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.port.mirror.response.information.PortMirrorResponseInformationBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadData;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadList;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListBuilder;
-import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListKey;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadList;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadListBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.PreloadListKey;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader.SvcAction;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatus.RpcAction;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder;
import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.tunnelxconn.response.information.TunnelxconnResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.response.information.VfModuleResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.response.information.VnfResponseInformationBuilder;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.slf4j.LoggerFactory;
/**
- * Defines a base implementation for your provider. This class extends from a helper class which provides storage for
- * the most commonly used components of the MD-SAL. Additionally the base class provides some basic logging and
+ * Defines a base implementation for your provider. This class extends from a
+ * helper class which provides storage for the most commonly used components of
+ * the MD-SAL. Additionally the base class provides some basic logging and
* initialization / clean up methods.
*
- * To use this, copy and paste (overwrite) the following method into the TestApplicationProviderModule class which is
- * auto generated under src/main/java in this project (created only once during first compilation):
+ * To use this, copy and paste (overwrite) the following method into the
+ * TestApplicationProviderModule class which is auto generated under
+ * src/main/java in this project (created only once during first compilation):
*
* <pre>
*
* @Override
* public java.lang.AutoCloseable createInstance() {
*
- * // final GENERIC-RESOURCE-APIProvider provider = new
- * // GENERIC-RESOURCE-APIProvider();
- * final GenericResourceApiProvider provider = new GenericResourceApiProvider();
- * provider.setDataBroker(getDataBrokerDependency());
- * provider.setNotificationService(getNotificationServiceDependency());
- * provider.setRpcRegistry(getRpcRegistryDependency());
- * provider.initialize();
- * return new AutoCloseable() {
+ * // final GENERIC-RESOURCE-APIProvider provider = new
+ * // GENERIC-RESOURCE-APIProvider();
+ * final GenericResourceApiProvider provider = new GenericResourceApiProvider();
+ * provider.setDataBroker(getDataBrokerDependency());
+ * provider.setNotificationService(getNotificationServiceDependency());
+ * provider.setRpcRegistry(getRpcRegistryDependency());
+ * provider.initialize();
+ * return new AutoCloseable() {
*
- * @Override
- * public void close() throws Exception {
- * // TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE
- * // BROKER/NOTIFICATION
- * // SERVIE/RPC REGISTRY
- * provider.close();
- * }
- * };
+ * @Override
+ * public void close() throws Exception {
+ * // TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE
+ * // BROKER/NOTIFICATION
+ * // SERVIE/RPC REGISTRY
+ * provider.close();
+ * }
+ * };
* }
*
* </pre>
private static final String ERROR_MESSAGE_PARAM = "error-message";
private static final String ACK_FINAL_PARAM = "ack-final";
private static final String SERVICE_OBJECT_PATH_PARAM = "service-object-path";
+ private static final String NETWORK_OBJECT_PATH_PARAM = "network-object-path";
+ private static final String VNF_OBJECT_PATH_PARAM = "vnf-object-path";
+ private static final String VF_MODULE_OBJECT_PATH_PARAM = "vf-module-object-path";
private static final String UPDATING_MDSAL_ERROR_MESSAGE = "Caught Exception updating MD-SAL for {} [{}] \n";
private static final String UPDATING_MDSAL_ERROR_MESSAGE_2 = "Caught Exception updating MD-SAL for {} [{},{}] \n";
private static final String RETURNED_FAILED_MESSAGE = "Returned FAILED for {} [{}] {}";
protected static final String INVALID_INPUT_ERROR_MESSAGE = "invalid input: the service-instance does not have any service data in SDNC";
private static final String ALLOTTED_RESOURCE_ID_PARAM = "allotted-resource-id";
private static final String ERROR_NETWORK_ID = "error";
+ private static final String BACKGROUND_THREAD_STARTED_MESSAGE = "Start background thread";
+ private static final String BACKGROUND_THREAD_INFO = "Background thread: input conf_id is {}";
private final Logger log = LoggerFactory.getLogger(GenericResourceApiProvider.class);
private final ExecutorService executor;
protected RpcProviderRegistry rpcRegistry;
protected BindingAwareBroker.RpcRegistration<GENERICRESOURCEAPIService> rpcRegistration;
- public GenericResourceApiProvider(
- DataBroker dataBroker,
- NotificationPublishService notificationPublishService,
- RpcProviderRegistry rpcProviderRegistry,
- GenericResourceApiSvcLogicServiceClient client
- ) {
+ public GenericResourceApiProvider(DataBroker dataBroker, NotificationPublishService notificationPublishService,
+ RpcProviderRegistry rpcProviderRegistry, GenericResourceApiSvcLogicServiceClient client) {
log.info("Creating provider for {}", APP_NAME);
executor = Executors.newFixedThreadPool(1);
setDataBroker(dataBroker);
// Create the service-instance container
t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class),
- new ServicesBuilder().build());
+ new ServicesBuilder().build());
t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class),
- new ServicesBuilder().build());
+ new ServicesBuilder().build());
- // Create the PreloadVnfs container
- t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadVnfs.class),
- new PreloadVnfsBuilder().build());
- t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadVnfs.class),
- new PreloadVnfsBuilder().build());
+ // Create the PreloadInformation container
+ t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadInformation.class),
+ new PreloadInformationBuilder().build());
+ t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadInformation.class),
+ new PreloadInformationBuilder().build());
try {
CheckedFuture<Void, TransactionCommitFailedException> checkedFuture = t.submit();
}
private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, String errorCode, String errorMessage,
- String ackFinal) {
+ String ackFinal) {
serviceStatusBuilder.setResponseCode(errorCode);
serviceStatusBuilder.setResponseMessage(errorMessage);
serviceStatusBuilder.setFinalIndicator(ackFinal);
private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, SdncRequestHeader requestHeader) {
if (requestHeader != null && requestHeader.getSvcAction() != null) {
switch (requestHeader.getSvcAction()) {
- case Assign:
- serviceStatusBuilder.setRpcAction(RpcAction.Assign);
- break;
- case Unassign:
- serviceStatusBuilder.setRpcAction(RpcAction.Unassign);
- break;
- case Activate:
- serviceStatusBuilder.setRpcAction(RpcAction.Activate);
- break;
- case Deactivate:
- serviceStatusBuilder.setRpcAction(RpcAction.Deactivate);
- break;
- case Delete:
- serviceStatusBuilder.setRpcAction(RpcAction.Delete);
- break;
- default:
- log.error("Unknown SvcAction: {}", requestHeader.getSvcAction());
- break;
+ case Assign:
+ serviceStatusBuilder.setRpcAction(RpcAction.Assign);
+ break;
+ case Unassign:
+ serviceStatusBuilder.setRpcAction(RpcAction.Unassign);
+ break;
+ case Activate:
+ serviceStatusBuilder.setRpcAction(RpcAction.Activate);
+ break;
+ case Deactivate:
+ serviceStatusBuilder.setRpcAction(RpcAction.Deactivate);
+ break;
+ case Delete:
+ serviceStatusBuilder.setRpcAction(RpcAction.Delete);
+ break;
+ case Create:
+ serviceStatusBuilder.setRpcAction(RpcAction.Create);
+ break;
+ default:
+ log.error("Unknown SvcAction: {}", requestHeader.getSvcAction());
+ break;
}
}
}
private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder, LogicalDatastoreType type) {
// See if any data exists yet for this siid, if so grab it.
- InstanceIdentifier<Service> serviceInstanceIdentifier = InstanceIdentifier
- .builder(Services.class)
- .child(Service.class, new ServiceKey(siid))
- .build();
+ InstanceIdentifier<Service> serviceInstanceIdentifier = InstanceIdentifier.builder(Services.class)
+ .child(Service.class, new ServiceKey(siid)).build();
ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
Optional<Service> data = Optional.absent();
serviceDataBuilder.setVnfs(serviceData.getVnfs());
serviceDataBuilder.setProvidedAllottedResources(serviceData.getProvidedAllottedResources());
serviceDataBuilder.setConsumedAllottedResources(serviceData.getConsumedAllottedResources());
+ serviceDataBuilder.setNetworkInstanceGroups(serviceData.getNetworkInstanceGroups());
+ serviceDataBuilder.setVnfcInstanceGroups(serviceData.getVnfcInstanceGroups());
+ serviceDataBuilder.setForwardingPaths(serviceData.getForwardingPaths());
+ serviceDataBuilder.setProvidedConfigurations(serviceData.getProvidedConfigurations());
// service-instance-id needs to be set
} else {
log.info("No service-data found in MD-SAL ({}) for [{}]", type, siid);
}
}
- private void getPreloadData(String vnfName, String vnfType, PreloadDataBuilder preloadDataBuilder) {
- // default to config
- getPreloadData(vnfName, vnfType, preloadDataBuilder, LogicalDatastoreType.CONFIGURATION);
- }
-
- private void getPreloadData(String preloadName, String preloadType, PreloadDataBuilder preloadDataBuilder,
- LogicalDatastoreType type) {
- // See if any data exists yet for this name/type, if so grab it.
- InstanceIdentifier<VnfPreloadList> preloadInstanceIdentifier = InstanceIdentifier
- .builder(PreloadVnfs.class)
- .child(VnfPreloadList.class, new VnfPreloadListKey(preloadName, preloadType))
- .build();
-
- ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
- Optional<VnfPreloadList> data = Optional.absent();
- try {
- data = readTx.read(type, preloadInstanceIdentifier).get();
- } catch (InterruptedException | ExecutionException e) {
- log.error("Caught Exception reading MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType, e);
- }
-
- if (data != null && data.isPresent()) {
- PreloadData preloadData = data.get().getPreloadData();
- if (preloadData != null) {
- log.info("Read MD-SAL ({}) data for [{},{}] PreloadData: {}", type, preloadName, preloadType,
- preloadData);
- preloadDataBuilder.setVnfTopologyInformation(preloadData.getVnfTopologyInformation());
- preloadDataBuilder.setNetworkTopologyInformation(preloadData.getNetworkTopologyInformation());
- preloadDataBuilder.setOperStatus(preloadData.getOperStatus());
- } else {
- log.info("No preload-data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
- }
- } else {
- log.info("No data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
- }
- }
-
private void saveService(final Service entry, boolean merge, LogicalDatastoreType storeType) {
// Each entry will be identifiable by a unique key, we have to create that
// identifier
- InstanceIdentifier<Service> path = InstanceIdentifier
- .builder(Services.class)
- .child(Service.class, entry.getKey())
- .build();
-
- trySaveEntry(entry, merge, storeType, path);
- }
-
- private void savePreloadList(final VnfPreloadList entry, boolean merge, LogicalDatastoreType storeType) {
-
- // Each entry will be identifiable by a unique key, we have to create that
- // identifier
- InstanceIdentifier<VnfPreloadList> path = InstanceIdentifier
- .builder(PreloadVnfs.class)
- .child(VnfPreloadList.class, entry.getKey())
- .build();
+ InstanceIdentifier<Service> path = InstanceIdentifier.builder(Services.class)
+ .child(Service.class, entry.getKey()).build();
trySaveEntry(entry, merge, storeType, path);
}
private <T extends DataObject> void trySaveEntry(T entry, boolean merge, LogicalDatastoreType storeType,
- InstanceIdentifier<T> path) {
+ InstanceIdentifier<T> path) {
int tries = 2;
while (true) {
try {
}
private <T extends DataObject> void save(T entry, boolean merge, LogicalDatastoreType storeType,
- InstanceIdentifier<T> path)
- throws TransactionCommitFailedException {
+ InstanceIdentifier<T> path) throws TransactionCommitFailedException {
WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
if (merge) {
tx.merge(storeType, path, entry);
private void deleteService(final Service entry, LogicalDatastoreType storeType) {
// Each entry will be identifiable by a unique key, we have to create
// that identifier
- InstanceIdentifier<Service> path = InstanceIdentifier
- .builder(Services.class)
- .child(Service.class, entry.getKey())
- .build();
+ InstanceIdentifier<Service> path = InstanceIdentifier.builder(Services.class)
+ .child(Service.class, entry.getKey()).build();
tryDeleteEntry(storeType, path);
}
}
private void delete(LogicalDatastoreType storeType, InstanceIdentifier<Service> path)
- throws TransactionCommitFailedException {
+ throws TransactionCommitFailedException {
+ WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+ tx.delete(storeType, path);
+ tx.submit().checkedGet();
+ log.debug("DataStore delete succeeded");
+ }
+
+ private void getPreloadData(String vnf_name, String vnf_type, PreloadDataBuilder preloadDataBuilder) {
+ // default to config
+ getPreloadData(vnf_name, vnf_type, preloadDataBuilder, LogicalDatastoreType.CONFIGURATION);
+ }
+
+ private void getPreloadData(String preloadName, String preloadType, PreloadDataBuilder preloadDataBuilder,
+ LogicalDatastoreType type) {
+ // See if any data exists yet for this name/type, if so grab it.
+ InstanceIdentifier preloadInstanceIdentifier = InstanceIdentifier
+ .<PreloadInformation>builder(PreloadInformation.class)
+ .child(PreloadList.class, new PreloadListKey(preloadName, preloadType)).build();
+ ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
+ Optional<PreloadList> data = null;
+ try {
+ data = (Optional<PreloadList>) readTx.read(type, preloadInstanceIdentifier).get();
+ } catch (InterruptedException | ExecutionException e) {
+ log.error("Caught Exception reading MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType, e);
+ }
+
+ if (data != null && data.isPresent()) {
+ PreloadData preloadData = data.get().getPreloadData();
+ if (preloadData != null) {
+ log.info("Read MD-SAL ({}) data for [{},{}] PreloadData: {}", type, preloadName, preloadType,
+ preloadData);
+ preloadDataBuilder
+ .setPreloadVfModuleTopologyInformation(preloadData.getPreloadVfModuleTopologyInformation());
+ preloadDataBuilder
+ .setPreloadNetworkTopologyInformation(preloadData.getPreloadNetworkTopologyInformation());
+ preloadDataBuilder.setPreloadOperStatus(preloadData.getPreloadOperStatus());
+ } else {
+ log.info("No preload-data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
+ }
+ } else {
+ log.info("No data found in MD-SAL ({}) for [{},{}] ", type, preloadName, preloadType);
+ }
+ }
+
+ private void savePreloadList(final PreloadList entry, boolean merge, LogicalDatastoreType storeType)
+ throws IllegalStateException {
+
+ // Each entry will be identifiable by a unique key, we have to create that
+ // identifier
+ InstanceIdentifier.InstanceIdentifierBuilder<PreloadList> preloadListBuilder = InstanceIdentifier
+ .<PreloadInformation>builder(PreloadInformation.class).child(PreloadList.class, entry.getKey());
+ InstanceIdentifier<PreloadList> path = preloadListBuilder.build();
+ int tries = 2;
+ while (true) {
+ try {
+ WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+ if (merge) {
+ tx.merge(storeType, path, entry);
+ } else {
+ tx.put(storeType, path, entry);
+ }
+ tx.submit().checkedGet();
+ log.debug("Update DataStore succeeded");
+ break;
+ } catch (final TransactionCommitFailedException e) {
+ if (e instanceof OptimisticLockFailedException) {
+ if (--tries <= 0) {
+ log.debug("Got OptimisticLockFailedException on last try - failing ");
+ throw new IllegalStateException(e);
+ }
+ log.debug("Got OptimisticLockFailedException - trying again ");
+ } else {
+ log.debug("Update DataStore failed");
+ throw new IllegalStateException(e);
+ }
+ }
+ }
+ }
+
+ private void deletePreloadList(final PreloadList entry, LogicalDatastoreType storeType) {
+ // Each entry will be identifiable by a unique key, we have to create
+ // that identifier
+ InstanceIdentifier<PreloadList> path = InstanceIdentifier.builder(PreloadInformation.class)
+ .child(PreloadList.class, entry.getKey()).build();
+
+ tryDeletePreloadListEntry(storeType, path);
+ }
+
+ private void tryDeletePreloadListEntry(LogicalDatastoreType storeType, InstanceIdentifier<PreloadList> path) {
+ int tries = 2;
+ while (true) {
+ try {
+ deletePreloadList(storeType, path);
+ break;
+ } catch (OptimisticLockFailedException e) {
+ if (--tries <= 0) {
+ log.debug("Got OptimisticLockFailedException on last try - failing ");
+ throw new IllegalStateException(e);
+ }
+ log.debug("Got OptimisticLockFailedException - trying again ");
+ } catch (TransactionCommitFailedException ex) {
+ log.debug("Update DataStore failed");
+ throw new IllegalStateException(ex);
+ }
+ }
+ }
+
+ private void deletePreloadList(LogicalDatastoreType storeType, InstanceIdentifier<PreloadList> path)
+ throws TransactionCommitFailedException {
WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
tx.delete(storeType, path);
tx.submit().checkedGet();
@Override
public Future<RpcResult<ServiceTopologyOperationOutput>> serviceTopologyOperation(
- ServiceTopologyOperationInput input) {
+ ServiceTopologyOperationInput input) {
final String svcOperation = "service-topology-operation";
ServiceData serviceData;
responseBuilder.setAckFinalIndicator("Y");
RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ServiceTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
- /*
+ /*
* // setup a service-data object builder // ACTION service-topology-operation
- * // INPUT: // USES uses service-operation-information // OUTPUT: // uses
- * topology-response-common; // uses service-response-information;
- */
+ * // INPUT: // USES uses service-operation-information // OUTPUT: // uses
+ * topology-response-common; // uses service-response-information;
+ */
log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
ServiceTopologyOperationInputBuilder inputBuilder = new ServiceTopologyOperationInputBuilder(input);
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
- log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid,
- operDataBuilder.build());
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
// Call SLI sync method
- // Get SvcLogicService reference
-
ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
String serviceObjectPath = null;
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ServiceTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ServiceTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ServiceTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ServiceTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ServiceTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(ServiceTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ private void trySetResponseMessage(ServiceTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private boolean hasInvalidServiceId(ServiceTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
private void trySetSvcRequestId(ServiceTopologyOperationInput input,
- ServiceTopologyOperationOutputBuilder responseBuilder) {
+ ServiceTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
}
private Properties tryGetProperties(String svcOperation, Properties parms, ServiceDataBuilder serviceDataBuilder,
- ResponseObject responseObject) {
+ ResponseObject responseObject) {
try {
if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
try {
}
private boolean failed(ResponseObject error) {
- return
- !error.getStatusCode().isEmpty() && !("0".equals(error.getStatusCode()) || "200"
- .equals(error.getStatusCode()));
+ return !error.getStatusCode().isEmpty()
+ && !("0".equals(error.getStatusCode()) || "200".equals(error.getStatusCode()));
}
private boolean isValidRequest(ServiceTopologyOperationInput input) {
VnfTopologyOperationOutputBuilder responseBuilder = new VnfTopologyOperationOutputBuilder();
if (hasInvalidServiceId(input)) {
-
log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
responseBuilder.setResponseCode("404");
responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
responseBuilder.setAckFinalIndicator("Y");
RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build()).build();
+ .withResult(responseBuilder.build()).build();
// return error
return Futures.immediateFuture(rpcResult);
}
responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
responseBuilder.setAckFinalIndicator("Y");
- RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
+ String vnfId = input.getVnfInformation().getVnfId();
ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
getServiceData(siid, serviceDataBuilder);
VnfTopologyOperationInputBuilder inputBuilder = new VnfTopologyOperationInputBuilder(input);
GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
- log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid,
- operDataBuilder.build());
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
// Call SLI sync method
- // Get SvcLogicService reference
ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
String serviceObjectPath = null;
+ String vnfObjectPath = null;
Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
if (respProps != null) {
responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
-
- //FIXME if needed
- /*before was "vfn-object-path", but it didn't make sense, since everywhere else,
- when extracting service object path the "service-object-path" property is used*/
serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ vnfObjectPath = respProps.getProperty(VNF_OBJECT_PATH_PARAM);
}
setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
}
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
// return error
return Futures.immediateFuture(rpcResult);
if (isValidRequest(input) && input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
// Only update operational tree on Assign
-
log.info(UPDATING_TREE_INFO_MESSAGE);
saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
}
serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+ VnfResponseInformationBuilder vnfResponseInformationBuilder = new VnfResponseInformationBuilder();
+ vnfResponseInformationBuilder.setInstanceId(vnfId);
+ vnfResponseInformationBuilder.setObjectPath(vnfObjectPath);
+ responseBuilder.setVnfResponseInformation(vnfResponseInformationBuilder.build());
+
} catch (Exception e) {
log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
responseBuilder.setResponseCode("500");
responseBuilder.setAckFinalIndicator("Y");
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<VnfTopologyOperationOutput> rpcResult = RpcResultBuilder.<VnfTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
// return success
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(VnfTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ private void trySetResponseMessage(VnfTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private void trySaveService(VnfTopologyOperationInput input, ServiceBuilder serviceBuilder) {
- if (isValidRequest(input) &&
- (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete) ||
- input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+ if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
// Only update operational tree on activate or delete
log.info(UPDATING_TREE_INFO_MESSAGE);
private boolean hasInvalidVnfId(VnfTopologyOperationInput input) {
return input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
- || input.getVnfInformation().getVnfId().length() == 0;
+ || input.getVnfInformation().getVnfId().length() == 0;
}
private boolean hasInvalidServiceId(VnfTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
private void trySetSvcRequestId(VnfTopologyOperationInput input,
- VnfTopologyOperationOutputBuilder responseBuilder) {
+ VnfTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
@Override
public Future<RpcResult<VfModuleTopologyOperationOutput>> vfModuleTopologyOperation(
- VfModuleTopologyOperationInput input) {
+ VfModuleTopologyOperationInput input) {
final String svcOperation = "vf-module-topology-operation";
ServiceData serviceData;
responseBuilder.setAckFinalIndicator("Y");
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
// return error
return Futures.immediateFuture(rpcResult);
responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
responseBuilder.setAckFinalIndicator("Y");
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
responseBuilder.setAckFinalIndicator("Y");
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
// Grab the service instance ID from the input buffer
String siid = input.getServiceInformation().getServiceInstanceId();
+ String vnfId = input.getVnfInformation().getVnfId();
+ String vfModuleId = input.getVfModuleInformation().getVfModuleId();
trySetSvcRequestId(input, responseBuilder);
VfModuleTopologyOperationInputBuilder inputBuilder = new VfModuleTopologyOperationInputBuilder(input);
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
- log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid,
- operDataBuilder.build());
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
// Call SLI sync method
- // Get SvcLogicService reference
ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
String serviceObjectPath = null;
+ String vnfObjectPath = null;
+ String vfModuleObjectPath = null;
Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
if (respProps != null) {
responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
-
-
- //FIXME if needed
- /*before was "vf-module-object-path", but it didnt make sense, since everywhere else,
- when extracting service object path the "service-object-path" property is used*/
serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ vnfObjectPath = respProps.getProperty(VNF_OBJECT_PATH_PARAM);
+ vfModuleObjectPath = respProps.getProperty(VF_MODULE_OBJECT_PATH_PARAM);
}
setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
// return error
return Futures.immediateFuture(rpcResult);
serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+ VnfResponseInformationBuilder vnfResponseInformationBuilder = new VnfResponseInformationBuilder();
+ vnfResponseInformationBuilder.setInstanceId(vnfId);
+ vnfResponseInformationBuilder.setObjectPath(vnfObjectPath);
+ responseBuilder.setVnfResponseInformation(vnfResponseInformationBuilder.build());
+
+ VfModuleResponseInformationBuilder vfModuleResponseInformationBuilder = new VfModuleResponseInformationBuilder();
+ vfModuleResponseInformationBuilder.setInstanceId(vfModuleId);
+ vfModuleResponseInformationBuilder.setObjectPath(vfModuleObjectPath);
+ responseBuilder.setVfModuleResponseInformation(vfModuleResponseInformationBuilder.build());
+
} catch (Exception e) {
log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
responseBuilder.setResponseCode("500");
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<VfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<VfModuleTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<VfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
// return success
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(VfModuleTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ private void trySetResponseMessage(VfModuleTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private void trySaveService(VfModuleTopologyOperationInput input, ServiceBuilder serviceBuilder) {
- if (isValidRequest(input) &&
- (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
- input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+ if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
// Only update operational tree on activate or delete
log.info(UPDATING_TREE_INFO_MESSAGE);
}
private void trySetSvcRequestId(VfModuleTopologyOperationInput input,
- VfModuleTopologyOperationOutputBuilder responseBuilder) {
+ VfModuleTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
private boolean hasInvalidVfModuleId(VfModuleTopologyOperationInput input) {
return input.getVfModuleInformation() == null || input.getVfModuleInformation().getVfModuleId() == null
- || input.getVfModuleInformation().getVfModuleId().length() == 0;
+ || input.getVfModuleInformation().getVfModuleId().length() == 0;
}
private boolean hasInvalidVnfId(VfModuleTopologyOperationInput input) {
return input.getVnfInformation() == null || input.getVnfInformation().getVnfId() == null
- || input.getVnfInformation().getVnfId().length() == 0;
+ || input.getVnfInformation().getVnfId().length() == 0;
}
private boolean hasInvalidServiceId(VfModuleTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
private boolean isValidRequest(VfModuleTopologyOperationInput input) {
@Override
public Future<RpcResult<NetworkTopologyOperationOutput>> networkTopologyOperation(
- NetworkTopologyOperationInput input) {
+ NetworkTopologyOperationInput input) {
final String svcOperation = "network-topology-operation";
ServiceData serviceData;
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
// Call SLI sync method
- // Get SvcLogicService reference
ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
networkId = respProps.getProperty("networkId");
serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
- networkObjectPath = respProps.getProperty("network-object-path");
+ networkObjectPath = respProps.getProperty(NETWORK_OBJECT_PATH_PARAM);
}
if (failed(responseObject)) {
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<NetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<NetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<NetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(NetworkTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ private void trySetResponseMessage(NetworkTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private void trySetSvcRequestId(NetworkTopologyOperationInput input,
- NetworkTopologyOperationOutputBuilder responseBuilder) {
+ NetworkTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
}
private void trySaveService(NetworkTopologyOperationInput input, ServiceBuilder serviceBuilder) {
- if (isValidRequest(input) &&
- (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate) ||
- input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Create))) {
+ if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Create))) {
// Only update operational tree on Activate
log.info(UPDATING_TREE_INFO_MESSAGE);
saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
private boolean hasInvalidServiceId(NetworkTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
private Future<RpcResult<NetworkTopologyOperationOutput>> buildRpcResultFuture(
- NetworkTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+ NetworkTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
responseBuilder.setResponseCode("404");
- responseBuilder
- .setResponseMessage(responseMessage);
+ responseBuilder.setResponseMessage(responseMessage);
responseBuilder.setAckFinalIndicator("Y");
RpcResult<NetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<NetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<NetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
@Override
public Future<RpcResult<ContrailRouteTopologyOperationOutput>> contrailRouteTopologyOperation(
- ContrailRouteTopologyOperationInput input) {
+ ContrailRouteTopologyOperationInput input) {
final String svcOperation = "contrail-route-topology-operation";
ServiceData serviceData;
GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
// Call SLI sync method
- // Get SvcLogicService reference
- ResponseObject error = new ResponseObject("200", "");
+
+ ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
String allottedResourceId = ERROR_NETWORK_ID;
String serviceObjectPath = null;
String contrailRouteObjectPath = null;
- Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, error);
+ Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
if (respProps != null) {
- error.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
- error.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
contrailRouteObjectPath = respProps.getProperty("contrail-route-object-path");
}
- if (failed(error)) {
- responseBuilder.setResponseCode(error.getStatusCode());
- responseBuilder.setResponseMessage(error.getMessage());
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
responseBuilder.setAckFinalIndicator(ackFinal);
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ContrailRouteTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ContrailRouteTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
// Update succeeded
- responseBuilder.setResponseCode(error.getStatusCode());
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setAckFinalIndicator(ackFinal);
- trySetResponseMessage(responseBuilder, error);
+ trySetResponseMessage(responseBuilder, responseObject);
log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ContrailRouteTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
private void trySetResponseMessage(ContrailRouteTopologyOperationOutputBuilder responseBuilder,
- ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private void trySaveService(ContrailRouteTopologyOperationInput input, ServiceBuilder serviceBuilder) {
- if (isValidRequest(input) &&
- (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
- input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+ if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
// Only update operational tree on activate or delete
log.info(UPDATING_TREE_INFO_MESSAGE);
saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
}
private void trySetSvcRequestId(ContrailRouteTopologyOperationInput input,
- ContrailRouteTopologyOperationOutputBuilder responseBuilder) {
+ ContrailRouteTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
private boolean hasInvalidServiceId(ContrailRouteTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
- private Future<RpcResult<ContrailRouteTopologyOperationOutput>>
- buildRpcResultFuture(ContrailRouteTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
-
+ private Future<RpcResult<ContrailRouteTopologyOperationOutput>> buildRpcResultFuture(
+ ContrailRouteTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
responseBuilder.setResponseCode("404");
responseBuilder.setResponseMessage(responseMessage);
responseBuilder.setAckFinalIndicator("Y");
RpcResult<ContrailRouteTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<ContrailRouteTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<ContrailRouteTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
@Override
public Future<RpcResult<SecurityZoneTopologyOperationOutput>> securityZoneTopologyOperation(
- SecurityZoneTopologyOperationInput input) {
+ SecurityZoneTopologyOperationInput input) {
final String svcOperation = "security-zone-topology-operation";
ServiceData serviceData;
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
// Call SLI sync method
- // Get SvcLogicService reference
Properties respProps = null;
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<SecurityZoneTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<SecurityZoneTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<SecurityZoneTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
private void trySetResponseMessage(SecurityZoneTopologyOperationOutputBuilder responseBuilder,
- ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private void trySaveService(SecurityZoneTopologyOperationInput input, ServiceBuilder serviceBuilder) {
- if (isValidRequest(input) &&
- (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
- input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
+ if (isValidRequest(input) && (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))) {
// Only update operational tree on activate or delete
log.info(UPDATING_TREE_INFO_MESSAGE);
saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
}
private void trySetSvcRequestId(SecurityZoneTopologyOperationInput input,
- SecurityZoneTopologyOperationOutputBuilder responseBuilder) {
+ SecurityZoneTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
private boolean hasInvalidServiceId(SecurityZoneTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
- private Future<RpcResult<SecurityZoneTopologyOperationOutput>>
- buildRpcResultFuture(SecurityZoneTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
+ private Future<RpcResult<SecurityZoneTopologyOperationOutput>> buildRpcResultFuture(
+ SecurityZoneTopologyOperationOutputBuilder responseBuilder, String responseMessage) {
responseBuilder.setResponseCode("404");
responseBuilder.setResponseMessage(responseMessage);
responseBuilder.setAckFinalIndicator("Y");
RpcResult<SecurityZoneTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<SecurityZoneTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ .<SecurityZoneTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
return input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null;
}
- @Override
- public Future<RpcResult<TunnelxconnTopologyOperationOutput>> tunnelxconnTopologyOperation(
- TunnelxconnTopologyOperationInput input) {
-
- final String svcOperation = "tunnelxconn-topology-operation";
- Properties parms = new Properties();
- log.info(CALLED_STR, svcOperation);
- // create a new response object
- TunnelxconnTopologyOperationOutputBuilder responseBuilder = new TunnelxconnTopologyOperationOutputBuilder();
- if (hasInvalidServiceId(input)) {
- log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
- responseBuilder.setResponseCode("404");
- responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
- responseBuilder.setAckFinalIndicator("Y");
-
- RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<TunnelxconnTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
- String siid = input.getServiceInformation().getServiceInstanceId();
- log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
- TunnelxconnTopologyOperationInputBuilder inputBuilder = new TunnelxconnTopologyOperationInputBuilder(input);
- GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
-
- // Call SLI sync method
- // Get SvcLogicService reference
- ResponseObject responseObject = new ResponseObject("200", "");
- String ackFinal = "Y";
- String allottedResourceId = ERROR_NETWORK_ID;
- String serviceObjectPath = null;
- String tunnelxconnObjectPath = null;
- Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
-
- if (respProps != null) {
- responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
- responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
- ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
- allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
- serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
- tunnelxconnObjectPath = respProps.getProperty("tunnelxconn-object-path");
- }
-
- if (failed(responseObject)) {
- responseBuilder.setResponseCode(responseObject.getStatusCode());
- responseBuilder.setResponseMessage(responseObject.getMessage());
- responseBuilder.setAckFinalIndicator(ackFinal);
-
- log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
-
- RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<TunnelxconnTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
-
- // Got success from SLI
- try {
- TunnelxconnResponseInformationBuilder tunnelxconnResponseInformationBuilder = new TunnelxconnResponseInformationBuilder();
- tunnelxconnResponseInformationBuilder.setInstanceId(allottedResourceId);
- tunnelxconnResponseInformationBuilder.setObjectPath(tunnelxconnObjectPath);
- responseBuilder.setTunnelxconnResponseInformation(tunnelxconnResponseInformationBuilder.build());
-
- ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
- serviceResponseInformationBuilder.setInstanceId(siid);
- serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
- responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
-
- } catch (IllegalStateException e) {
- log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
- responseBuilder.setResponseCode("500");
- responseBuilder.setResponseMessage(e.toString());
- responseBuilder.setAckFinalIndicator("Y");
- log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
-
- RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<TunnelxconnTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
-
- // Update succeeded
- responseBuilder.setResponseCode(responseObject.getStatusCode());
- responseBuilder.setAckFinalIndicator(ackFinal);
- trySetResponseMessage(responseBuilder, responseObject);
- log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
- log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
-
- RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<TunnelxconnTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
-
- private boolean hasInvalidServiceId(ConnectionAttachmentTopologyOperationInput input) {
- return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
- }
+ private boolean hasInvalidServiceId(ConnectionAttachmentTopologyOperationInput input) {
+ return input == null || input.getServiceInformation() == null
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ }
private void trySetResponseMessage(ConnectionAttachmentTopologyOperationOutputBuilder responseBuilder,
ResponseObject error) {
return Futures.immediateFuture(rpcResult);
}
+ @Override
+ public Future<RpcResult<TunnelxconnTopologyOperationOutput>> tunnelxconnTopologyOperation(
+ TunnelxconnTopologyOperationInput input) {
+
+ final String svcOperation = "tunnelxconn-topology-operation";
+ Properties parms = new Properties();
+ log.info(CALLED_STR, svcOperation);
+
+ // create a new response object
+ TunnelxconnTopologyOperationOutputBuilder responseBuilder = new TunnelxconnTopologyOperationOutputBuilder();
+ if (hasInvalidServiceId(input)) {
+ log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+ responseBuilder.setAckFinalIndicator("Y");
+
+ RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+ String siid = input.getServiceInformation().getServiceInstanceId();
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ TunnelxconnTopologyOperationInputBuilder inputBuilder = new TunnelxconnTopologyOperationInputBuilder(input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ // Call SLI sync method
+
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String allottedResourceId = ERROR_NETWORK_ID;
+ String serviceObjectPath = null;
+ String tunnelxconnObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
+ serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ tunnelxconnObjectPath = respProps.getProperty("tunnelxconn-object-path");
+ }
+
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ try {
+ TunnelxconnResponseInformationBuilder tunnelxconnResponseInformationBuilder = new TunnelxconnResponseInformationBuilder();
+ tunnelxconnResponseInformationBuilder.setInstanceId(allottedResourceId);
+ tunnelxconnResponseInformationBuilder.setObjectPath(tunnelxconnObjectPath);
+ responseBuilder.setTunnelxconnResponseInformation(tunnelxconnResponseInformationBuilder.build());
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+ serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+ responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+ } catch (IllegalStateException e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ responseBuilder.setResponseCode("500");
+ responseBuilder.setResponseMessage(e.getMessage());
+ responseBuilder.setAckFinalIndicator("Y");
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Update succeeded
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+ trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<TunnelxconnTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<TunnelxconnTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
private void trySetResponseMessage(TunnelxconnTopologyOperationOutputBuilder responseBuilder,
- ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private boolean hasInvalidServiceId(TunnelxconnTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
private Properties tryGetProperties(String svcOperation, Properties parms, ResponseObject responseObject) {
responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
responseBuilder.setAckFinalIndicator("Y");
- RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<BrgTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
// Call SLI sync method
- // Get SvcLogicService reference
- ResponseObject error = new ResponseObject("200", "");
+
+ ResponseObject responseObject = new ResponseObject("200", "");
String ackFinal = "Y";
String allottedResourceId = ERROR_NETWORK_ID;
String serviceObjectPath = null;
String brgObjectPath = null;
- Properties respProps = tryGetProperties(svcOperation, parms, error);
+ Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
if (respProps != null) {
- error.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
- error.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
allottedResourceId = respProps.getProperty(ALLOTTED_RESOURCE_ID_PARAM);
serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
brgObjectPath = respProps.getProperty("brg-object-path");
}
- if (failed(error)) {
- responseBuilder.setResponseCode(error.getStatusCode());
- responseBuilder.setResponseMessage(error.getMessage());
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
responseBuilder.setAckFinalIndicator(ackFinal);
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<BrgTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
} catch (IllegalStateException e) {
log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
responseBuilder.setResponseCode("500");
- responseBuilder.setResponseMessage(e.toString());
+ responseBuilder.setResponseMessage(e.getMessage());
responseBuilder.setAckFinalIndicator("Y");
log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<BrgTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
// Update succeeded
- responseBuilder.setResponseCode(error.getStatusCode());
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setAckFinalIndicator(ackFinal);
- trySetResponseMessage(responseBuilder, error);
+ trySetResponseMessage(responseBuilder, responseObject);
log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<BrgTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<BrgTopologyOperationOutput> rpcResult = RpcResultBuilder.<BrgTopologyOperationOutput>status(true)
+ .withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(BrgTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
+ private void trySetResponseMessage(BrgTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
}
}
private boolean hasInvalidServiceId(BrgTopologyOperationInput input) {
return input == null || input.getServiceInformation() == null
- || input.getServiceInformation().getServiceInstanceId() == null
- || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ }
+
+ private String resolveAckFinal(ResponseObject responseObject, Properties respProps) {
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ return respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ }
+ return "Y";
}
@Override
- public Future<RpcResult<PreloadVnfTopologyOperationOutput>> preloadVnfTopologyOperation(
- PreloadVnfTopologyOperationInput input) {
+ public Future<RpcResult<PreloadNetworkTopologyOperationOutput>> preloadNetworkTopologyOperation(
+ PreloadNetworkTopologyOperationInput input) {
- final String svcOperation = "preload-vnf-topology-operation";
- Properties parms = new Properties();
+ final String svcOperation = "preload-network-topology-operation";
+ PreloadData preloadData;
+ Properties properties = new Properties();
log.info(CALLED_STR, svcOperation);
// create a new response object
- PreloadVnfTopologyOperationOutputBuilder responseBuilder = new PreloadVnfTopologyOperationOutputBuilder();
-
- if (hasInvalidVnfTopology(input)) {
+ PreloadNetworkTopologyOperationOutputBuilder responseBuilder = new PreloadNetworkTopologyOperationOutputBuilder();
- log.debug("exiting {} because of null input", svcOperation);
+ if (hasInvalidPreloadNetwork(input)) {
+ log.debug("exiting {} because of null or empty preload-network-topology-information", svcOperation);
responseBuilder.setResponseCode("403");
- responseBuilder.setResponseMessage("invalid input: input is null");
+ responseBuilder.setResponseMessage("invalid input, null or empty preload-network-topology-information");
responseBuilder.setAckFinalIndicator("Y");
- RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadVnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- // Grab the name and type from the input buffer
- String preloadName = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfName();
- String preloadType = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfType();
-
- // Make sure we have a preload_name and preload_type
- if (invalidPreloadData(preloadName, preloadType)) {
- log.debug("exiting {} vnf-name or vnf-type is null or empty", svcOperation);
- responseBuilder.setResponseCode("403");
- responseBuilder.setResponseMessage("invalid input: vnf-name or vnf-type is null or empty");
- responseBuilder.setAckFinalIndicator("Y");
-
- RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadVnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
+ // Grab the preload ID from the input buffer
+ String preloadId = input.getPreloadNetworkTopologyInformation().getNetworkTopologyIdentifierStructure()
+ .getNetworkName();
+ String preloadType = "network";
trySetSvcRequestId(input, responseBuilder);
PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
- getPreloadData(preloadName, preloadType, preloadDataBuilder);
+ getPreloadData(preloadId, preloadType, preloadDataBuilder);
PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
- getPreloadData(preloadName, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+ getPreloadData(preloadId, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+ //
// setup a preload-data object builder
- // ACTION preload-vnf-topology-operation
+ // ACTION preload-network-topology-operation
// INPUT:
- // USES sdnc-request-header;
- // USES request-information;
- // uses vnf-topology-information;
+ // uses sdnc-request-header;
+ // uses request-information;
+ // uses preload-network-topology-information;
// OUTPUT:
- // USES vnf-topology-response-body;
+ // uses preload-topology-response-body;
//
// container preload-data
- // uses vnf-topology-information;
- // uses network-topology-information;
- // uses oper-status;
+ // uses preload-network-topology-information;
+ // uses preload-oper-status;
- log.info("Adding INPUT data for {} [{},{}] input: {}", svcOperation, preloadName, preloadType, input);
- PreloadVnfTopologyOperationInputBuilder inputBuilder = new PreloadVnfTopologyOperationInputBuilder(input);
- GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
- log.info("Adding OPERATIONAL data for {} [{},{}] operational-data: {}", svcOperation, preloadName,
- preloadType, operDataBuilder.build());
- GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, preloadId, input);
+ PreloadNetworkTopologyOperationInputBuilder inputBuilder = new PreloadNetworkTopologyOperationInputBuilder(
+ input);
+ GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, preloadId, input);
+ GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
// Call SLI sync method
- // Get SvcLogicService reference
ResponseObject responseObject = new ResponseObject("200", "");
- Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
- String ackFinal = resolveAckFinal(responseObject, respProps);
-
- if (failed(responseObject)) {
+ String ackFinal = "Y";
+ Properties respProps = tryGetProperties(svcOperation, properties, preloadDataBuilder, responseObject);
- responseBuilder.setResponseCode(responseObject.getStatusCode());
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ }
+
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setResponseMessage(responseObject.getMessage());
responseBuilder.setAckFinalIndicator(ackFinal);
-
- VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
- preloadVnfListBuilder.setVnfName(preloadName);
- preloadVnfListBuilder.setVnfType(preloadType);
- preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
- log.error("Returned FAILED for {} [{},{}] error code: '{}', Reason: '{}'", svcOperation, preloadName,
- preloadType, responseObject.getStatusCode(), responseObject.getMessage());
- try {
- savePreloadList(preloadVnfListBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
- } catch (Exception e) {
- log.error(UPDATING_MDSAL_ERROR_MESSAGE_2, svcOperation, preloadName,
- preloadType, e);
- }
- log.debug("Sending Success rpc result due to external error");
-
- RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadVnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+ RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
// Got success from SLI
try {
- updatePreloadData(svcOperation, preloadName, preloadType, preloadDataBuilder);
+ preloadData = preloadDataBuilder.build();
+ log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, preloadId, preloadData);
+
+ // preload-list object
+ PreloadListBuilder preloadListBuilder = new PreloadListBuilder();
+ preloadListBuilder.setPreloadId(preloadId);
+ preloadListBuilder.setPreloadType(preloadType);
+ preloadListBuilder.setPreloadData(preloadData);
+
+ savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+ log.info(UPDATING_TREE_INFO_MESSAGE);
+ savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+
+ tryDeletePreload(input, preloadListBuilder);
} catch (Exception e) {
- log.error(UPDATING_MDSAL_ERROR_MESSAGE_2, svcOperation, preloadName, preloadType,
- e);
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, preloadId, e);
responseBuilder.setResponseCode("500");
responseBuilder.setResponseMessage(e.getMessage());
responseBuilder.setAckFinalIndicator("Y");
- log.error("Returned FAILED for {} [{},{}] {}", svcOperation, preloadName, preloadType,
- responseBuilder.build());
-
- RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadVnfTopologyOperationOutput>status(false)
- .withResult(responseBuilder.build())
- .build();
-
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+ RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadNetworkTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setAckFinalIndicator(ackFinal);
trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, preloadId);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, preloadId, responseBuilder.build());
- log.info("Updated MD-SAL for {} [{},{}]", svcOperation, preloadName, preloadType);
- log.info("Returned SUCCESS for {} [{},{}] {}", svcOperation, preloadName, preloadType,
- responseBuilder.build());
-
- RpcResult<PreloadVnfTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadVnfTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
+ RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadNetworkTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- private String resolveAckFinal(ResponseObject responseObject, Properties respProps) {
- if (respProps != null) {
- responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
- responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
- return respProps.getProperty(ACK_FINAL_PARAM, "Y");
- }
- return "Y";
+ private boolean hasInvalidPreloadNetwork(PreloadNetworkTopologyOperationInput input) {
+ return input == null || input.getPreloadNetworkTopologyInformation() == null
+ || input.getPreloadNetworkTopologyInformation().getNetworkTopologyIdentifierStructure() == null;
}
- private void trySetResponseMessage(PreloadVnfTopologyOperationOutputBuilder responseBuilder, ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
- }
+ private boolean hasInvalidPreloadId(String preloadId) {
+ return preloadId == null || preloadId.length() == 0;
}
- private void trySetSvcRequestId(PreloadVnfTopologyOperationInput input,
- PreloadVnfTopologyOperationOutputBuilder responseBuilder) {
+ private void trySetSvcRequestId(PreloadNetworkTopologyOperationInput input,
+ PreloadNetworkTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
}
- private boolean hasInvalidVnfTopology(PreloadVnfTopologyOperationInput input) {
- return input == null || input.getVnfTopologyInformation() == null
- || input.getVnfTopologyInformation().getVnfTopologyIdentifier() == null;
+ private Properties tryGetProperties(String svcOperation, Properties parms, PreloadDataBuilder preloadDataBuilder,
+ ResponseObject responseObject) {
+ try {
+ if (svcLogicClient.hasGraph(APP_NAME, svcOperation, null, "sync")) {
+ try {
+ return svcLogicClient.execute(APP_NAME, svcOperation, null, "sync", preloadDataBuilder, parms);
+ } catch (Exception e) {
+ log.error(SERVICE_LOGIC_EXECUTION_ERROR_MESSAGE, svcOperation, e);
+ responseObject.setMessage(e.getMessage());
+ responseObject.setStatusCode("500");
+ }
+ } else {
+ responseObject.setMessage(NO_SERVICE_LOGIC_ACTIVE + APP_NAME + ": '" + svcOperation + "'");
+ responseObject.setStatusCode("503");
+ }
+ } catch (Exception e) {
+ responseObject.setMessage(e.getMessage());
+ responseObject.setStatusCode("500");
+ log.error(SERVICE_LOGIC_SEARCH_ERROR_MESSAGE, e);
+ }
+
+ return null;
}
- private void updatePreloadData(String svcOperation, String preloadName, String preloadType,
- PreloadDataBuilder preloadDataBuilder) {
- PreloadData preloadData;
- preloadData = preloadDataBuilder.build();
- log.info("Updating MD-SAL for {} [{},{}] preloadData: {}", svcOperation, preloadName, preloadType,
- preloadData);
- // svc-configuration-list
- VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
- preloadVnfListBuilder.setVnfName(preloadName);
- preloadVnfListBuilder.setVnfType(preloadType);
- preloadVnfListBuilder.setPreloadData(preloadData);
+ private void trySetResponseMessage(PreloadNetworkTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ if (!responseObject.getMessage().isEmpty()) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ }
+ }
+ }
- // merge flag sets to false to allow it to be overwritten (not appended)
- savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
- log.info(UPDATING_TREE_INFO_MESSAGE);
- savePreloadList(preloadVnfListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+ private void tryDeletePreload(PreloadNetworkTopologyOperationInput input, PreloadListBuilder preloadListBuilder) {
+ if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
+ log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+ deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+ deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+ }
}
@Override
- public Future<RpcResult<PreloadNetworkTopologyOperationOutput>> preloadNetworkTopologyOperation(
- PreloadNetworkTopologyOperationInput input) {
+ public Future<RpcResult<PreloadVfModuleTopologyOperationOutput>> preloadVfModuleTopologyOperation(
+ PreloadVfModuleTopologyOperationInput input) {
- final String svcOperation = "preload-network-topology-operation";
- Properties parms = new Properties();
+ final String svcOperation = "preload-vf-module-topology-operation";
+ PreloadData preloadData;
+ Properties properties = new Properties();
log.info(CALLED_STR, svcOperation);
// create a new response object
- PreloadNetworkTopologyOperationOutputBuilder responseBuilder = new PreloadNetworkTopologyOperationOutputBuilder();
+ PreloadVfModuleTopologyOperationOutputBuilder responseBuilder = new PreloadVfModuleTopologyOperationOutputBuilder();
- if (hasInvalidNetworkTopology(input)) {
-
- log.debug("exiting {} because of null input", svcOperation);
+ if (hasInvalidPreloadVfModule(input)) {
+ log.debug(
+ "exiting {} because of null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name",
+ svcOperation);
responseBuilder.setResponseCode("403");
- responseBuilder.setResponseMessage("input is null");
+ responseBuilder.setResponseMessage(
+ "invalid input, null or empty preload-vf-module-topology-information.vf-module-topology.vf-module-topology-identifier.vf-module-name");
responseBuilder.setAckFinalIndicator("Y");
- RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadNetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- // Grab the name and type from the input buffer
- String preloadName = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkName();
- String preloadType = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkType();
-
- // Make sure we have a preload_name and preload_type
- if (invalidPreloadData(preloadName, preloadType)) {
- log.debug("exiting {} because of invalid preload-name or preload-type", svcOperation);
- responseBuilder.setResponseCode("403");
- responseBuilder.setResponseMessage("invalid input: network-name or network-type is null or empty");
- responseBuilder.setAckFinalIndicator("Y");
-
- RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadNetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
-
- return Futures.immediateFuture(rpcResult);
- }
+ // Grab the preload ID from the input buffer
+ String preloadId = input.getPreloadVfModuleTopologyInformation().getVfModuleTopology()
+ .getVfModuleTopologyIdentifier().getVfModuleName();
+ String preloadType = "vf-module";
trySetSvcRequestId(input, responseBuilder);
PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
- getPreloadData(preloadName, preloadType, preloadDataBuilder);
+ getPreloadData(preloadId, preloadType, preloadDataBuilder);
PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
- getPreloadData(preloadName, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+ getPreloadData(preloadId, preloadType, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
//
// setup a preload-data object builder
- // ACTION preload-network-topology-operation
+ // ACTION preload-vf-module-topology-operation
// INPUT:
- // USES sdnc-request-header;
- // USES request-information;
- // uses network-topology-information;
+ // uses sdnc-request-header;
+ // uses request-information;
+ // uses preload-vnf-topology-information;
// OUTPUT:
- // USES vnf-topology-response-body;
+ // uses preload-topology-response-body;
//
// container preload-data
- // uses vnf-topology-information;
- // uses network-topology-information;
- // uses oper-status;
+ // uses preload-vf-module-topology-information;
+ // uses preload-oper-status;
- log.info("Adding INPUT data for {} [{},{}] input: {}", svcOperation, preloadName, preloadType, input);
- PreloadNetworkTopologyOperationInputBuilder inputBuilder = new PreloadNetworkTopologyOperationInputBuilder(
- input);
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, preloadId, input);
+ PreloadVfModuleTopologyOperationInputBuilder inputBuilder = new PreloadVfModuleTopologyOperationInputBuilder(
+ input);
+ GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, preloadId, input);
+ GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ Properties respProps = tryGetProperties(svcOperation, properties, preloadDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ }
+
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+ RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ try {
+ preloadData = preloadDataBuilder.build();
+ log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, preloadId, preloadData);
+
+ // preload-list object
+ PreloadListBuilder preloadListBuilder = new PreloadListBuilder();
+ preloadListBuilder.setPreloadId(preloadId);
+ preloadListBuilder.setPreloadType(preloadType);
+ preloadListBuilder.setPreloadData(preloadData);
+
+ savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+ log.info(UPDATING_TREE_INFO_MESSAGE);
+ savePreloadList(preloadListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+
+ tryDeletePreload(input, preloadListBuilder);
+
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, preloadId, e);
+ responseBuilder.setResponseCode("500");
+ responseBuilder.setResponseMessage(e.getMessage());
+ responseBuilder.setAckFinalIndicator("Y");
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+ RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadVfModuleTopologyOperationOutput>status(false).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Update succeeded
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+ trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, preloadId);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, preloadId, responseBuilder.build());
+
+ RpcResult<PreloadVfModuleTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PreloadVfModuleTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ private boolean hasInvalidPreloadVfModule(PreloadVfModuleTopologyOperationInput input) {
+ return input == null || input.getPreloadVfModuleTopologyInformation() == null
+ || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology() == null
+ || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology()
+ .getVfModuleTopologyIdentifier() == null
+ || input.getPreloadVfModuleTopologyInformation().getVfModuleTopology().getVfModuleTopologyIdentifier()
+ .getVfModuleName() == null;
+ }
+
+ private void trySetSvcRequestId(PreloadVfModuleTopologyOperationInput input,
+ PreloadVfModuleTopologyOperationOutputBuilder responseBuilder) {
+ if (input.getSdncRequestHeader() != null) {
+ responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+ }
+ }
+
+ private void trySetResponseMessage(PreloadVfModuleTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ if (!responseObject.getMessage().isEmpty()) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ }
+ }
+ }
+
+ private void tryDeletePreload(PreloadVfModuleTopologyOperationInput input, PreloadListBuilder preloadListBuilder) {
+ if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete)) {
+ log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+ deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+ deletePreloadList(preloadListBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+ }
+ }
+
+ @Override
+ public Future<RpcResult<GenericConfigurationTopologyOperationOutput>> genericConfigurationTopologyOperation(
+ GenericConfigurationTopologyOperationInput input) {
+
+ final String svcOperation = "generic-configuration-topology-operation";
+ ServiceData serviceData;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+ // create a new response object
+ GenericConfigurationTopologyOperationOutputBuilder responseBuilder = new GenericConfigurationTopologyOperationOutputBuilder();
+
+ if (hasInvalidService(input)) {
+ log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+ responseBuilder.setAckFinalIndicator("Y");
+
+ RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+ .build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ trySetSvcRequestId(input, responseBuilder);
+
+ if (hasInvalidConfigurationIdOrType(input)) {
+ log.debug("exiting {} because of null or empty configuration-id or configuration-type", svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage("invalid input, null or empty configuration-id or configuration-type");
+ responseBuilder.setAckFinalIndicator("Y");
+ RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+ .build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Grab the configuration ID from the input buffer
+ String configId = input.getConfigurationInformation().getConfigurationId();
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ GenericConfigurationTopologyOperationInputBuilder inputBuilder = new GenericConfigurationTopologyOperationInputBuilder(
+ input);
GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
- log.info("Adding OPERATIONAL data for {} [{},{}] operational-data: {}", svcOperation, preloadName,
- preloadType, operDataBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
// Call SLI sync method
- // Get SvcLogicService reference
+
ResponseObject responseObject = new ResponseObject("200", "");
- Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+ String ackFinal = "Y";
+ String serviceObjectPath = "";
+ Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ }
- String ackFinal = resolveAckFinal(responseObject, respProps);
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
if (failed(responseObject)) {
-
responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setResponseMessage(responseObject.getMessage());
responseBuilder.setAckFinalIndicator(ackFinal);
- VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
- preloadVnfListBuilder.setVnfName(preloadName);
- preloadVnfListBuilder.setVnfType(preloadType);
- preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
- log.error("Returned FAILED for {} [{},{}] error code: '{}', Reason: '{}'", svcOperation, preloadName,
- preloadType, responseObject.getStatusCode(), responseObject.getMessage());
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
try {
- savePreloadList(preloadVnfListBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+ saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
} catch (Exception e) {
- log.error(UPDATING_MDSAL_ERROR_MESSAGE_2, svcOperation, preloadName,
- preloadType, e);
-
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
}
- log.debug("Sending Success rpc result due to external error");
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
- RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadNetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+ .build();
return Futures.immediateFuture(rpcResult);
}
// Got success from SLI
try {
- updatePreloadData(svcOperation, preloadName, preloadType, preloadDataBuilder);
+ serviceData = serviceDataBuilder.build();
+
+ // service object
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceData(serviceData);
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+ serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+ responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+ GcResponseInformationBuilder gcResponseInformationBuilder = new GcResponseInformationBuilder();
+ gcResponseInformationBuilder.setInstanceId(configId);
+ responseBuilder.setGcResponseInformation(gcResponseInformationBuilder.build());
+
} catch (Exception e) {
- log.error(UPDATING_MDSAL_ERROR_MESSAGE_2, svcOperation, preloadName, preloadType, e);
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
responseBuilder.setResponseCode("500");
responseBuilder.setResponseMessage(e.getMessage());
responseBuilder.setAckFinalIndicator("Y");
- log.error("Returned FAILED for {} [{},{}] {}", svcOperation, preloadName, preloadType,
- responseBuilder.build());
-
- RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadNetworkTopologyOperationOutput>status(false)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build())
+ .build();
return Futures.immediateFuture(rpcResult);
}
responseBuilder.setResponseCode(responseObject.getStatusCode());
responseBuilder.setAckFinalIndicator(ackFinal);
trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
- log.info("Updated MD-SAL for {} [{},{}]", svcOperation, preloadName, preloadType);
- log.info("Returned SUCCESS for {} [{},{}] {}", svcOperation, preloadName, preloadType,
- responseBuilder.build());
-
- RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult = RpcResultBuilder
- .<PreloadNetworkTopologyOperationOutput>status(true)
- .withResult(responseBuilder.build())
- .build();
+ RpcResult<GenericConfigurationTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GenericConfigurationTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
return Futures.immediateFuture(rpcResult);
}
- private void trySetResponseMessage(PreloadNetworkTopologyOperationOutputBuilder responseBuilder,
- ResponseObject error) {
- if (!error.getMessage().isEmpty()) {
- responseBuilder.setResponseMessage(error.getMessage());
- }
+ private boolean hasInvalidService(GenericConfigurationTopologyOperationInput input) {
+ return input == null || input.getServiceInformation() == null
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
}
- private void trySetSvcRequestId(PreloadNetworkTopologyOperationInput input,
- PreloadNetworkTopologyOperationOutputBuilder responseBuilder) {
+ private void trySetSvcRequestId(GenericConfigurationTopologyOperationInput input,
+ GenericConfigurationTopologyOperationOutputBuilder responseBuilder) {
if (input.getSdncRequestHeader() != null) {
responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
}
}
- private boolean invalidPreloadData(String preloadName, String preloadType) {
- return preloadName == null || preloadName.length() == 0 || preloadType == null || preloadType.length() == 0;
+ private boolean hasInvalidConfigurationIdOrType(GenericConfigurationTopologyOperationInput input) {
+ return input.getConfigurationInformation() == null
+ || input.getConfigurationInformation().getConfigurationId() == null
+ || input.getConfigurationInformation().getConfigurationType() == null;
}
- private boolean hasInvalidNetworkTopology(PreloadNetworkTopologyOperationInput input) {
- return input == null || input.getNetworkTopologyInformation() == null
- || input.getNetworkTopologyInformation().getNetworkTopologyIdentifier() == null;
+ private void trySetResponseMessage(GenericConfigurationTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ if (!responseObject.getMessage().isEmpty()) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ }
+ }
}
+ @Override
+ public Future<RpcResult<Void>> genericConfigurationNotification(GenericConfigurationNotificationInput input) {
+
+ final String svcOperation = "generic-configuration-notification";
+ ServiceData serviceData;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ GenericConfigurationNotificationInputBuilder inputBuilder = new GenericConfigurationNotificationInputBuilder(
+ input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+ GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ }
+
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
+
+ if (failed(responseObject)) {
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ try {
+ saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ }
+
+ RpcResult<Void> rpcResult = RpcResultBuilder.<Void>status(true).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ try {
+ serviceData = serviceDataBuilder.build();
+
+ // service object
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceData(serviceData);
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ RpcResult<Void> rpcResult = RpcResultBuilder.<Void>status(true).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Update succeeded
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+
+ RpcResult<Void> rpcResult = RpcResultBuilder.<Void>status(true).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ @Override
+ public Future<RpcResult<GetpathsegmentTopologyOperationOutput>> getpathsegmentTopologyOperation(
+ GetpathsegmentTopologyOperationInput input) {
+
+ final String svcOperation = "getpathsegment-topology-operation";
+ ServiceData serviceData;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+ // create a new response object
+ GetpathsegmentTopologyOperationOutputBuilder responseBuilder = new GetpathsegmentTopologyOperationOutputBuilder();
+
+ if (hasInvalidService(input)) {
+ log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+ responseBuilder.setAckFinalIndicator("Y");
+
+ RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ trySetSvcRequestId(input, responseBuilder);
+
+ if (hasInvalidOnapModelInformation(input)) {
+ log.debug("exiting {} because no model-uuid provided", svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage("invalid input, no model-uuid provided");
+ responseBuilder.setAckFinalIndicator("Y");
+ RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ GetpathsegmentTopologyOperationInputBuilder inputBuilder = new GetpathsegmentTopologyOperationInputBuilder(
+ input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+ GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String serviceObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ }
+
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
+
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ try {
+ saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ }
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ try {
+ serviceData = serviceDataBuilder.build();
+ log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+ // service object
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceData(serviceData);
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+ serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+ responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ responseBuilder.setResponseCode("500");
+ responseBuilder.setResponseMessage(e.getMessage());
+ responseBuilder.setAckFinalIndicator("Y");
+ RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Update succeeded
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+ trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<GetpathsegmentTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<GetpathsegmentTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ private boolean hasInvalidService(GetpathsegmentTopologyOperationInput input) {
+ return input == null || input.getServiceInformation() == null
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ }
+
+ private void trySetSvcRequestId(GetpathsegmentTopologyOperationInput input,
+ GetpathsegmentTopologyOperationOutputBuilder responseBuilder) {
+ if (input.getSdncRequestHeader() != null) {
+ responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+ }
+ }
+
+ private boolean hasInvalidOnapModelInformation(GetpathsegmentTopologyOperationInput input) {
+ return input.getServiceInformation() == null || input.getServiceInformation().getOnapModelInformation() == null
+ || input.getServiceInformation().getOnapModelInformation().getModelUuid() == null;
+ }
+
+ private void trySetResponseMessage(GetpathsegmentTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ if (!responseObject.getMessage().isEmpty()) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ }
+ }
+ }
+
+ @Override
+ public Future<RpcResult<PolicyUpdateNotifyOperationOutput>> policyUpdateNotifyOperation(
+ PolicyUpdateNotifyOperationInput input) {
+
+ final String svcOperation = "policy-update-notify-operation";
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+
+ // create a new response object
+ PolicyUpdateNotifyOperationOutputBuilder responseBuilder = new PolicyUpdateNotifyOperationOutputBuilder();
+
+ // Make sure we have a valid input
+ if (hasInvalidInput(input)) {
+ log.debug("exiting {} because policy name, update type, or version id was not provided", svcOperation);
+ responseBuilder.setErrorCode("404");
+ responseBuilder.setErrorMsg("Invalid input, missing input data");
+ RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+ .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ log.info("Adding INPUT data for {} input: {}", svcOperation, input);
+ PolicyUpdateNotifyOperationInputBuilder inputBuilder = new PolicyUpdateNotifyOperationInputBuilder(input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ // Call SLI sync method
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String serviceObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, parms, responseObject);
+
+ if (respProps != null) {
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ serviceObjectPath = respProps.getProperty(SERVICE_OBJECT_PATH_PARAM);
+ }
+
+ if (failed(responseObject)) {
+ responseBuilder.setErrorCode(responseObject.getStatusCode());
+ responseBuilder.setErrorMsg(responseObject.getMessage());
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, "policy update", responseBuilder.build());
+
+ RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+ .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ responseBuilder.setErrorCode(responseObject.getStatusCode());
+ if (responseObject.getMessage() != null) {
+ responseBuilder.setErrorMsg(responseObject.getMessage());
+ }
+ log.info("Returned SUCCESS for " + svcOperation + responseBuilder.build());
+ RpcResult<PolicyUpdateNotifyOperationOutput> rpcResult = RpcResultBuilder
+ .<PolicyUpdateNotifyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ // return success
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ private boolean hasInvalidInput(PolicyUpdateNotifyOperationInput input) {
+ return (input.getPolicyName() == null) || (input.getUpdateType() == null) || (input.getVersionId() == null);
+ }
+
+ @Override
+ public Future<RpcResult<PortMirrorTopologyOperationOutput>> portMirrorTopologyOperation(
+ final PortMirrorTopologyOperationInput input) {
+
+ final String svcOperation = "port-mirror-topology-operation";
+ ServiceData serviceData = null;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties properties = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+
+ // create a new response object
+ PortMirrorTopologyOperationOutputBuilder responseBuilder = new PortMirrorTopologyOperationOutputBuilder();
+
+ if (hasInvalidService(input)) {
+ log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage(NULL_OR_EMPTY_ERROR_PARAM);
+ responseBuilder.setAckFinalIndicator("Y");
+ RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ // return error
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ if (hasInvalidConfigurationId(input)) {
+ log.debug("exiting {} because of null or empty configuration-id", svcOperation);
+ responseBuilder.setResponseCode("404");
+ responseBuilder.setResponseMessage("invalid input, null or empty configuration-id");
+ responseBuilder.setAckFinalIndicator("Y");
+ RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ trySetSvcRequestId(input, responseBuilder);
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ PortMirrorTopologyOperationInputBuilder inputBuilder = new PortMirrorTopologyOperationInputBuilder(input);
+ GenericResourceApiUtil.toProperties(properties, inputBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+ GenericResourceApiUtil.toProperties(properties, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String serviceObjectPath = null;
+ String portMirrorObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, properties, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ serviceObjectPath = respProps.getProperty("service-object-path");
+ portMirrorObjectPath = respProps.getProperty("port-mirror-object-path");
+ }
+
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
+
+ if (failed(responseObject)) {
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ try {
+ saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ }
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ // return error
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ try {
+ serviceData = serviceDataBuilder.build();
+ log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+ // service object
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceData(serviceData);
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+ if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
+ // Only update operational tree on activate or delete
+ if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+ log.info(UPDATING_TREE_INFO_MESSAGE);
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+ }
+ }
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+ serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+ responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+ PortMirrorResponseInformationBuilder portMirrorResponseInformationBuilder = new PortMirrorResponseInformationBuilder();
+ portMirrorResponseInformationBuilder
+ .setInstanceId(input.getConfigurationInformation().getConfigurationId());
+ portMirrorResponseInformationBuilder.setObjectPath(portMirrorObjectPath);
+ responseBuilder.setPortMirrorResponseInformation(portMirrorResponseInformationBuilder.build());
+
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ responseBuilder.setResponseCode("500");
+ responseBuilder.setResponseMessage(e.getMessage());
+ responseBuilder.setAckFinalIndicator("Y");
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+ RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Update succeeded
+ responseBuilder.setResponseCode(responseObject.getStatusCode());
+ responseBuilder.setAckFinalIndicator(ackFinal);
+ trySetResponseMessage(responseBuilder, responseObject);
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ RpcResult<PortMirrorTopologyOperationOutput> rpcResult = RpcResultBuilder
+ .<PortMirrorTopologyOperationOutput>status(true).withResult(responseBuilder.build()).build();
+
+ if (ackFinal.equals("N")) {
+ // Spawn background thread to invoke the Async DG
+ Runnable backgroundThread = new Runnable() {
+ public void run() {
+ log.info(BACKGROUND_THREAD_STARTED_MESSAGE);
+ processAsyncPortMirrorTopologyOperation(input);
+ }
+ };
+ new Thread(backgroundThread).start();
+ }
+
+ // return success
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ private boolean hasInvalidService(PortMirrorTopologyOperationInput input) {
+ return input == null || input.getServiceInformation() == null
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ }
+
+ private boolean hasInvalidConfigurationId(PortMirrorTopologyOperationInput input) {
+ return input.getConfigurationInformation() == null
+ || input.getConfigurationInformation().getConfigurationId() == null
+ || input.getConfigurationInformation().getConfigurationId().length() == 0;
+ }
+
+ private void trySetSvcRequestId(PortMirrorTopologyOperationInput input,
+ PortMirrorTopologyOperationOutputBuilder responseBuilder) {
+ if (input.getSdncRequestHeader() != null) {
+ responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+ }
+ }
+
+ private void trySetResponseMessage(PortMirrorTopologyOperationOutputBuilder responseBuilder,
+ ResponseObject responseObject) {
+ if (responseObject.getMessage() != null) {
+ if (!responseObject.getMessage().isEmpty()) {
+ responseBuilder.setResponseMessage(responseObject.getMessage());
+ }
+ }
+ }
+
+ public void processAsyncPortMirrorTopologyOperation(PortMirrorTopologyOperationInput input) {
+ log.info(BACKGROUND_THREAD_INFO, input.getConfigurationInformation().getConfigurationId());
+
+ final String svcOperation = "port-mirror-topology-operation-async";
+ ServiceData serviceData = null;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ PortMirrorTopologyOperationInputBuilder inputBuilder = new PortMirrorTopologyOperationInputBuilder(input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+ GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String serviceObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ }
+
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
+
+ if (failed(responseObject)) {
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ try {
+ saveService(serviceBuilder.build(), true, LogicalDatastoreType.CONFIGURATION);
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ }
+
+ // return error
+ return;
+ }
+
+ // Got success from SLI
+ try {
+ serviceData = serviceDataBuilder.build();
+ log.info(UPDATING_MDSAL_INFO_MESSAGE, svcOperation, siid, serviceData);
+
+ // service object
+ ServiceBuilder serviceBuilder = new ServiceBuilder();
+ serviceBuilder.setServiceData(serviceData);
+ serviceBuilder.setServiceInstanceId(siid);
+ serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+
+ if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null) {
+ // Only update operational tree on activate or delete
+ if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign)
+ || input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate)) {
+ log.info(UPDATING_TREE_INFO_MESSAGE);
+ saveService(serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+ }
+ }
+
+ ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+ serviceResponseInformationBuilder.setInstanceId(siid);
+ serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+
+ } catch (Exception e) {
+ log.error(UPDATING_MDSAL_ERROR_MESSAGE, svcOperation, siid, e);
+ return;
+ }
+
+ // Update succeeded
+ log.info(UPDATED_MDSAL_INFO_MESSAGE, svcOperation, siid);
+
+ return;
+ }
+
+ @Override
+ public Future<RpcResult<VnfGetResourceRequestOutput>> vnfGetResourceRequest(VnfGetResourceRequestInput input) {
+
+ final String svcOperation = "vnf-get-resource-request";
+ ServiceData serviceData;
+ ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+ Properties parms = new Properties();
+
+ log.info(CALLED_STR, svcOperation);
+ // create a new response object
+ VnfGetResourceRequestOutputBuilder responseBuilder = new VnfGetResourceRequestOutputBuilder();
+
+ if (hasInvalidService(input)) {
+ log.debug(NULL_OR_EMPTY_ERROR_MESSAGE, svcOperation);
+ RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder
+ .<VnfGetResourceRequestOutput>status(true).withResult(responseBuilder.build()).build();
+ // return error
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Grab the service instance ID from the input buffer
+ String siid = input.getServiceInformation().getServiceInstanceId();
+
+ ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, serviceDataBuilder);
+
+ ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+ getServiceData(siid, operDataBuilder, LogicalDatastoreType.OPERATIONAL);
+
+ // Set the serviceStatus based on input
+ setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+ setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+ log.info(ADDING_INPUT_DATA_LOG, svcOperation, siid, input);
+ VnfGetResourceRequestInputBuilder inputBuilder = new VnfGetResourceRequestInputBuilder(input);
+ GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+ log.info(ADDING_OPERATIONAL_DATA_LOG, svcOperation, siid, operDataBuilder.build());
+ GenericResourceApiUtil.toProperties(parms, OPERATIONAL_DATA_PARAM, operDataBuilder);
+
+ // Call SLI sync method
+
+ ResponseObject responseObject = new ResponseObject("200", "");
+ String ackFinal = "Y";
+ String serviceObjectPath = null;
+ Properties respProps = tryGetProperties(svcOperation, parms, serviceDataBuilder, responseObject);
+
+ if (respProps != null) {
+ responseObject.setMessage(respProps.getProperty(ERROR_MESSAGE_PARAM));
+ responseObject.setStatusCode(respProps.getProperty(ERROR_CODE_PARAM));
+ ackFinal = respProps.getProperty(ACK_FINAL_PARAM, "Y");
+ serviceObjectPath = respProps.getProperty("service-object-path");
+ }
+
+ setServiceStatus(serviceStatusBuilder, responseObject.getStatusCode(), responseObject.getMessage(), ackFinal);
+ serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+ serviceStatusBuilder.setRpcName(svcOperation);
+
+ if (failed(responseObject)) {
+ log.error(RETURNED_FAILED_MESSAGE, svcOperation, siid, responseBuilder.build());
+ RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder
+ .<VnfGetResourceRequestOutput>status(true).withResult(responseBuilder.build()).build();
+ // return error
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ // Got success from SLI
+ log.info(RETURNED_SUCCESS_MESSAGE, svcOperation, siid, responseBuilder.build());
+
+ if (respProps != null) {
+ GenericResourceApiUtil.toBuilder(respProps, responseBuilder);
+ }
+
+ RpcResult<VnfGetResourceRequestOutput> rpcResult = RpcResultBuilder.<VnfGetResourceRequestOutput>status(true)
+ .withResult(responseBuilder.build()).build();
+
+ // return success
+ return Futures.immediateFuture(rpcResult);
+ }
+
+ private boolean hasInvalidService(VnfGetResourceRequestInput input) {
+ return input == null || input.getServiceInformation() == null
+ || input.getServiceInformation().getServiceInstanceId() == null
+ || input.getServiceInformation().getServiceInstanceId().length() == 0;
+ }
}
Code Review / sdnc / northbound.git / commitdiff