diff options
Diffstat (limited to 'adapters/mso-adapter-utils/src/test')
3 files changed, 71 insertions, 4 deletions
diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java index 6be668c..03771e7 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/CloudConfigTest.java @@ -24,13 +24,17 @@ package org.openecomp.mso.adapter_utils.tests; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; -import org.junit.BeforeClass; + +import org.junit.Assert; +import org.junit.Before; import org.junit.Test; import java.util.Map; import org.openecomp.mso.cloud.CloudConfig; import org.openecomp.mso.cloud.CloudConfigFactory; import org.openecomp.mso.cloud.CloudIdentity; import org.openecomp.mso.cloud.CloudSite; +import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound; + /** @@ -50,9 +54,10 @@ public class CloudConfigTest { /** * This method is called before any test occurs. * It creates a fake tree from scratch + * @throws MsoCloudIdentityNotFound */ - @BeforeClass - public static final void prepare () { + @Before + public final void prepare () throws MsoCloudIdentityNotFound { ClassLoader classLoader = CloudConfigTest.class.getClassLoader(); String config = classLoader.getResource("cloud_config.json").toString().substring(5); @@ -168,5 +173,35 @@ public class CloudConfigTest { CloudIdentity identity2 = con.getIdentityService("Test"); assertNull(identity2); } + + @Test (expected = MsoCloudIdentityNotFound.class) + public final void testLoadWithWrongFile () throws MsoCloudIdentityNotFound { + ClassLoader classLoader = CloudConfigTest.class.getClassLoader(); + String config = classLoader.getResource("cloud_config_bad.json").toString().substring(5); + + cloudConfigFactory.initializeCloudConfig(config,1); + } + + @Test + public final void testReloadWithWrongFile () { + ClassLoader classLoader = CloudConfigTest.class.getClassLoader(); + String config = classLoader.getResource("cloud_config_bad.json").toString().substring(5); + + try { + cloudConfigFactory.initializeCloudConfig(config,1); + Assert.fail("MsoCloudIdentityNotFound was expected"); + } catch (MsoCloudIdentityNotFound e) { + + } + Assert.assertTrue("Should be an empty CloudConfig", cloudConfigFactory.getCloudConfig().getCloudSites().isEmpty()); + Assert.assertTrue("Should be an empty CloudConfig", cloudConfigFactory.getCloudConfig().getIdentityServices().isEmpty()); + + // Now reload the right config + config = classLoader.getResource("cloud_config.json").toString().substring(5); + cloudConfigFactory.changeMsoPropertiesFilePath(config); + cloudConfigFactory.reloadCloudConfig(); + Assert.assertTrue("Flag valid Config should be true now that the cloud_config is correct", cloudConfigFactory.getCloudConfig().isValidCloudConfig()); + + } } diff --git a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java index 3427e42..b620ddc 100644 --- a/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java +++ b/adapters/mso-adapter-utils/src/test/java/org/openecomp/mso/adapter_utils/tests/MsoHeatUtilsTest.java @@ -27,6 +27,7 @@ import org.junit.Test; import org.openecomp.mso.cloud.CloudConfigFactory; import org.openecomp.mso.openstack.exceptions.MsoAdapterException; +import org.openecomp.mso.openstack.exceptions.MsoCloudIdentityNotFound; import org.openecomp.mso.openstack.exceptions.MsoCloudSiteNotFound; import org.openecomp.mso.openstack.exceptions.MsoException; import org.openecomp.mso.openstack.exceptions.MsoIOException; @@ -49,7 +50,7 @@ public class MsoHeatUtilsTest extends MsoCommonUtils { public static MsoHeatUtils msoHeatUtils; @BeforeClass - public static final void loadClasses() { + public static final void loadClasses() throws MsoCloudIdentityNotFound { ClassLoader classLoader = CloudConfigTest.class.getClassLoader(); String config = classLoader.getResource("cloud_config.json").toString().substring(5); cloudConfigFactory.initializeCloudConfig(config, 1); diff --git a/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json b/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json new file mode 100644 index 0000000..186b6c3 --- /dev/null +++ b/adapters/mso-adapter-utils/src/test/resources/cloud_config_bad.json @@ -0,0 +1,31 @@ +{ "cloud_config": { + "identity_services": + { + "MT_KEYSTONE": + { + "identity_url": "http://localhost:5000/v2.0", + "mso_id": "john", + "mso_pass": "FD205490A48D48475607C36B9AD902BF", + "admin_tenant": "admin", + "member_role": "_member_", + "tenant_metadata": false, + "identity_server_type": "KEYSTONE", + "identity_authentication_type": "RACKSPACE_APIKEY" + } + }, + "cloud_sites": + { + "MT": + { + "region_id": "regionOne", + "clli": "MT", + "aic_version": "2.5", + "identity_service_id": "MT_KEYSTONE_NOT_EXISTING" + } + } +} +} + + + + |