[SO-21] MSO returning error to VID...

...during create service instance

1) Change CreateServiceInstance to CreateGenericALaCarteServiceInstance in the mso_catalog database
2) Add a URN property: mso.workflow.global.default.aai.namespace=http://org.openecomp.aai.inventory/
3) Add a URN property: aai.auth=2630606608347B7124C244AB0FE34F6F

Change-Id: If3a4b1eb748b7232a096d8dfc3d0f9e80bb0c6b3
Signed-off-by: Rob Daugherty <rd472p@att.com>

diff --git a/.gitreview b/.gitreview
index 241181b..9bfe241 100644 (file)
--- a/.gitreview
+++ b/.gitreview
@@ -1,4 +1,4 @@
 [gerrit]\r
 host=gerrit.onap.org\r
 port=29418\r
-project=mso/mso-config.git
\ No newline at end of file
+project=so/so-config.git\r

diff --git a/attributes/default.rb b/attributes/default.rb
index 2f42e69..1d99254 100644 (file)
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -126,6 +126,7 @@ node.default["mso-po-adapter-config"]["tenant"]["org.openecomp.mso.adapters.tena
 # 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"]["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"

diff --git a/attributes/mso-bpmn-urn-config.rb b/attributes/mso-bpmn-urn-config.rb
index d0b34dc..fec828a 100644 (file)
--- a/attributes/mso-bpmn-urn-config.rb
+++ b/attributes/mso-bpmn-urn-config.rb
@@ -13,6 +13,7 @@ node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV2vvig"] = "DefaultRecipe_sn
 node.default["mso-bpmn-urn-config"]["sniroPoliciesDHV4vvig"] = "DefaultRecipe_sniroPoliciesDHV4vvig"
 node.default["mso-bpmn-urn-config"]["catalogDbEndpoint"] = "DefaultRecipe_catalogDbEndpoint"
 node.default["mso-bpmn-urn-config"]["aaiEndpoint"] = "DefaultRecipe_sdncauth"
+node.default["mso-bpmn-urn-config"]["aaiAuth"] = "DefaultRecipe_aaiAuth"
 node.default["mso-bpmn-urn-config"]["csiNetworkstatusEndpoint"] = "DefaultRecipe_bpelauth"
 node.default["mso-bpmn-urn-config"]["adaptersCompletemsoprocessEndpoint"] = "DefaultRecipe_sdncconnecttime"
 node.default["mso-bpmn-urn-config"]["adaptersDbEndpoint"] = "DefaultRecipe_adaptersDbEndpoint"
@@ -61,6 +62,7 @@ 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"] = "8"
+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"

diff --git a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
index 5831549..141e4ec 100644 (file)
--- a/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
+++ b/templates/default/mso-bpmn-config/mso.bpmn.urn.properties
@@ -107,6 +107,7 @@ mso.workflow.l3ToHigherLayerAddBonding.model.name=<%= @var["workflowL3ToHigherLa
 mso.workflow.l3ToHigherLayerAddBonding.model.version=<%= @var["workflowL3ToHigherLayerAddBondingModelVersion"] %>
 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"] %>
@@ -128,4 +129,4 @@ mso.workflow.default.aai.v9.cloud-region.uri=<%= @var["workflowDefaultAAIV9Cloud
 mso.workflow.DHVCreateService.aai.customer.uri=<%= @var["workflowDHVCreateServiceAAICustomerUri"] %>
 <% if @var.has_key?('aaiAuth') %>
 aai.auth=<%= @var["aaiAuth"] %>
-<% end %>
\ No newline at end of file
+<% end %>