diff options
Diffstat (limited to 'common')
9 files changed, 278 insertions, 20 deletions
diff --git a/common/pom.xml b/common/pom.xml index 4d2d66a6bf..aeef257d48 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -31,12 +31,12 @@ <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-classic</artifactId> - <version>1.1.1</version> + <version>1.2.3</version> </dependency> <dependency> <groupId>ch.qos.logback</groupId> <artifactId>logback-core</artifactId> - <version>1.1.1</version> + <version>1.2.3</version> </dependency> <dependency> <groupId>org.slf4j</groupId> diff --git a/common/src/main/java/org/openecomp/mso/client/policy/RestClientSSL.java b/common/src/main/java/org/openecomp/mso/client/policy/RestClientSSL.java index 921664588a..6146fc373f 100644 --- a/common/src/main/java/org/openecomp/mso/client/policy/RestClientSSL.java +++ b/common/src/main/java/org/openecomp/mso/client/policy/RestClientSSL.java @@ -21,10 +21,12 @@ package org.openecomp.mso.client.policy; import java.io.FileInputStream; +import java.io.IOException; import java.net.URI; import java.security.NoSuchAlgorithmException; import java.security.KeyStore; import java.util.Optional; +import java.util.Properties; import java.util.UUID; import javax.net.ssl.SSLContext; @@ -38,7 +40,7 @@ import org.openecomp.mso.logger.MsoLogger; public abstract class RestClientSSL extends RestClient { public static final String SSL_KEY_STORE_KEY = "javax.net.ssl.keyStore"; - public static final String SSL_KEY_STORE_PASSWORD_KEY = "javax.net.ssl.keyStorePassword"; + public static String SSL_KEY_STORE_PASSWORD_KEY; public static final String MSO_LOAD_SSL_CLIENT_KEYSTORE_KEY = "mso.load.ssl.client.keystore"; @@ -52,9 +54,11 @@ public abstract class RestClientSSL extends RestClient { @Override protected Client getClient() { - Client client = null; + Properties keyProp = new Properties (); try { + keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("Policy.properties")); + SSL_KEY_STORE_PASSWORD_KEY=(String) keyProp.get ("ssl.key.store.password.key"); String loadSSLKeyStore = System.getProperty(RestClientSSL.MSO_LOAD_SSL_CLIENT_KEYSTORE_KEY); if(loadSSLKeyStore != null && loadSSLKeyStore.equalsIgnoreCase("true")) { KeyStore ks = getKeyStore(); @@ -67,17 +71,22 @@ public abstract class RestClientSSL extends RestClient { //Use default SSL context client = ClientBuilder.newBuilder().sslContext(SSLContext.getDefault()).build(); this.msoLogger.debug("RestClientSSL using default SSL context!"); - } catch (NoSuchAlgorithmException e) { + } catch (NoSuchAlgorithmException | IOException e) { this.msoLogger.error(MessageEnum.APIH_GENERAL_EXCEPTION, "AAI", "Client init", MsoLogger.ErrorCode.UnknownError, "could not create SSL client", e); throw new RuntimeException(e); } return client; } - private KeyStore getKeyStore() { + private KeyStore getKeyStore() throws IOException { KeyStore ks = null; + Properties keyProp = new Properties (); + + keyProp.load (Thread.currentThread ().getContextClassLoader ().getResourceAsStream ("Policy.properties")); + SSL_KEY_STORE_PASSWORD_KEY=(String) keyProp.get ("ssl.key.store.password.key"); char[] password = System.getProperty(RestClientSSL.SSL_KEY_STORE_PASSWORD_KEY).toCharArray(); FileInputStream fis = null; + try { ks = KeyStore.getInstance(KeyStore.getDefaultType()); fis = new FileInputStream(System.getProperty(RestClientSSL.SSL_KEY_STORE_KEY)); @@ -86,6 +95,7 @@ public abstract class RestClientSSL extends RestClient { catch(Exception e) { return null; } + finally { if (fis != null) { try { diff --git a/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java b/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java index 6588995308..45f2746f0b 100644 --- a/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java +++ b/common/src/main/java/org/openecomp/mso/logger/MsoLogger.java @@ -979,8 +979,7 @@ public class MsoLogger { File configFile = new File(CONFIG_FILE); String uuid = ""; BufferedReader in = null; - BufferedWriter bw = null; - try { + try{ // Verify whether instanceUUID file exist, // If yes, read the content; if not, generate the instanceUUID and // write to the file @@ -990,10 +989,11 @@ public class MsoLogger { if ((uuid = in.readLine()) == null) { // the file is empty, regenerate the file uuid = UUID.randomUUID().toString(); - FileWriter fw = new FileWriter(configFile.getAbsoluteFile()); - bw = new BufferedWriter(fw); + try(BufferedWriter bw = new BufferedWriter(new FileWriter(configFile.getAbsoluteFile()))) { bw.write(uuid); - bw.close(); + } catch (IOException e) { + LOGGER.log(Level.SEVERE, "Error trying to write UUID file", e); + } } in.close(); } else { @@ -1002,21 +1002,19 @@ public class MsoLogger { uuid = UUID.randomUUID().toString(); configFile.getParentFile().mkdirs(); configFile.createNewFile(); - FileWriter fw = new FileWriter(configFile.getAbsoluteFile()); - bw = new BufferedWriter(fw); - bw.write(uuid); - bw.close(); + try(BufferedWriter bw1 = new BufferedWriter(new FileWriter(configFile.getAbsoluteFile()))){ + bw1.write(uuid); + } catch (IOException e) { + LOGGER.log(Level.SEVERE, "Error trying to write UUID file", e); + } } } catch (IOException e) { - LOGGER.log(Level.SEVERE, "Error trying to read UUID file", e); + LOGGER.log(Level.SEVERE, "Error trying to read UUID file", e); } finally { try { if (in != null) { in.close(); } - if (bw != null) { - bw.close(); - } } catch (IOException ex) { LOGGER.log(Level.SEVERE, "Error trying to close UUID file", ex); } diff --git a/common/src/main/resources/Policy.properties b/common/src/main/resources/Policy.properties index 383aa181bb..b5b38c465b 100644 --- a/common/src/main/resources/Policy.properties +++ b/common/src/main/resources/Policy.properties @@ -3,4 +3,5 @@ CLIENT_AUTH = Basic bTAzNzQzOnBvbGljeVIwY2sk AUTHORIZATION = Basic dGVzdHBkcDphbHBoYTEyMw==
ENVIRONMENT = TEST
X_ECOMP_REQUESTID = 1234567h
-ECOMP_COMPONENT_NAME = MSO
\ No newline at end of file +ECOMP_COMPONENT_NAME = MSO
+ssl.key.store.password.key = javax.net.ssl.keyStorePassword
\ No newline at end of file diff --git a/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOperationalEnvironmentTest.java b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOperationalEnvironmentTest.java new file mode 100644 index 0000000000..f512de848c --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOperationalEnvironmentTest.java @@ -0,0 +1,55 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.client.aai.objects; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class AAIOperationalEnvironmentTest { + + AAIOperationalEnvironment aaiOE =new AAIOperationalEnvironment(); + + @Test + public void test() { + aaiOE.setOperationalEnvironmentId("operationalEnvironmentId"); + aaiOE.setOperationalEnvironmentName("operationalEnvironmentName"); + aaiOE.setOperationalEnvironmentStatus("operationalEnvironmentStatus"); + aaiOE.setOperationalEnvironmentType("operationalEnvironmentType"); + aaiOE.setResourceVersion("resourceVersion"); + aaiOE.setTenantContext("tenantContext"); + aaiOE.setWorkloadContext("workloadContext"); + assertEquals(aaiOE.getOperationalEnvironmentId(),"operationalEnvironmentId"); + assertEquals(aaiOE.getOperationalEnvironmentName(),"operationalEnvironmentName"); + assertEquals(aaiOE.getOperationalEnvironmentStatus(),"operationalEnvironmentStatus"); + assertEquals(aaiOE.getOperationalEnvironmentType(),"operationalEnvironmentType"); + assertEquals(aaiOE.getResourceVersion(),"resourceVersion"); + assertEquals(aaiOE.getTenantContext(),"tenantContext"); + assertEquals(aaiOE.getWorkloadContext(),"workloadContext"); + aaiOE.withOperationalEnvironmentId("operationalEnvironmentId"); + aaiOE.withOperationalEnvironmentName("operationalEnvironmentName"); + aaiOE.withOperationalEnvironmentStatus("operationalEnvironmentStatus"); + aaiOE.withOperationalEnvironmentType("operationalEnvironmentType"); + aaiOE.withResourceVersion("resourceVersion"); + aaiOE.withTenantContext("tenantContext"); + aaiOE.withWorkloadContext("workloadContext"); + } + +} diff --git a/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOwningEntityTest.java b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOwningEntityTest.java new file mode 100644 index 0000000000..bc2ae41dd6 --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIOwningEntityTest.java @@ -0,0 +1,40 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.client.aai.objects; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.openecomp.mso.client.aai.AAIObjectType; +import org.openecomp.mso.client.aai.entities.uri.AAIResourceUri; +import org.openecomp.mso.client.aai.entities.uri.AAIUriFactory; + +public class AAIOwningEntityTest { + AAIOwningEntity aaiOE= new AAIOwningEntity(); + @Test + public void test() { + aaiOE.setOwningEntityId("OwningEntityId"); + aaiOE.setOwningEntityName("OwningEntityName"); + assertEquals(aaiOE.getOwningEntityId(), "OwningEntityId"); + assertEquals(aaiOE.getOwningEntityName(), "OwningEntityName"); + aaiOE.withOwningEntity("OwningEntityId1", "OwningEntityName1"); + assert(aaiOE.getUri()!=null); + } +} diff --git a/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIProjectTest.java b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIProjectTest.java new file mode 100644 index 0000000000..872b17a759 --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIProjectTest.java @@ -0,0 +1,41 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.client.aai.objects; + +import static org.junit.Assert.*; + +import org.junit.Test; +import org.openecomp.mso.client.aai.AAIObjectType; +import org.openecomp.mso.client.aai.entities.uri.AAIResourceUri; +import org.openecomp.mso.client.aai.entities.uri.AAIUriFactory; + +public class AAIProjectTest { + + + @Test + public void test() { + AAIProject aaiP =new AAIProject(); + aaiP.setProjectName("projectName"); + assertEquals(aaiP.getProjectName(),"projectName"); + aaiP.withProjectName("projectName"); + assert(aaiP.getUri()!=null); + + } +} diff --git a/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIServiceInstanceTest.java b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIServiceInstanceTest.java new file mode 100644 index 0000000000..692e3bba0b --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/aai/objects/AAIServiceInstanceTest.java @@ -0,0 +1,53 @@ +/* +* ============LICENSE_START======================================================= +* ONAP : SO +* ================================================================================ +* Copyright 2018 TechMahindra +*================================================================================= +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* ============LICENSE_END========================================================= +*/ +package org.openecomp.mso.client.aai.objects; + +import static org.junit.Assert.*; + +import org.junit.Test; + +public class AAIServiceInstanceTest { + + @Test + public void test() { + AAIServiceInstance aaiSI= new AAIServiceInstance(); + aaiSI.setEnvironmentContext("environmentContext"); + aaiSI.setModelInvariantUuid("modelInvariantUuid"); + aaiSI.setModelUuid("modelUuid"); + aaiSI.setoStatus("oStatus"); + aaiSI.setServiceInstanceId("serviceInstanceId"); + aaiSI.setServiceInstanceName("serviceInstanceName"); + aaiSI.setServiceRole("serviceRole"); + aaiSI.setServiceType("serviceType"); + aaiSI.setWorkloadContext("workloadContext"); + assertEquals(aaiSI.getEnvironmentContext(), "environmentContext"); + assertEquals(aaiSI.getModelInvariantUuid(), "modelInvariantUuid"); + assertEquals(aaiSI.getModelUuid(), "modelUuid"); + assertEquals(aaiSI.getoStatus(), "oStatus"); + assertEquals(aaiSI.getServiceInstanceId(), "serviceInstanceId"); + assertEquals(aaiSI.getServiceInstanceName(), "serviceInstanceName"); + assertEquals(aaiSI.getServiceRole(), "serviceRole"); + assertEquals(aaiSI.getServiceType(), "serviceType"); + assertEquals(aaiSI.getWorkloadContext(), "workloadContext"); + aaiSI.withServiceInstance("serviceInstanceId"); + assert(aaiSI.getUri()!=null); + } + +} diff --git a/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java b/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java new file mode 100644 index 0000000000..a9bf81d2ad --- /dev/null +++ b/common/src/test/java/org/openecomp/mso/client/dmaap/DmaapPublisherTest.java @@ -0,0 +1,60 @@ +/*- + * ============LICENSE_START======================================================= + * ONAP - SO + * ================================================================================ + * Copyright (C) 2018 Huawei Intellectual Property. All rights reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ +package org.openecomp.mso.client.dmaap; + +import org.junit.Test; + +import javax.ws.rs.ProcessingException; +import java.io.IOException; +import java.util.Optional; + +public class DmaapPublisherTest { + + DmaapPublisher dmaapPublisher = new DmaapPublisher(120) { + @Override + public String getUserName() { + return "test"; + } + + @Override + public String getPassword() { + return "test"; + } + + @Override + public String getTopic() { + return "test"; + } + + @Override + public Optional<String> getHost() { + return Optional.of("http://localhost:8080"); + } + }; + + public DmaapPublisherTest() throws IOException { + } + + @Test(expected = ProcessingException.class) + public void sendTest() throws Exception { + dmaapPublisher.send("{'key': 'value'}"); + } + +}
\ No newline at end of file |