Merge "Update e2e models"

[so.git] / mso-api-handlers / mso-api-handler-infra / src / main / java / org / openecomp / mso / apihandlerinfra / E2EServiceInstances.java

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 9f028c1..9d39678 100644 (file)
--- 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;\r
                try {\r
                        db = CatalogDatabase.getInstance();\r
-                       recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getTemplateId(), action);\r
+                       recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getServiceUuid(), action);\r
                } catch (Exception e) {\r
                        msoLogger.error(MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "",\r
                                        MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);\r
@@ -487,7 +487,7 @@ public class E2EServiceInstances {
                        return response;\r
                }\r
 \r
-               String serviceInstanceType = e2eSir.getService().getParameters().getServiceType();\r
+               String serviceInstanceType = e2eSir.getService().getServiceType();\r
 \r
                String serviceId = "";\r
                RequestClient requestClient = null;\r
@@ -692,7 +692,7 @@ public class E2EServiceInstances {
                RecipeLookupResult recipeLookupResult = null;\r
                try {\r
                        db = CatalogDatabase.getInstance();\r
-                       recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getTemplateId(), action);\r
+                       recipeLookupResult = getServiceInstanceOrchestrationURI(db, e2eSir.getService().getServiceUuid(), action);\r
                } catch (Exception e) {\r
                        msoLogger.error(MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "",\r
                                        MsoLogger.ErrorCode.AvailabilityError, "Exception while communciate with Catalog DB", e);\r
@@ -742,7 +742,7 @@ public class E2EServiceInstances {
 //                     return response;\r
 //             }\r
 \r
-               String serviceInstanceType = e2eSir.getService().getParameters().getServiceType();\r
+               String serviceInstanceType = e2eSir.getService().getServiceType();\r
 \r
                String serviceId = "";\r
                RequestClient requestClient = null;\r
@@ -962,10 +962,10 @@ public class E2EServiceInstances {
                ModelInfo modelInfo = new ModelInfo();\r
 \r
                // ModelInvariantId\r
-               modelInfo.setModelInvariantId(e2eSir.getService().getServiceDefId());\r
+               modelInfo.setModelInvariantId(e2eSir.getService().getServiceInvariantUuid());\r
 \r
                // modelNameVersionId\r
-               modelInfo.setModelNameVersionId(e2eSir.getService().getTemplateId());\r
+               modelInfo.setModelNameVersionId(e2eSir.getService().getServiceUuid());\r
 \r
                // String modelInfoValue =\r
                // e2eSir.getService().getParameters().getNodeTemplateName();\r
@@ -991,12 +991,7 @@ public class E2EServiceInstances {
                SubscriberInfo subscriberInfo = new SubscriberInfo();\r
 \r
                // globalsubscriberId\r
-               subscriberInfo.setGlobalSubscriberId(e2eSir.getService()\r
-                               .getParameters().getGlobalSubscriberId());\r
-\r
-               // subscriberName\r
-               subscriberInfo.setSubscriberName(e2eSir.getService().getParameters()\r
-                               .getSubscriberName());\r
+               subscriberInfo.setGlobalSubscriberId(e2eSir.getService().getGlobalSubscriberId());\r
 \r
                // setting subscriberInfo to requestDetails\r
                requestDetails.setSubscriberInfo(subscriberInfo);\r