1710 Rebase - Second Attempt

This commit rebases changes from openecomp-mso/internal-staging-1710 up to and including this codecloud commit:
54483fc6606ddb1591a2e9da61bff8712325f924
Wed Sep 6 18:12:56 2017 -0400

Rebasing was done on a branch on top of this commit in so/master in ONAP:
93fbdfbe46104f8859d4754040f979cb7997c157
Thu Sep 7 16:42:59 2017 +0000

Change-Id: I4ad9abf40da32bf5bdca43e868b8fa2dbcd9dc59
Issue-id: SO-107
Signed-off-by: Arthur Martella <amartell@research.att.com>

5 files changed, 274 insertions, 0 deletions

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java
new file mode 100644
index 0000000000..4011a8f7e7
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIPServerTest.java
@@ -0,0 +1,45 @@
+package org.openecomp.mso.client.aai;

+

+import java.io.File;

+import java.io.IOException;

+import java.security.NoSuchAlgorithmException;

+import java.util.List;

+import java.util.UUID;

+

+import org.junit.BeforeClass;

+import org.junit.Ignore;

+import org.junit.Test;

+import org.openecomp.aai.domain.yang.Pserver;

+import static org.junit.Assert.assertEquals;

+import com.fasterxml.jackson.core.JsonParseException;

+import com.fasterxml.jackson.databind.JsonMappingException;

+public class AAIPServerTest {

+

+	@BeforeClass

+	public static void setUp() {

+		System.setProperty("mso.config.path", "src/test/resources");

+		System.setProperty("javax.net.ssl.keyStore", "C:/etc/ecomp/mso/config/msoClientKeyStore.jks");

+		System.setProperty("javax.net.ssl.keyStorePassword", "mso4you");

+		System.setProperty("javax.net.ssl.trustStore", "C:/etc/ecomp/mso/config/msoTrustStore.jks");

+		System.setProperty("javax.net.ssl.trustStorePassword", "mso_Domain2.0_4you");

+	}

+	

+	@Test

+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP

+	public void pserverTest() throws JsonParseException, JsonMappingException, IOException, NoSuchAlgorithmException {

+		AAIRestClientImpl client = new AAIRestClientImpl();

+		File file = new File("src/test/resources/__files/AAI/pserver.json");

+		List<Pserver> list = client.getListOfPservers(file);

+		

+		assertEquals("", list.get(0).getHostname(), "test");

+	}

+	

+	@Test

+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP

+	public void pserverActualTest() throws JsonParseException, JsonMappingException, IOException, NoSuchAlgorithmException {

+		AAIRestClientImpl client = new AAIRestClientImpl();

+		List<Pserver> list = client.getPhysicalServerByVnfId("d946afed-8ebe-4c5d-9665-54fcc043b8e7", UUID.randomUUID().toString());

+		assertEquals("", list.size(), 0);

+	}

+

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java
new file mode 100644
index 0000000000..bf1cb076e3
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/AAIValidatorTest.java
@@ -0,0 +1,80 @@
+
+package org.openecomp.mso.client.aai;
+
+import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.when;
+
+import java.io.IOException;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.runners.MockitoJUnitRunner;
+import org.openecomp.aai.domain.yang.GenericVnf;
+import org.openecomp.aai.domain.yang.Pserver;
+
+import com.fasterxml.jackson.core.JsonParseException;
+import com.fasterxml.jackson.databind.JsonMappingException;
+
+@RunWith(MockitoJUnitRunner.class) 
+public class AAIValidatorTest {
+	
+	@Mock
+	protected AAIRestClient client;
+	String vnfName = "testVnf";
+	String uuid = "UUID";
+	AAIValidatorImpl validator;
+	
+	@Before
+	public void init(){
+		validator = new AAIValidatorImpl();
+		validator.setClient(client);
+	}
+	
+	public List<Pserver> getPservers(boolean locked){
+		Pserver pserver = new Pserver();
+		pserver.setInMaint(locked);
+		List<Pserver> pservers = new ArrayList<Pserver>();
+		pservers.add(pserver);
+		return pservers;		
+	}
+	
+	public GenericVnf createGenericVnfs(boolean locked){
+		GenericVnf genericVnf = new GenericVnf();
+		genericVnf.setInMaint(locked);
+		
+		return genericVnf;		
+	}
+
+	@Test
+	public void test_IsPhysicalServerLocked_True() throws IOException{		
+		when(client.getPhysicalServerByVnfId(vnfName,uuid)).thenReturn(getPservers(true));	
+		boolean locked = validator.isPhysicalServerLocked(vnfName, uuid);
+		assertEquals(true, locked);
+	}
+	
+	@Test
+	public void test_IsPhysicalServerLocked_False() throws JsonParseException, JsonMappingException, UnsupportedEncodingException, IOException {
+		when(client.getPhysicalServerByVnfId(vnfName,uuid)).thenReturn(getPservers(false));	
+		boolean locked = validator.isPhysicalServerLocked(vnfName, uuid);
+		assertEquals(false, locked);
+	}
+	
+	@Test
+	public void test_IsVNFLocked_False() throws Exception{
+		when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(false));	
+		boolean locked = validator.isVNFLocked(vnfName, uuid);
+		assertEquals(false, locked);
+	}
+
+	@Test
+	public void test_IsVNFLocked_True() throws Exception{
+		when(client.getVnfByName(vnfName,uuid)).thenReturn(createGenericVnfs(true));	
+		boolean locked = validator.isVNFLocked(vnfName, uuid);
+		assertEquals(true,locked );
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/EntitiesTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/EntitiesTest.java
new file mode 100644
index 0000000000..beb457497e
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/aai/EntitiesTest.java
@@ -0,0 +1,21 @@
+package org.openecomp.mso.client.aai;
+
+import org.junit.Test;
+import com.openpojo.validation.Validator;
+import com.openpojo.validation.ValidatorBuilder;
+import com.openpojo.validation.rule.impl.GetterMustExistRule;
+import com.openpojo.validation.rule.impl.SetterMustExistRule;
+import com.openpojo.validation.test.impl.GetterTester;
+import com.openpojo.validation.test.impl.SetterTester;
+
+public class EntitiesTest {
+
+	private String packageName = "org.openecomp.mso.client.aai.entities";
+
+	@Test
+	public void validate() {
+		Validator validator = ValidatorBuilder.create().with(new SetterMustExistRule(), new GetterMustExistRule())
+				.with(new SetterTester(), new GetterTester()).build();
+		validator.validate(packageName);
+	}
+}
diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
new file mode 100644
index 0000000000..3cc6b35b3a
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/appc/ApplicationControllerClientTest.java
@@ -0,0 +1,78 @@
+package org.openecomp.mso.client.appc;

+

+import static org.junit.Assert.assertEquals;

+

+import java.util.Properties;

+import java.util.UUID;

+

+import org.junit.AfterClass;

+import org.junit.BeforeClass;

+import org.junit.Ignore;

+import org.junit.Test;

+

+import org.openecomp.appc.client.lcm.model.Action;

+import org.openecomp.appc.client.lcm.model.ActionIdentifiers;

+import org.openecomp.appc.client.lcm.model.CheckLockInput;

+import org.openecomp.appc.client.lcm.model.Flags;

+import org.openecomp.appc.client.lcm.model.Status;

+

+public class ApplicationControllerClientTest {

+

+	private static ApplicationControllerClient client;

+	private static ApplicationControllerSupport support;

+

+	@BeforeClass

+	public static void beforeClass() {

+		client = new ApplicationControllerClient();

+		support = new ApplicationControllerSupport();

+		client.appCSupport = support;

+		System.setProperty("mso.config.path", "src/test/resources");

+

+	}

+

+	@AfterClass

+	public static void afterClass() throws Exception {

+		client.shutdownclient();

+	}

+

+	@Test

+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP

+	public void createRequest_CheckLock_RequestBuilt() throws Exception {

+

+		org.springframework.test.util.ReflectionTestUtils.setField(support, "lcmModelPackage",

+				"org.openecomp.appc.client.lcm.model");

+		Flags flags = new Flags();

+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

+		actionIdentifiers.setVnfId("vnfId");

+		CheckLockInput checkLockInput = (CheckLockInput) client.createRequest(Action.CheckLock, actionIdentifiers,

+				flags, null, "requestId");

+		assertEquals(checkLockInput.getAction().name(), "CheckLock");

+	}

+

+	@Test

+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP

+	public void runCommand_liveAppc() throws Exception {

+		org.springframework.test.util.ReflectionTestUtils.setField(support, "lcmModelPackage",

+				"org.openecomp.appc.client.lcm.model");

+		Flags flags = new Flags();

+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

+		actionIdentifiers.setVnfId("ca522254-2ba4-4fbd-b15b-0ef0d9cfda5f");

+

+		// CheckLockInput checkLockInput = (CheckLockInput)

+		// client.createRequest(Action.CheckLock,actionIdentifiers,flags,null,"requestId");

+		Status status = client.runCommand(Action.Lock, actionIdentifiers, flags, null, UUID.randomUUID().toString());

+		assertEquals("Status of run command is correct", status.getCode(), 306);

+	}

+

+	@Test

+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP

+	public void runCommand_CheckLock_RequestBuilt() throws Exception {

+		org.springframework.test.util.ReflectionTestUtils.setField(support, "lcmModelPackage",

+				"org.openecomp.appc.client.lcm.model");

+		Flags flags = new Flags();

+		ActionIdentifiers actionIdentifiers = new ActionIdentifiers();

+		actionIdentifiers.setVnfId("fusion-vpp-vnf-001");

+		Status status = client.runCommand(Action.CheckLock, actionIdentifiers, flags, null, "requestId");

+		assertEquals("Status of run command is correct", status.getCode(), 400);

+	}

+}

diff --git a/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java
new file mode 100644
index 0000000000..a369423ddc
--- /dev/null
+++ b/bpmn/MSOCommonBPMN/src/test/java/org/openecomp/mso/client/policy/PolicyDecisionTest.java
@@ -0,0 +1,50 @@
+package org.openecomp.mso.client.policy;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.util.Map;
+
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+public class PolicyDecisionTest {
+	
+	@BeforeClass
+	public static void setUp() {
+		System.setProperty("mso.config.path", "src/test/resources");
+	}
+	@Test
+	public void successReadProperties() throws IOException, Exception {
+		PolicyRestClient client = new PolicyRestClient();
+		Map<String, String> headerMap = client.headerMap;
+		
+		assertEquals("Found expected Client Auth", headerMap.get("ClientAuth"), "Basic bTAzNzQzOnBvbGljeVIwY2sk");
+		assertEquals("Found expected Authorization", headerMap.get("Authorization"), "Basic dGVzdHBkcDphbHBoYTEyMw==");
+		assertEquals("Found expected Environment", headerMap.get("Environment"), "TEST");
+		assertEquals("Has X-ECOMP-RequestID", headerMap.containsKey("X-ECOMP-RequestID"), true);
+	}
+	
+	@Test
+	@Ignore // IGNORED FOR 1710 MERGE TO ONAP
+	public void restEndpointCall() throws IOException, Exception {
+		PolicyRestClient client = new PolicyRestClient();
+		PolicyDecision decision = client.getDecision("X", "Y", "BB1", "1", "123");
+		assertEquals("Decision is correct", decision.getDecision(), "PERMIT");
+		assertEquals("Decision details is correct", decision.getDetails(), "Abort");
+	}
+/*
+	@Test
+	public void failure() throws IOException, Exception {
+		when(dmaapConsumer.getMRConsumer()).thenReturn(mrConsumer);
+		when(mrConsumer.fetch())
+				.thenReturn(Arrays.asList(new String[] { getJson("response.json"), getJson("output-failure.json") }));
+
+		SDNOValidatorImpl validator = new SDNOValidatorImpl();
+		thrown.expect(SDNOException.class);
+		thrown.expectMessage("my message");
+		boolean result = validator.pollForResponse(dmaapConsumer, "xyz123");
+
+	}*/
+}