\r
import static org.junit.Assert.assertEquals;\r
import static org.junit.Assert.assertFalse;\r
-import static org.junit.Assert.assertTrue;\r
\r
+import java.io.File;\r
import java.io.FileInputStream;\r
import java.io.IOException;\r
import java.util.List;\r
\r
import org.eclipse.jetty.util.security.Password;\r
import org.junit.Test;\r
-import org.onap.aai.modelloader.config.ModelLoaderConfig;\r
import org.onap.aai.modelloader.restclient.AaiRestClient;\r
import org.openecomp.sdc.utils.ArtifactTypeEnum;\r
\r
+/**\r
+ * Tests for ModelLoaderConfig class\r
+ *\r
+ */\r
public class ModelLoaderConfigTest {\r
\r
@Test\r
public void testYangModelArtifactType() {\r
Properties props = new Properties();\r
- props.setProperty("ml.distribution.ARTIFACT_TYPES",\r
- "MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG");\r
+ props.setProperty("ml.distribution.ARTIFACT_TYPES", "MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG");\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
\r
List<String> types = config.getRelevantArtifactTypes();\r
\r
System.out.println("ArtifactType: " + types.get(0));\r
- assertEquals(0,\r
- types.get(0).compareToIgnoreCase(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.toString()));\r
+ assertEquals(0, types.get(0).compareToIgnoreCase(ArtifactTypeEnum.MODEL_INVENTORY_PROFILE.toString()));\r
\r
System.out.println("ArtifactType: " + types.get(1));\r
assertEquals(0, types.get(1).compareToIgnoreCase(ArtifactTypeEnum.MODEL_QUERY_SPEC.toString()));\r
\r
assertEquals(3, types.size());\r
}\r
-\r
+ \r
@Test\r
- public void testDecryptPassword() {\r
+ public void testMsgBusAddrs() {\r
Properties props = new Properties();\r
- String testPass = "youshallnotpass";\r
- String encryptedTestPass = Password.obfuscate(testPass);\r
-\r
- System.out.println("Encrypt " + testPass + " ==> " + encryptedTestPass);\r
-\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_PASSWORD, encryptedTestPass);\r
+ props.setProperty("ml.distribution.MSG_BUS_ADDRESSES", "host1.onap.com:3904,host2.onap.com:3904");\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
\r
- assertEquals(testPass, config.getPassword());\r
- }\r
-\r
- @Test\r
- public void testDecryptKeystorePassword() {\r
- Properties props = new Properties();\r
- String testPass = "youshallnotpass";\r
- String encryptedTestPass = Password.obfuscate(testPass);\r
-\r
- System.out.println("Encrypt " + testPass + " ==> " + encryptedTestPass);\r
-\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD, encryptedTestPass);\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
+ List<String> addrs = config.getMsgBusAddress();\r
\r
- assertEquals(testPass, config.getKeyStorePassword());\r
+ assertEquals(2, addrs.size());\r
+ assertEquals(0, addrs.get(0).compareToIgnoreCase("host1.onap.com:3904"));\r
+ assertEquals(0, addrs.get(1).compareToIgnoreCase("host2.onap.com:3904"));\r
}\r
\r
@Test\r
- public void testDecryptAAIPassword() {\r
- Properties props = new Properties();\r
- String testPassword = "myvoiceismypassword";\r
- String encryptedTestPassword = Password.obfuscate(testPassword);\r
-\r
- props.put(ModelLoaderConfig.PROP_AAI_AUTHENTICATION_PASSWORD, encryptedTestPassword);\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
-\r
- assertEquals(testPassword, config.getAaiAuthenticationPassword());\r
+ public void testDecryptPassword() {\r
+ String password = "youshallnotpass";\r
+ ModelLoaderConfig config =\r
+ createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_PASSWORD, password);\r
+ assertEquals(password, config.getPassword());\r
}\r
\r
@Test\r
- public void testNoAAIAuth() throws IOException {\r
- Properties props = new Properties();\r
- props.load(\r
- new FileInputStream("src/test/resources/model-loader-empty-auth-password.properties"));\r
-\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- AaiRestClient aaiClient = new AaiRestClient(config);\r
-\r
- assertFalse("Empty AAI Password should result in no basic authentication",\r
- aaiClient.useBasicAuth());\r
-\r
- props.load(new FileInputStream("src/test/resources/model-loader-no-auth-password.properties"));\r
- config = new ModelLoaderConfig(props, null);\r
- aaiClient = new AaiRestClient(config);\r
-\r
- assertFalse("No AAI Password should result in no basic authentication",\r
- aaiClient.useBasicAuth());\r
+ public void testDecryptKeystorePassword() {\r
+ String password = "youshallnotpass";\r
+ ModelLoaderConfig config =\r
+ createObfuscatedTestConfig(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_PASSWORD, password);\r
+ assertEquals(password, config.getKeyStorePassword());\r
}\r
\r
@Test\r
- public void testGetUrls() {\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_AAI_MODEL_RESOURCE_URL, "/aai/v*/service-design-and-creation/models/model/");\r
- props.put(ModelLoaderConfig.PROP_AAI_NAMED_QUERY_RESOURCE_URL,\r
- "/aai/v*/service-design-and-creation/named-queries/named-query/");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
-\r
- assertEquals("/aai/v9/service-design-and-creation/models/model/", config.getAaiModelUrl("v9"));\r
- assertEquals("/aai/v10/service-design-and-creation/named-queries/named-query/",\r
- config.getAaiNamedQueryUrl("v10"));\r
+ public void testDecryptAAIAuthenticationPassword() {\r
+ String password = "myvoiceismypassword";\r
+ ModelLoaderConfig config =\r
+ createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_AUTHENTICATION_PASSWORD, password);\r
+ assertEquals(password, config.getAaiAuthenticationPassword());\r
}\r
\r
@Test\r
- public void testActivateServerTLSAuth(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH, "true");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- boolean authValue = config.activateServerTLSAuth();\r
- assertTrue(authValue);\r
-\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_ACTIVE_SERVER_TLS_AUTH, "");\r
- ModelLoaderConfig config1 = new ModelLoaderConfig(props, null);\r
- boolean authValue1 = config.activateServerTLSAuth();\r
- assertFalse(authValue1);\r
+ public void testDecryptAAIKeystorePassword() {\r
+ String password = "myvoiceismypassword";\r
+ ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_AAI_KEYSTORE_PASSWORD, password);\r
+ assertEquals(password, config.getAaiKeyStorePassword());\r
}\r
\r
@Test\r
- public void testGetAsdcAddress(){\r
+ public void testAaiBaseUrl() {\r
+ String url = "http://localhost:1234/";\r
Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_ASDC_ADDRESS, "address-1");\r
+ props.put(ModelLoaderConfig.PROP_AAI_BASE_URL, url);\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- String asdcAddr = config.getAsdcAddress();\r
- assertEquals(asdcAddr, "address-1");\r
+ assertEquals(url, config.getAaiBaseUrl());\r
}\r
\r
@Test\r
- public void testGetConsumerGroup(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_CONSUMER_GROUP, "group-1");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- String ret = config.getConsumerGroup();\r
- assertEquals(ret, "group-1");\r
+ public void testDecryptBabelKeystorePassword() {\r
+ String password = "babelpassword";\r
+ ModelLoaderConfig config = createObfuscatedTestConfig(ModelLoaderConfig.PROP_BABEL_KEYSTORE_PASSWORD, password);\r
+ assertEquals(password, config.getBabelKeyStorePassword());\r
}\r
\r
@Test\r
- public void testGetConsumerID(){\r
+ public void testBabelKeystorePath() {\r
+ String root = "path_to_keystore";\r
+ String path = "relative_keystore_path";\r
Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_CONSUMER_ID, "id-1");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- String ret = config.getConsumerID();\r
- assertEquals(ret, "id-1");\r
+ props.put(ModelLoaderConfig.PROP_BABEL_KEYSTORE_FILE, path);\r
+ ModelLoaderConfig config = new ModelLoaderConfig(props, root);\r
+ assertEquals(root + File.separator + path, config.getBabelKeyStorePath());\r
}\r
\r
@Test\r
- public void testGetEnvironmentName(){\r
+ public void testBabelBaseUrl() {\r
+ String url = "http://localhost/";\r
Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_ENVIRONMENT_NAME, "local");\r
+ props.put(ModelLoaderConfig.PROP_BABEL_BASE_URL, url);\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- String ret = config.getEnvironmentName();\r
- assertEquals(ret, "local");\r
+ assertEquals(url, config.getBabelBaseUrl());\r
}\r
\r
@Test\r
- public void testGetKeyStorePath(){\r
+ public void testBabelGenerateArtifactsUrl() {\r
+ String url = "/path/to/the/resource";\r
Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_KEYSTORE_FILE, "keystore-file");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, "local/");\r
- String ret = config.getKeyStorePath();\r
- assertEquals(ret, "local/keystore-file");\r
- }\r
-\r
- @Test\r
- public void testGetPollingInterval(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_POLLING_INTERVAL, "60");\r
+ props.put(ModelLoaderConfig.PROP_BABEL_GENERATE_RESOURCE_URL, url);\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- int ret = config.getPollingInterval();\r
- assertTrue(ret == 60);\r
+ assertEquals(url, config.getBabelGenerateArtifactsUrl());\r
}\r
\r
@Test\r
- public void testGetPollingTimeout(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_POLLING_TIMEOUT, "30");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- int ret = config.getPollingTimeout();\r
- assertTrue(ret == 30);\r
- }\r
+ public void testNoAAIAuth() throws IOException {\r
\r
- @Test\r
- public void testGetUser(){\r
Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_USER, "user-1");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- String ret = config.getUser();\r
- assertEquals(ret, "user-1");\r
- }\r
+ props.load(new FileInputStream("src/test/resources/model-loader-empty-auth-password.properties"));\r
\r
- @Test\r
- public void testIsFilterInEmptyResources(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_POLLING_TIMEOUT, "30");\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- Boolean ret = config.isFilterInEmptyResources();\r
- assertFalse(ret);\r
- }\r
+ AaiRestClient aaiClient = new AaiRestClient(config);\r
\r
- @Test\r
- public void testIsUseHttpsWithDmaap(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_ML_DISTRIBUTION_HTTPS_WITH_DMAAP, "true");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- Boolean ret = config.isUseHttpsWithDmaap();\r
- assertTrue(ret);\r
- }\r
+ assertFalse("Empty AAI Password should result in no basic authentication", aaiClient.useBasicAuth());\r
\r
- @Test\r
- public void testGetAaiKeyStorePath(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_AAI_KEYSTORE_FILE, "keystore-file");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, "local");\r
- String ret = config.getAaiKeyStorePath();\r
- assertEquals(ret, "local/keystore-file");\r
+ props.load(new FileInputStream("src/test/resources/model-loader-no-auth-password.properties"));\r
+ config = new ModelLoaderConfig(props, null);\r
+ aaiClient = new AaiRestClient(config);\r
+\r
+ assertFalse("No AAI Password should result in no basic authentication", aaiClient.useBasicAuth());\r
}\r
\r
@Test\r
- public void testGetAaiKeyStorePassword(){\r
+ public void testGetUrls() {\r
Properties props = new Properties();\r
- String testPass = "youshallnotpass";\r
- String encryptedTestPass = Password.obfuscate(testPass);\r
-\r
- props.put(ModelLoaderConfig.PROP_AAI_KEYSTORE_PASSWORD, encryptedTestPass);\r
+ props.put(ModelLoaderConfig.PROP_AAI_MODEL_RESOURCE_URL, "/aai/v*/service-design-and-creation/models/model/");\r
+ props.put(ModelLoaderConfig.PROP_AAI_NAMED_QUERY_RESOURCE_URL,\r
+ "/aai/v*/service-design-and-creation/named-queries/named-query/");\r
ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
\r
- assertEquals(testPass, config.getAaiKeyStorePassword());\r
+ assertEquals("/aai/v9/service-design-and-creation/models/model/", config.getAaiModelUrl("v9"));\r
+ assertEquals("/aai/v10/service-design-and-creation/named-queries/named-query/",\r
+ config.getAaiNamedQueryUrl("v10"));\r
}\r
\r
- @Test\r
- public void testGetIngestSimulatorEnabled(){\r
- Properties props = new Properties();\r
- props.put(ModelLoaderConfig.PROP_DEBUG_INGEST_SIMULATOR, "enabled");\r
- ModelLoaderConfig config = new ModelLoaderConfig(props, null);\r
- boolean ret = config.getIngestSimulatorEnabled();\r
- assertTrue(ret);\r
\r
- props.put(ModelLoaderConfig.PROP_DEBUG_INGEST_SIMULATOR, "disabled");\r
- ModelLoaderConfig config1 = new ModelLoaderConfig(props, null);\r
- boolean ret1 = config.getIngestSimulatorEnabled();\r
- assertFalse(ret1);\r
+ /**\r
+ * @param propertyName\r
+ * @param propertyValue\r
+ * @return a new ModelLoaderConfig object containing a single obfuscated property value\r
+ */\r
+ private ModelLoaderConfig createObfuscatedTestConfig(String propertyName, String propertyValue) {\r
+ Properties props = new Properties();\r
+ props.put(propertyName, Password.obfuscate(propertyValue));\r
+ return new ModelLoaderConfig(props, null);\r
}\r
}\r
Code Review / aai / model-loader.git / blobdiff