diff options
author | Rob Daugherty <rd472p@att.com> | 2017-09-18 14:12:48 -0400 |
---|---|---|
committer | Rob Daugherty <rd472p@att.com> | 2017-09-18 14:13:33 -0400 |
commit | 222bcc825c740f196754c4b02a7ea6ede8ea9d91 (patch) | |
tree | 8a1fe8a9998c5c19e1c9bc4da60fbe07d7a42112 | |
parent | 1874780c2354b9eb47bcd35cae5ea439c8996039 (diff) |
SO must use AAI v11
Change-Id: If633afb9b50fa91148ae5ecad82a808389e8cf4a
Issue-id: SO-144
Signed-off-by: Rob Daugherty <rd472p@att.com>
-rw-r--r-- | attributes/default.rb | 42 | ||||
-rw-r--r-- | attributes/mso-bpmn-urn-config.rb | 42 | ||||
-rw-r--r-- | templates/default/mso-bpmn-config/mso.bpmn.urn.properties | 31 |
3 files changed, 50 insertions, 65 deletions
diff --git a/attributes/default.rb b/attributes/default.rb index 1d99254..4834bf8 100644 --- a/attributes/default.rb +++ b/attributes/default.rb @@ -114,37 +114,33 @@ node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tena ################################################################## # To specify the default A&AI version to use for all resources: -# Use: workflowGlobalDefaultAAIVersion ------------------- Example: node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8" +# Use: workflowGlobalDefaultAAIVersion ------------------- Example: node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "11" # To override the default A&AI version: -# Resource-specific: workflowDefaultAAI{Resource}Version - Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "7" -# Flow-specific: workflowCustom{SpecificFlow}AAIVersion -- Example: node.default["mso-bpmn-urn-config"]["workflowCustomCreateNetworkV1AAIVersion"] = "6" +# Resource-specific: workflowDefaultAAI{Resource}Version - Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "10" +# Flow-specific: workflowCustom{SpecificFlow}AAIVersion -- Example: node.default["mso-bpmn-urn-config"]["workflowCustomCreateNetworkV1AAIVersion"] = "9" # To specify a version+resource URI: -# Use format: workflowDefaultAAI{Version}{Resource}Uri --- Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" +# Use format: workflowDefaultAAI{Version}{Resource}Uri --- Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" # To override URI for a specific flow+resource: -# Use format: workflow{SpecificFlow}{Resource}Uri -------- Example: node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf" +# Use format: workflow{SpecificFlow}{Resource}Uri -------- Example: node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1GenericVnfUri"] = "/aai/v10/network/generic-vnfs/generic-vnf" # # Lookup order (precedence): flow+resource specific (1st) -> flow-specific version -> resource-specific version -> default version (last) ######################################################################################################################################################################################################## -node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8" +node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "11" node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAINamespace"] = "http://org.openecomp.aai.inventory/" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VpnBindingUri"] = "/aai/v8/network/vpn-bindings/vpn-binding" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VceUri"] = "/aai/v8/network/vces/vce" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8L3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CustomerUri"] = "/aai/v8/business/customers/customer" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NetworkPolicyUri"] = "/aai/v8/network/network-policies/network-policy" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8RouteTableReferenceUri"] = "/aai/v8/network/route-table-references/route-table-reference" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8TenantUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericQueryUri"] = "/aai/v8/search/generic-query" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11VpnBindingUri"] = "/aai/v11/network/vpn-bindings/vpn-binding" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11VceUri"] = "/aai/v11/network/vces/vce" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11L3NetworkUri"] = "/aai/v11/network/l3-networks/l3-network" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CustomerUri"] = "/aai/v11/business/customers/customer" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11NetworkPolicyUri"] = "/aai/v11/network/network-policies/network-policy" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11RouteTableReferenceUri"] = "/aai/v11/network/route-table-references/route-table-reference" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11TenantUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/DFW/tenants/tenant" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericQueryUri"] = "/aai/v11/search/generic-query" #note the CloudRegionURI is used for volume-groups -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NodesQueryUri"] = "/aai/v8/search/nodes-query" -#Override A&AI version for generic-vnf and cloud-region (for volume-groups) -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "9" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudRegionUriVersion"] = "9" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9CloudRegionUri"] = "/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDHVCreateServiceAAICustomerUri"] = "/aai/v9/business/customers/customer" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CloudRegionUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11NodesQueryUri"] = "/aai/v11/search/nodes-query" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CloudRegionUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace" ###################### # appc diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb index fec828a..b3a64a0 100644 --- a/attributes/mso-bpmn-urn-config.rb +++ b/attributes/mso-bpmn-urn-config.rb @@ -50,39 +50,33 @@ node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelVersi ################################################################## # To specify the default A&AI version to use for all resources: -# Use: workflowGlobalDefaultAAIVersion ------------------- Example: node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8" +# Use: workflowGlobalDefaultAAIVersion ------------------- Example: node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "11" # To override the default A&AI version: -# Resource-specific: workflowDefaultAAI{Resource}Version - Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "7" -# Flow-specific: workflowCustom{SpecificFlow}AAIVersion -- Example: node.default["mso-bpmn-urn-config"]["workflowCustomCreateNetworkV1AAIVersion"] = "6" +# Resource-specific: workflowDefaultAAI{Resource}Version - Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "10" +# Flow-specific: workflowCustom{SpecificFlow}AAIVersion -- Example: node.default["mso-bpmn-urn-config"]["workflowCustomCreateNetworkV1AAIVersion"] = "9" # To specify a version+resource URI: -# Use format: workflowDefaultAAI{Version}{Resource}Uri --- Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" +# Use format: workflowDefaultAAI{Version}{Resource}Uri --- Example: node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" # To override URI for a specific flow+resource: # Use format: workflow{SpecificFlow}{Resource}Uri -------- Example: node.default["mso-bpmn-urn-config"]["workflowCreateNetworkV1GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf" # # Lookup order (precedence): flow+resource specific (1st) -> flow-specific version -> resource-specific version -> default version (last) ######################################################################################################################################################################################################## -node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "8" +node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "11" node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAINamespace"] = "http://org.openecomp.aai.inventory/" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericVnfUri"] = "/aai/v8/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VpnBindingUri"] = "/aai/v8/network/vpn-bindings/vpn-binding" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8VceUri"] = "/aai/v8/network/vces/vce" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8L3NetworkUri"] = "/aai/v8/network/l3-networks/l3-network" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CustomerUri"] = "/aai/v8/business/customers/customer" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NetworkPolicyUri"] = "/aai/v8/network/network-policies/network-policy" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8RouteTableReferenceUri"] = "/aai/v8/network/route-table-references/route-table-reference" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8TenantUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic/AAIAIC25/tenants/tenant" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8GenericQueryUri"] = "/aai/v8/search/generic-query" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11VpnBindingUri"] = "/aai/v11/network/vpn-bindings/vpn-binding" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11VceUri"] = "/aai/v11/network/vces/vce" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11L3NetworkUri"] = "/aai/v11/network/l3-networks/l3-network" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CustomerUri"] = "/aai/v11/business/customers/customer" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11NetworkPolicyUri"] = "/aai/v11/network/network-policies/network-policy" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11RouteTableReferenceUri"] = "/aai/v11/network/route-table-references/route-table-reference" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11TenantUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace/DFW/tenants/tenant" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericQueryUri"] = "/aai/v11/search/generic-query" #note the CloudRegionURI is used for volume-groups -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8CloudRegionUri"] = "/aai/v8/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV8NodesQueryUri"] = "/aai/v8/search/nodes-query" -#Override A&AI version for generic-vnf and cloud-region (for volume-groups) -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIGenericVnfUriVersion"] = "9" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9GenericVnfUri"] = "/aai/v9/network/generic-vnfs/generic-vnf" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAICloudRegionUriVersion"] = "9" -node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV9CloudRegionUri"] = "/aai/v9/cloud-infrastructure/cloud-regions/cloud-region/att-aic" -node.default["mso-bpmn-urn-config"]["workflowDHVCreateServiceAAICustomerUri"] = "/aai/v9/business/customers/customer" - - +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CloudRegionUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11NodesQueryUri"] = "/aai/v11/search/nodes-query" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericVnfUri"] = "/aai/v11/network/generic-vnfs/generic-vnf" +node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CloudRegionUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/Rackspace" ########## # DEBUG defaults diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties index 141e4ec..0421af3 100644 --- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties +++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties @@ -108,25 +108,20 @@ mso.workflow.l3ToHigherLayerAddBonding.model.version=<%= @var["workflowL3ToHighe mso.sitename=<%= @envname %> mso.workflow.global.default.aai.version=<%= @var["workflowGlobalDefaultAAIVersion"] %> mso.workflow.global.default.aai.namespace=<%= @var["workflowGlobalDefaultAAINamespace"] %> -mso.workflow.default.aai.v8.generic-vnf.uri=<%= @var["workflowDefaultAAIV8GenericVnfUri"] %> -mso.workflow.default.aai.v8.vpn-binding.uri=<%= @var["workflowDefaultAAIV8VpnBindingUri"] %> -mso.workflow.default.aai.v8.network-policy.uri=<%= @var["workflowDefaultAAIV8NetworkPolicyUri"] %> -mso.workflow.default.aai.v8.route-table-reference.uri=<%= @var["workflowDefaultAAIV8RouteTableReferenceUri"] %> -mso.workflow.default.aai.v8.vce.uri=<%= @var["workflowDefaultAAIV8VceUri"] %> -mso.workflow.default.aai.v8.l3-network.uri=<%= @var["workflowDefaultAAIV8L3NetworkUri"] %> -mso.workflow.default.aai.v8.customer.uri=<%= @var["workflowDefaultAAIV8CustomerUri"] %> -mso.workflow.default.aai.v8.tenant.uri=<%= @var["workflowDefaultAAIV8TenantUri"] %> -mso.workflow.default.aai.v8.generic-query.uri=<%= @var["workflowDefaultAAIV8GenericQueryUri"] %> +mso.workflow.default.aai.v11.generic-vnf.uri=<%= @var["workflowDefaultAAIV11GenericVnfUri"] %> +mso.workflow.default.aai.v11.vpn-binding.uri=<%= @var["workflowDefaultAAIV11VpnBindingUri"] %> +mso.workflow.default.aai.v11.network-policy.uri=<%= @var["workflowDefaultAAIV11NetworkPolicyUri"] %> +mso.workflow.default.aai.v11.route-table-reference.uri=<%= @var["workflowDefaultAAIV11RouteTableReferenceUri"] %> +mso.workflow.default.aai.v11.vce.uri=<%= @var["workflowDefaultAAIV11VceUri"] %> +mso.workflow.default.aai.v11.l3-network.uri=<%= @var["workflowDefaultAAIV11L3NetworkUri"] %> +mso.workflow.default.aai.v11.customer.uri=<%= @var["workflowDefaultAAIV11CustomerUri"] %> +mso.workflow.default.aai.v11.tenant.uri=<%= @var["workflowDefaultAAIV11TenantUri"] %> +mso.workflow.default.aai.v11.generic-query.uri=<%= @var["workflowDefaultAAIV11GenericQueryUri"] %> #note the CloudRegionURI is used for volume-groups -mso.workflow.default.aai.v8.cloud-region.uri=<%= @var["workflowDefaultAAIV8CloudRegionUri"] %> -mso.workflow.default.aai.v8.nodes-query.uri=<%= @var["workflowDefaultAAIV8NodesQueryUri"] %> -#Override A&AI version for generic-vnf and cloud-region (for volume-groups) -mso.workflow.default.aai.generic-vnf.version=<%= @var["workflowDefaultAAIGenericVnfUriVersion"] %> -mso.workflow.default.aai.v9.generic-vnf.uri=<%= @var["workflowDefaultAAIV9GenericVnfUri"] %> -mso.workflow.default.aai.cloud-region.version=<%= @var["workflowDefaultAAICloudRegionUriVersion"] %> -mso.workflow.default.aai.v9.cloud-region.uri=<%= @var["workflowDefaultAAIV9CloudRegionUri"] %> -# DHVCreateService and its subflows need v9 for 'customer' starting in 1702 -mso.workflow.DHVCreateService.aai.customer.uri=<%= @var["workflowDHVCreateServiceAAICustomerUri"] %> +mso.workflow.default.aai.v11.cloud-region.uri=<%= @var["workflowDefaultAAIV11CloudRegionUri"] %> +mso.workflow.default.aai.v11.nodes-query.uri=<%= @var["workflowDefaultAAIV11NodesQueryUri"] %> +mso.workflow.default.aai.v11.generic-vnf.uri=<%= @var["workflowDefaultAAIV11GenericVnfUri"] %> +mso.workflow.default.aai.v11.cloud-region.uri=<%= @var["workflowDefaultAAIV11CloudRegionUri"] %> <% if @var.has_key?('aaiAuth') %> aai.auth=<%= @var["aaiAuth"] %> <% end %> |