summaryrefslogtreecommitdiffstats
path: root/openo-portal
diff options
context:
space:
mode:
authorLuji7 <lu.ji3@zte.com.cn>2016-10-27 13:38:11 +0800
committerLuji <lu.ji3@zte.com.cn>2016-10-27 06:33:35 +0000
commitfb5570d1de0928fc32f538f993fbafd8103572d2 (patch)
treefc399bee10230b030cda78f544b9757eef24753b /openo-portal
parente1d37f6e7e034768b1429ec26cbde3597b28a644 (diff)
Fix Issue#GSO-63
Change-Id: I7ebe25e26b6384482b6444c6e6272260131dee8b Signed-off-by: Luji7 <lu.ji3@zte.com.cn> (cherry picked from commit 320b831367c168e0067ba58b765d709020fee64e)
Diffstat (limited to 'openo-portal')
-rw-r--r--openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js9
1 files changed, 6 insertions, 3 deletions
diff --git a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
index fc55f3eb..1bf0fee8 100644
--- a/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
+++ b/openo-portal/portal-lifecyclemgr/src/main/webapp/lifecyclemgr/js/gsolcm.js
@@ -114,6 +114,7 @@ function fetchServiceTemplateBy(templateId) {
function(response) {
template.name = response.templateName;
template.gsarId = response.csarId;
+ template.id = response.id;
return fetchCsar(template.gsarId);
}
).then(
@@ -393,7 +394,7 @@ function createNetworkServiceInstance(template, serviceInstance, gatewayService)
if (template.serviceType === 'GSO') {
return createGsoServiceInstance(gatewayService, serviceInstance, template);
} else if (template.serviceType === 'NFVO') {
- return createNfvoServiceInstance(gatewayService, serviceInstance);
+ return createNfvoServiceInstance(gatewayService, serviceInstance, template);
} else if (template.serviceType === 'SDNO') {
return createSdnoServiceInstance(gatewayService, serviceInstance);
}
@@ -426,20 +427,22 @@ function createGsoServiceInstance(gatewayService, serviceInstance, serviceTempla
return defer;
}
-function createNfvoServiceInstance(gatewayService, serviceInstance) {
+function createNfvoServiceInstance(gatewayService, serviceInstance, template) {
var nfvoLcmNsUri = '/openoapi/nslcm/v1/ns';
+ serviceInstance.nsdId = template.id;
return createServiceInstance(gatewayService, nfvoLcmNsUri, serviceInstance);
}
function createSdnoServiceInstance(gatewayService, serviceInstance) {
var sdnoLcmNsUri = '/openoapi/sdnonslcm/v1/ns';
+ serviceInstance.nsdId = serviceInstance.serviceTemplateId;
return createServiceInstance(gatewayService, sdnoLcmNsUri, serviceInstance);
}
function createServiceInstance(gatewayService, nsUri, serviceInstance) {
var defer = $.Deferred();
var sParameter = {
- 'nsdId': serviceInstance.serviceTemplateId,
+ 'nsdId': serviceInstance.nsdId,
'nsName': serviceInstance.serviceName,
'description': serviceInstance.description,
'gatewayUri': nsUri