Merge "Create basic_cnf test leveraging onapsdk"

diff --combined src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
index d45b142,abc56e6..5036ed8
--- 1/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
--- 2/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
+++ b/src/onaptests/configuration/ubuntu16_multicloud_yaml_settings.py
@@@ -2,9 -2,6 +2,9 @@@ import sy
  from .settings import * # pylint: disable=W0614
  
  """ Specific ubuntu16 with multicloud and yaml config scenario."""
 +SERVICE_DETAILS = ("Onboarding, distribution and instantiation of a VM" +
 +                   "using à la carte and Multicloud module")
 +SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC, Multicloud"
  
  USE_MULTICLOUD = True
  # Set ONLY_INSTANTIATE to true to run an instantiation without repeating
@@@ -16,6 -13,7 +16,7 @@@ SERVICE_NAME = "ubuntu16test" # must b
  CLOUD_REGION_CLOUD_OWNER = "sdktestsOwner" # must not contain _
  CLOUD_REGION_ID = "RegionOne" # should be valid, as otherwise MultiCloud fails
  CLOUD_REGION_TYPE = "openstack"
+ CLOUD_OWNER_DEFINED_TYPE = "N/A"
  CLOUD_REGION_VERSION = "titanium_cloud"
  CLOUD_DOMAIN = "Default"
  

diff --combined src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
index 310fafc,6e04992..64c9ce3
--- 1/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
--- 2/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
@@@ -9,8 -9,6 +9,8 @@@ from .settings import * # pylint: disab
  
  # pylint: disable=bad-whitespace
  # The ONAP part
 +SERVICE_DETAILS="Onboarding, distribution and instanitation of an Ubuntu VM using à la carte"
 +SERVICE_COMPONENTS="SDC, DMAAP, AAI, SO, SDNC"
  USE_MULTICLOUD = False
  # Set ONLY_INSTANTIATE to true to run an instantiation without repeating
  # onboarding and related AAI configuration (Cloud config)
@@@ -39,6 -37,7 +39,7 @@@ VSP_NAME = "basicvm_ubuntu_vsp
  CLOUD_REGION_CLOUD_OWNER = "basicvm-cloud-owner"
  CLOUD_REGION_TYPE = "openstack"
  CLOUD_REGION_VERSION = "openstack"
+ CLOUD_OWNER_DEFINED_TYPE = "N/A"
  
  AVAILABILITY_ZONE_NAME = "basicvm-availability-zone"
  AVAILABILITY_ZONE_TYPE = "nova"