Correct E2E svc to update RequestDb

IssueId: SO-205

Change-Id: Ib5f634c13c09c9f5df04d3973dd6c95684520d0b
Signed-off-by: seshukm <seshu.kumar.m@huawei.com>

1 files changed, 7 insertions, 6 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
index 7126c3aa25..98a2a11800 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
@@ -113,7 +113,8 @@ public class E2EServiceInstancesTest {
 		E2EServiceInstances instance = new E2EServiceInstances();

 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

-		assertTrue(resp.getStatus() == 202);

+		String respStr = resp.getEntity().toString();

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	 

 	@Test

@@ -177,7 +178,7 @@ public class E2EServiceInstancesTest {
 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

 		String respStr = resp.getEntity().toString();

-		assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	

 	@Test

@@ -241,7 +242,7 @@ public class E2EServiceInstancesTest {
 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

 		String respStr = resp.getEntity().toString();

-		assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	

 	@Test

@@ -293,7 +294,7 @@ public class E2EServiceInstancesTest {
 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

 		String respStr = resp.getEntity().toString();

-		assertTrue(respStr.indexOf("bpelResponse is null") != -1);

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	

 	@Test

@@ -342,7 +343,7 @@ public class E2EServiceInstancesTest {
 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

 		String respStr = resp.getEntity().toString();

-		assertTrue(respStr.indexOf("Failed calling bpmn null") != -1);

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	

 	@Test

@@ -372,7 +373,7 @@ public class E2EServiceInstancesTest {
 		String request = "{\"service\":{\"name\":\"service\",\"description\":\"so_test1\",\"serviceDefId\":\"modelInvariantId value from SDC?\",\"templateId\":\"modelVersionId value from SDC??\",\"parameters\":{\"domainHost\":\"localhost\",\"nodeTemplateName\":\"modelName:v3\",\"nodeType\":\"service\",\"globalSubscriberId\":\"NEED THIS UUI - AAI\",\"subscriberName\":\"NEED THIS UUI - AAI\",\"requestParameters\":{\"subscriptionServiceType\":\"MOG\",\"userParams\":[{\"name\":\"someUserParam\",\"value\":\"someValue\"},{\"name\":\"segments\",\"value\":\"value\"},{\"name\":\"nsParameters\",\"value\":\"othervalue\"}]}}}}";

 		Response resp = instance.createE2EServiceInstance(request, "v3");

 		String respStr = resp.getEntity().toString();

-		assertTrue(respStr.indexOf("Failed calling bpmn properties is null") != -1);

+		assertTrue(respStr.indexOf("Exception while creating record in DB null") != -1);

 	}

 	

 	@Test