AAI for CCVPN support new versionDublin_dev

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa60000000
Issue-ID: SO-683
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

2 files changed, 29 insertions, 27 deletions

diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb
index ed8f0d9..aa8bfd5 100644
--- a/attributes/mso-bpmn-urn-config.rb
+++ b/attributes/mso-bpmn-urn-config.rb
@@ -67,22 +67,23 @@ node.default["mso-bpmn-urn-config"]["workflowL3ToHigherLayerAddBondingModelVersi
 #
 # Lookup order (precedence): flow+resource specific (1st) -> flow-specific version -> resource-specific version -> default version (last)
 ########################################################################################################################################################################################################
-node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "11"
+node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAIVersion"] = "14"
 node.default["mso-bpmn-urn-config"]["workflowGlobalDefaultAAINamespace"] = "http://org.openecomp.aai.inventory/"
-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/CloudOwner/DFW/tenants/tenant"
-node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11GenericQueryUri"] = "/aai/v11/search/generic-query"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14GenericVnfUri"] = "/aai/v14/network/generic-vnfs/generic-vnf"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14VpnBindingUri"] = "/aai/v14/network/vpn-bindings/vpn-binding"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14VceUri"] = "/aai/v14/network/vces/vce"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14L3NetworkUri"] = "/aai/v14/network/l3-networks/l3-network"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14CustomerUri"] = "/aai/v14/business/customers/customer"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14NetworkPolicyUri"] = "/aai/v14/network/network-policies/network-policy"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14RouteTableReferenceUri"] = "/aai/v14/network/route-table-references/route-table-reference"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14TenantUri"] = "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner/DFW/tenants/tenant"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14GenericQueryUri"] = "/aai/v14/search/generic-query"
 #note the CloudRegionURI is used for volume-groups
-node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV11CloudRegionUri"] = "/aai/v11/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner"
-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/CloudOwner"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14CloudRegionUri"] = "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14NodesQueryUri"] = "/aai/v14/search/nodes-query"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14GenericVnfUri"] = "/aai/v14/network/generic-vnfs/generic-vnf"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14CloudRegionUri"] = "/aai/v14/cloud-infrastructure/cloud-regions/cloud-region/CloudOwner"
+node.default["mso-bpmn-urn-config"]["workflowDefaultAAIV14SPPartnerUri"] = "/aai/v14/business/sp-partners/sp-partner"
 
 ##########
 # 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 5102434..1b5199e 100644
--- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
+++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
@@ -139,20 +139,21 @@ 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.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"] %>
+mso.workflow.default.aai.v14.generic-vnf.uri=<%= @var["workflowDefaultAAIV14GenericVnfUri"] %>
+mso.workflow.default.aai.v14.vpn-binding.uri=<%= @var["workflowDefaultAAIV14VpnBindingUri"] %>
+mso.workflow.default.aai.v14.network-policy.uri=<%= @var["workflowDefaultAAIV14NetworkPolicyUri"] %>
+mso.workflow.default.aai.v14.route-table-reference.uri=<%= @var["workflowDefaultAAIV14RouteTableReferenceUri"] %>
+mso.workflow.default.aai.v14.vce.uri=<%= @var["workflowDefaultAAIV14VceUri"] %>
+mso.workflow.default.aai.v14.l3-network.uri=<%= @var["workflowDefaultAAIV14L3NetworkUri"] %>
+mso.workflow.default.aai.v14.customer.uri=<%= @var["workflowDefaultAAIV14CustomerUri"] %>
+mso.workflow.default.aai.v14.tenant.uri=<%= @var["workflowDefaultAAIV14TenantUri"] %>
+mso.workflow.default.aai.v14.generic-query.uri=<%= @var["workflowDefaultAAIV14GenericQueryUri"] %>
 #note the CloudRegionURI is used for volume-groups
-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"] %>
+mso.workflow.default.aai.v14.cloud-region.uri=<%= @var["workflowDefaultAAIV14CloudRegionUri"] %>
+mso.workflow.default.aai.v14.nodes-query.uri=<%= @var["workflowDefaultAAIV14NodesQueryUri"] %>
+mso.workflow.default.aai.v14.generic-vnf.uri=<%= @var["workflowDefaultAAIV14GenericVnfUri"] %>
+mso.workflow.default.aai.v14.cloud-region.uri=<%= @var["workflowDefaultAAIV14CloudRegionUri"] %>
+mso.workflow.default.aai.v14.sp-partner.uri=<%= @var["workflowDefaultAAIV14SPPartnerUri"] %>
 <% if @var.has_key?('aaiAuth') %>
 aai.auth=<%= @var["aaiAuth"] %>
 <% end %>