X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=mso-api-handlers%2Fmso-api-handler-infra%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fapihandlerinfra%2Ftenantisolation%2FTenantIsolationRequestTest.java;fp=mso-api-handlers%2Fmso-api-handler-infra%2Fsrc%2Ftest%2Fjava%2Forg%2Fonap%2Fso%2Fapihandlerinfra%2Ftenantisolation%2FTenantIsolationRequestTest.java;h=d983d1eca838142d3d8b329bf7a9bcc2216b17ce;hb=f47919f1fe367b612fa9c96d34c59f01a541e882;hp=426be984867de3daf7a83d06e9516e5005dde506;hpb=54452b80a1cf4d22ef750bc1377f8c1b05431d57;p=so.git

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java
index 426be98486..d983d1eca8 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/TenantIsolationRequestTest.java
@@ -22,11 +22,9 @@ package org.onap.so.apihandlerinfra.tenantisolation;
 
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
-
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.HashMap;
-
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -34,110 +32,116 @@ import org.onap.so.apihandlerinfra.BaseTest;
 import org.onap.so.apihandlerinfra.tenantisolationbeans.Action;
 import org.onap.so.exceptions.ValidationException;
 import org.springframework.test.context.ActiveProfiles;
-
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-public class TenantIsolationRequestTest extends BaseTest{
+public class TenantIsolationRequestTest extends BaseTest {
+
+    @Rule
+    public ExpectedException expectedException = ExpectedException.none();
+
+    @Test
+    public void testParseCloudResourceECOMP() throws Exception {
+        try {
+            String requestJSON = new String(Files.readAllBytes(
+                    Paths.get("src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json")));
+            ObjectMapper mapper = new ObjectMapper();
+            HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+            CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+            TenantIsolationRequest request = new TenantIsolationRequest("1234");
+            request.parse(cor, instanceIdMap, Action.create);
+            assertNotNull(request.getRequestId());
+        } catch (ValidationException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testParseCloudResourceVNF() throws Exception {
+        try {
+            String requestJSON = new String(Files
+                    .readAllBytes(Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json")));
+            ObjectMapper mapper = new ObjectMapper();
+            HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+            CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+            TenantIsolationRequest request = new TenantIsolationRequest("1234");
+            request.parse(cor, instanceIdMap, Action.create);
+            assertNotNull(request.getRequestId());
+        } catch (ValidationException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testParseCloudResourceVNFInvalid() throws Exception {
+        expectedException.expect(ValidationException.class);
+
+        String requestJSON = new String(Files.readAllBytes(
+                Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreateInvalid.json")));
+        ObjectMapper mapper = new ObjectMapper();
+        HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+        CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+        TenantIsolationRequest request = new TenantIsolationRequest("1234");
+        request.parse(cor, instanceIdMap, Action.create);
+        assertNotNull(request.getRequestId());
+    }
+
+    @Test
+    public void testParseActivateCloudResource() throws Exception {
+        try {
+            String requestJSON = new String(Files
+                    .readAllBytes(Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironment.json")));
+            ObjectMapper mapper = new ObjectMapper();
+            HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+            CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+            TenantIsolationRequest request = new TenantIsolationRequest("1234");
+            request.parse(cor, instanceIdMap, Action.activate);
+            assertNotNull(request.getRequestId());
+        } catch (ValidationException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testParseActivateCloudResourceInvalid() throws Exception {
+        expectedException.expect(ValidationException.class);
+
+        String requestJSON = new String(Files.readAllBytes(
+                Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironmentInvalid.json")));
+        ObjectMapper mapper = new ObjectMapper();
+        HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+        CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+        TenantIsolationRequest request = new TenantIsolationRequest("1234");
+        request.parse(cor, instanceIdMap, Action.activate);
+        assertNotNull(request.getRequestId());
+    }
+
+    @Test
+    public void testParseDeactivateCloudResource() throws Exception {
+        try {
+            String requestJSON = new String(Files
+                    .readAllBytes(Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json")));
+            ObjectMapper mapper = new ObjectMapper();
+            HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+            CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+            TenantIsolationRequest request = new TenantIsolationRequest("1234");
+            request.parse(cor, instanceIdMap, Action.deactivate);
+            assertNotNull(request.getRequestId());
+        } catch (ValidationException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    @Test
+    public void testParseDeactivateCloudResourceInvalid() throws Exception {
+        expectedException.expect(ValidationException.class);
 
-	@Rule
-	public ExpectedException expectedException = ExpectedException.none();
-	
-	@Test
-	public void testParseCloudResourceECOMP() throws Exception{
-		try {
-			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ECOMPOperationEnvironmentCreate.json")));
-			ObjectMapper mapper = new ObjectMapper();
-			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-			request.parse(cor, instanceIdMap, Action.create);
-			assertNotNull(request.getRequestId());
-		} catch(ValidationException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void testParseCloudResourceVNF() throws Exception{
-		try {
-			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreate.json")));
-			ObjectMapper mapper = new ObjectMapper();
-			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-			request.parse(cor, instanceIdMap, Action.create);
-			assertNotNull(request.getRequestId());
-		} catch(ValidationException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void testParseCloudResourceVNFInvalid() throws Exception {
-		expectedException.expect(ValidationException.class);
-		
-		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/VNFOperationEnvironmentCreateInvalid.json")));
-		ObjectMapper mapper = new ObjectMapper();
-		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-		request.parse(cor, instanceIdMap, Action.create);
-		assertNotNull(request.getRequestId());
-	}
-	
-	@Test
-	public void testParseActivateCloudResource() throws Exception{
-		try {
-			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironment.json")));
-			ObjectMapper mapper = new ObjectMapper();
-			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-			request.parse(cor, instanceIdMap, Action.activate);
-			assertNotNull(request.getRequestId());
-		} catch(ValidationException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void testParseActivateCloudResourceInvalid() throws Exception{
-		expectedException.expect(ValidationException.class);
-		
-		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/ActivateOperationEnvironmentInvalid.json")));
-		ObjectMapper mapper = new ObjectMapper();
-		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-		request.parse(cor, instanceIdMap, Action.activate);
-		assertNotNull(request.getRequestId());
-	}
-	
-	@Test
-	public void testParseDeactivateCloudResource() throws Exception{
-		try {
-			String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironment.json")));
-			ObjectMapper mapper = new ObjectMapper();
-			HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-			CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-			TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-			request.parse(cor, instanceIdMap, Action.deactivate);
-			assertNotNull(request.getRequestId());
-		} catch(ValidationException e) {
-			fail(e.getMessage());
-		}
-	}
-	
-	@Test
-	public void testParseDeactivateCloudResourceInvalid() throws Exception{
-		expectedException.expect(ValidationException.class);
-		
-		String requestJSON = new String(Files.readAllBytes(Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironmentInvalid.json")));
-		ObjectMapper mapper = new ObjectMapper();
-		HashMap<String, String> instanceIdMap = new HashMap<String,String>();
-		CloudOrchestrationRequest cor  = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
-		TenantIsolationRequest request = new TenantIsolationRequest ("1234");
-		request.parse(cor, instanceIdMap, Action.deactivate);
-		assertNotNull(request.getRequestId());
-	}
+        String requestJSON = new String(Files.readAllBytes(
+                Paths.get("src/test/resources/TenantIsolation/DeactivateOperationEnvironmentInvalid.json")));
+        ObjectMapper mapper = new ObjectMapper();
+        HashMap<String, String> instanceIdMap = new HashMap<String, String>();
+        CloudOrchestrationRequest cor = mapper.readValue(requestJSON, CloudOrchestrationRequest.class);
+        TenantIsolationRequest request = new TenantIsolationRequest("1234");
+        request.parse(cor, instanceIdMap, Action.deactivate);
+        assertNotNull(request.getRequestId());
+    }
 }