"Locked instance - This service (testService) already has a request being worked with a status of null (RequestId - null). The existing request must finish or be cleaned up before proceeding."));\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void createServiceInstanceTestDBException(){\r
new MockUp<RequestsDatabase>() {\r
+ "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\",\"instanceName\": \"testService\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\": \"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
Response resp = instance.createServiceInstance(requestJson, "v2");\r
String respBody = resp.getEntity().toString();\r
- assertTrue(respBody.contains("Exception while creating record in DB null"));\r
+ assertTrue(respBody.contains("Exception while creating record in DB") && respBody.contains("NullPointerException"));\r
}\r
\r
@Ignore // 1802 merge\r
+ "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\",\"instanceName\": \"testService\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\": \"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
Response resp = instance.createServiceInstance(requestJson, "v2");\r
String respBody = resp.getEntity().toString();\r
- assertTrue(respBody.contains("Failed calling bpmn properties"));\r
+ assertTrue(respBody.contains("Failed calling bpmn properties")); // was: Request Failed due to BPEL error\r
}\r
\r
- @Ignore // 1802 merge\r
@Test(expected = Exception.class)\r
public void createServiceInstanceTest200Http(){\r
new MockUp<RequestsDatabase>() {\r
ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);\r
HttpResponse resp = new BasicHttpResponse(pv,200, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
- String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r
String respBody = resp.getEntity().toString();\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void createServiceInstanceTest500Http(){\r
new MockUp<RequestsDatabase>() {\r
ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);\r
HttpResponse resp = new BasicHttpResponse(pv,500, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
- String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r
ProtocolVersion pv = new ProtocolVersion("HTTP",1,1);\r
HttpResponse resp = new BasicHttpResponse(pv,500, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
- String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r
assertTrue(respBody.contains("No valid modelVersionId is specified"));\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void createServiceInstanceTestNullHttpResp(){\r
new MockUp<RequestsDatabase>() {\r
+"\"networkInstanceId\":\"1882937\","\r
+"\"volumeGroupInstanceId\":\"1882935\","\r
+"\"vfModuleInstanceId\":\"1882934\","\r
- + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": false},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\"}}}";\r
+ + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": false,\"subscriptionServiceType\":\"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\"}}}";\r
Response resp = instance.createServiceInstance(requestJson, "v2");\r
String respBody = resp.getEntity().toString();\r
assertTrue(respBody.contains("Error parsing request.") && respBody.contains("No valid modelName is specified"));\r
+"\"networkInstanceId\":\"1882937\","\r
+"\"volumeGroupInstanceId\":\"1882935\","\r
+"\"vfModuleInstanceId\":\"1882934\","\r
- + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": true},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
+ + "\"requestDetails\": {\"requestInfo\": { \"source\": \"VID\", \"requestorId\": \"zz9999\"},\"requestParameters\": { \"autoBuildVfModules\": true,\"subscriptionServiceType\":\"test\"},\"modelInfo\":{\"modelInvariantId\": \"557ea944-c83e-43cf-9ed7-3a354abd6d34\",\"modelVersion\":\"v2\",\"modelType\":\"service\",\"modelName\":\"serviceModel\"}}}";\r
Response resp = instance.createServiceInstance(requestJson, "v2");\r
String respBody = resp.getEntity().toString();\r
assertTrue(respBody.contains("Error parsing request.") && respBody.contains("AutoBuildVfModule is not valid in the v2 version"));\r
assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid serviceInstanceId matching the serviceInstanceId in request URI is specified"));\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void activateServiceInstanceTestNormal(){\r
ServiceInstances instance = new ServiceInstances();\r
assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid serviceInstanceId matching the serviceInstanceId in request URI is specified"));\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void deactivateServiceInstanceTestNormal(){\r
ServiceInstances instance = new ServiceInstances();\r
assertTrue(respStr.contains("Error parsing request.") && respStr.contains("No valid modelVersionId is specified"));\r
}\r
\r
- @Ignore // 1802 merge\r
@Test\r
public void deleteServiceInstanceTestNormal(){\r
ServiceInstances instance = new ServiceInstances();\r
HttpResponse resp = new BasicHttpResponse(pv,200, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
\r
- final String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ final String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r
}\r
\r
/*** Replace Vnf Instance Test Cases ***/\r
- @Ignore\r
@Test\r
public void replaceVNFInstanceTestNormal(){\r
ServiceInstances instance = new ServiceInstances();\r
\r
/*** Update Vnf Instance Test Cases ***/\r
\r
- @Ignore\r
@Test\r
public void deleteVNFInstanceTestNormal(){\r
ServiceInstances instance = new ServiceInstances();\r
HttpResponse resp = new BasicHttpResponse(pv,200, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
\r
- final String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ final String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r
HttpResponse resp = new BasicHttpResponse(pv,200, "test response");\r
BasicHttpEntity entity = new BasicHttpEntity();\r
\r
- final String body = "{\"response\":\"success\",\"message\":\"success\"}";\r
+ final String body = "{\"content\":\"success\",\"message\":\"success\"}";\r
InputStream instream = new ByteArrayInputStream(body.getBytes());\r
entity.setContent(instream);\r
resp.setEntity(entity);\r