1 files changed, 7 insertions, 12 deletions

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index 9f028c19f5..9d396780a2 100644
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -452,7 +452,7 @@ public class E2EServiceInstances {
 		RecipeLookupResult recipeLookupResult = null;

 		try {

 			db = CatalogDatabase.getInstance();

-			recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getTemplateId(), action);

+			recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getServiceUuid(), action);

 		} catch (Exception e) {

 			msoLogger.error(MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "",

 					MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);

@@ -487,7 +487,7 @@ public class E2EServiceInstances {
 			return response;

 		}

 

-		String serviceInstanceType = e2eSir.getService().getParameters().getServiceType();

+		String serviceInstanceType = e2eSir.getService().getServiceType();

 

 		String serviceId = "";

 		RequestClient requestClient = null;

@@ -692,7 +692,7 @@ public class E2EServiceInstances {
 		RecipeLookupResult recipeLookupResult = null;

 		try {

 			db = CatalogDatabase.getInstance();

-			recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getTemplateId(), action);

+			recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getServiceUuid(), action);

 		} catch (Exception e) {

 			msoLogger.error(MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "",

 					MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);

@@ -742,7 +742,7 @@ public class E2EServiceInstances {
 //			return response;

 //		}

 

-		String serviceInstanceType = e2eSir.getService().getParameters().getServiceType();

+		String serviceInstanceType = e2eSir.getService().getServiceType();

 

 		String serviceId = "";

 		RequestClient requestClient = null;

@@ -962,10 +962,10 @@ public class E2EServiceInstances {
 		ModelInfo modelInfo = new ModelInfo();

 

 		// ModelInvariantId

-		modelInfo.setModelInvariantId(e2eSir.getService().getServiceDefId());

+		modelInfo.setModelInvariantId(e2eSir.getService().getServiceInvariantUuid());

 

 		// modelNameVersionId

-		modelInfo.setModelNameVersionId(e2eSir.getService().getTemplateId());

+		modelInfo.setModelNameVersionId(e2eSir.getService().getServiceUuid());

 

 		// String modelInfoValue =

 		// e2eSir.getService().getParameters().getNodeTemplateName();

@@ -991,12 +991,7 @@ public class E2EServiceInstances {
 		SubscriberInfo subscriberInfo = new SubscriberInfo();

 

 		// globalsubscriberId

-		subscriberInfo.setGlobalSubscriberId(e2eSir.getService()

-				.getParameters().getGlobalSubscriberId());

-

-		// subscriberName

-		subscriberInfo.setSubscriberName(e2eSir.getService().getParameters()

-				.getSubscriberName());

+		subscriberInfo.setGlobalSubscriberId(e2eSir.getService().getGlobalSubscriberId());

 

 		// setting subscriberInfo to requestDetails

 		requestDetails.setSubscriberInfo(subscriberInfo);