}\r
};\r
\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
- assertTrue(resp.getStatus() == 202);*/\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ System.out.println(instance);\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
+ assertTrue(resp.getStatus() == 202);\r
}\r
- \r
+ \r
@Test\r
public void createE2EServiceInstanceTestBpelHTTPException(){\r
new MockUp<RequestsDatabase>() {\r
}\r
};\r
\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);*/\r
+ assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);\r
}\r
\r
@Test\r
}\r
};\r
\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);*/\r
+ assertTrue(respStr.indexOf("Request Failed due to BPEL error with HTTP Status") != -1);\r
}\r
\r
@Test\r
}\r
};\r
\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("bpelResponse is null") != -1);*/\r
+ assertTrue(respStr.indexOf("bpelResponse is null") != -1);\r
}\r
\r
@Test\r
}\r
};\r
\r
- /* E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Failed calling bpmn null") != -1);*/\r
+ assertTrue(respStr.indexOf("Failed calling bpmn null") != -1);\r
}\r
\r
@Test\r
return rec;\r
}\r
};\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Failed calling bpmn properties is null") != -1);*/\r
+ assertTrue(respStr.indexOf("Failed calling bpmn properties is null") != -1);\r
}\r
\r
@Test\r
return null;\r
}\r
};\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"E2EService\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Recipe could not be retrieved from catalog DB null") != -1);*/\r
+ assertTrue(respStr.indexOf("Recipe could not be retrieved from catalog DB null") != -1);\r
}\r
\r
@Test\r
return null;\r
}\r
};\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"e2eservice\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Recipe does not exist in catalog DB") != -1);*/\r
+ assertTrue(respStr.indexOf("Recipe could not be retrieved from catalog DB ") != -1);\r
}\r
\r
@Test\r
return activeReqlist;\r
}\r
};\r
- /* E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"e2eservice\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("The existing request must finish or be cleaned up before proceeding.") != -1);*/\r
+ assertTrue(respStr.indexOf("The existing request must finish or be cleaned up before proceeding.") != -1);\r
}\r
\r
@Test\r
return Collections.EMPTY_LIST;\r
}\r
};\r
- /* E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"e2eservice\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Recipe does not exist in catalog DB") != -1);*/\r
+ assertTrue(respStr.indexOf("Recipe could not be retrieved from catalog DB ") != -1);\r
}\r
\r
@Test\r
public void createE2EServiceInstanceTestDBQueryFail(){\r
- /* E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"e2eservice\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("SVC2000") != -1);*/\r
+ assertTrue(respStr.indexOf("SVC2000") != -1);\r
}\r
\r
@Test\r
public void createE2EServiceInstanceTestForEmptyRequest(){\r
- /*E2EServiceInstances instance = new E2EServiceInstances();\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
String request = "";\r
- Response resp = instance.createE2EServiceInstance(request, "v2");\r
+ Response resp = instance.createE2EServiceInstance(request, "v3");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("Mapping of request to JSON object failed. No content to map to Object due to end of input") != -1);*/\r
+ assertTrue(respStr.indexOf("Mapping of request to JSON object failed. No content to map to Object due to end of input") != -1);\r
}\r
\r
@Test\r
public void deleteE2EServiceInstanceTestNormal(){\r
- /* E2EServiceInstances instance = new E2EServiceInstances();\r
- String request = "{\"service\":{\"name\":\"e2eservice\",\"serviceDefId\":\"37889593\",\"templateId\":\"2000039\",\"parameters\":{\"domainHost\":\"test\"}}}";\r
- Response resp = instance.deleteE2EServiceInstance(request, "v2");\r
+ E2EServiceInstances instance = new E2EServiceInstances();\r
+ 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\"}]}}}}";\r
+ Response resp = instance.deleteE2EServiceInstance(request, "v3", "12345678");\r
String respStr = resp.getEntity().toString();\r
- assertTrue(respStr.indexOf("SVC2000") != -1);*/\r
+ assertTrue(respStr.indexOf("SVC2000") != -1);\r
}\r
}\r