AT&T 1712 and 1802 release code

This is code from AT&T's 1712 and 1802 releases.

Change-Id: Ie1e85851e94bc66c4d9514a0226c221939531a04
Issue-ID: SO-425
Signed-off-by: Rob Daugherty <rd472p@att.com>

3 files changed, 192 insertions, 0 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/AsdcDmaapClientTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/AsdcDmaapClientTest.java
new file mode 100644
index 0000000000..f62b360071
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/AsdcDmaapClientTest.java
@@ -0,0 +1,69 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.tenantisolation.dmaap.CreateEcompOperationEnvironmentBean;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class AsdcDmaapClientTest {
+	
+	private final String fileLocation = "src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/";
+		
+	private static final String operationalEnvironmentId =  "28122015552391";
+	private static final String operationalEnvironmentName = "Operational Environment Name";
+	private static final String operationalEnvironmentType = "ECOMP";
+	private static final String tenantContext = "TEST";
+	private static final String workloadContext = "ECOMP_E2E-IST";
+	private static final String action = "Create" ;	
+	
+
+	
+	@Test
+	public void verifyasdcCreateoeRequest() throws IOException, ParseException{
+		
+		ObjectMapper mapper = new ObjectMapper();
+	
+		String expected = "{\"operationalEnvironmentId\":\"28122015552391\",\"operationalEnvironmentName\":\"Operational Environment Name\",\"operationalEnvironmentType\":\"ECOMP\",\"tenantContext\":\"TEST\",\"workloadContext\":\"ECOMP_E2E-IST\",\"action\":\"Create\"}";
+	
+		
+		CreateEcompOperationEnvironmentBean cBean = new CreateEcompOperationEnvironmentBean();
+		cBean.setOperationalEnvironmentId(operationalEnvironmentId);
+		cBean.setoperationalEnvironmentName(operationalEnvironmentName);
+		cBean.setoperationalEnvironmentType(operationalEnvironmentType);
+		cBean.settenantContext(tenantContext);
+		cBean.setworkloadContext(workloadContext);
+		cBean.setaction(action);
+		
+		String actual = mapper.writeValueAsString(cBean);
+		
+		assertEquals("payloads are equal", expected, actual);
+	}
+	
+	
+	
+}
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java
new file mode 100644
index 0000000000..539b1816bd
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/DmaapOperationalEnvClientTest.java
@@ -0,0 +1,68 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.spy;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+import java.text.ParseException;
+
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.tenantisolation.dmaap.CreateEcompOperationEnvironmentBean;
+import org.openecomp.mso.apihandlerinfra.tenantisolation.dmaap.DmaapOperationalEnvClient;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+public class DmaapOperationalEnvClientTest {
+	
+	private final String fileLocation = "src/test/resources/org/openecomp/mso/client/asdc/create-ecompoe/";
+	private static final String operationalEnvironmentId = "28122015552391";
+	private static final String operationalEnvironmentName = "OpEnv-name";
+	private static final String operationalEnvironmentType = "VNF";
+	private static final String tenantContext = "Test";
+	private static final String workloadContext = "VNF_E2E-IST";
+	private static final String action = "Create";
+	
+	
+	@Test
+	public void verifyCreateEcompOperationEnvironmentRequest() throws IOException, ParseException{
+		String content = this.getJson("ecomp-openv-request.json");
+		ObjectMapper mapper = new ObjectMapper();
+		CreateEcompOperationEnvironmentBean expected = mapper.readValue(content, CreateEcompOperationEnvironmentBean.class);
+		DmaapOperationalEnvClient client = new DmaapOperationalEnvClient();
+		DmaapOperationalEnvClient spy = spy(client);
+		
+		String actual = spy.buildRequest(operationalEnvironmentId, operationalEnvironmentName, operationalEnvironmentType, 
+				tenantContext, workloadContext, action);
+		
+		assertEquals("payloads are equal", mapper.writeValueAsString(expected), actual);
+	}
+	
+	
+	private String getJson(String filename) throws IOException {
+		return new String(Files.readAllBytes(Paths.get(fileLocation + filename)));
+	}
+	
+}
+	
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java
new file mode 100644
index 0000000000..a9763f1d39
--- /dev/null
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/tenantisolation/dmaap/OperationalEnvironmentPublisherTest.java
@@ -0,0 +1,55 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * ONAP - SO
+ * ================================================================================
+ * Copyright (C) 2017 AT&T 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.apihandlerinfra.tenantisolation.dmaap;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.openecomp.mso.apihandlerinfra.tenantisolation.dmaap.OperationalEnvironmentPublisher;
+import org.openecomp.mso.properties.MsoJavaProperties;
+import org.openecomp.mso.properties.MsoPropertiesException;
+import org.openecomp.mso.properties.MsoPropertiesFactory;
+
+public class OperationalEnvironmentPublisherTest {
+
+	private static final String APIH_INFRA_PROP = MsoJavaProperties.class.getClassLoader().getResource("mso.apihandler-infra.properties").toString().substring(5);
+	
+	@BeforeClass
+	public static void setUp() throws MsoPropertiesException {
+		MsoPropertiesFactory propertiesFactory = new MsoPropertiesFactory();
+		propertiesFactory.removeAllMsoProperties();
+		propertiesFactory.initializeMsoProperties("MSO_PROP_APIHANDLER_INFRA", APIH_INFRA_PROP);
+	}
+	
+	@Test
+	public void getProperties() throws FileNotFoundException, IOException {
+		OperationalEnvironmentPublisher publisher = new OperationalEnvironmentPublisher();
+		
+		assertEquals("m97898@mso.ecomp.att.com", publisher.getUserName());
+		assertEquals("VjR5NDcxSzA=", publisher.getPassword());
+		assertEquals("com.att.ecomp.mso.operationalEnvironmentEvent", publisher.getTopic());
+		assertEquals("https://dcae-mrtr-ftl3.ecomp.cci.att.com:3905", publisher.getHost().get());
+	}
+}