summaryrefslogtreecommitdiffstats
path: root/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2018-11-14 16:27:11 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2018-11-14 16:27:58 +0800
commit946f2383255ef8c05473251213209c301bb1c9b5 (patch)
tree404ebfa795d1979f9710274c5f6cccc4d4591110 /usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
parent5ac64c3efb45812c5277d1c3728d55418d60e6ca (diff)
fix ns service instantiation for vf-c
Change-Id: I88e5e856c88859dc990a1c50b61e3c3639ba3b79 Issue-ID: USECASEUI-160 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
Diffstat (limited to 'usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts')
-rw-r--r--usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts16
1 files changed, 11 insertions, 5 deletions
diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
index 02d6229b..213df2b8 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
@@ -61,15 +61,19 @@ export class E2eCreationComponent implements OnInit {
let type = this.createParams.commonParams.templateType == "E2E Service" ? "e2e" : "ns";
this.myhttp.getTemplateParameters(type,this.createParams.template)
.subscribe((data)=>{
- console.log(this.createParams);
- console.log(data);
+ // console.log(this.createParams);
+ // console.log(data);
if(type == "e2e"){
this.templateParameters = data;
this.templateParameters.nestedTemplates.forEach((item)=>{
item.inputs = item.inputs.filter((input)=>{return input.type !== "sdn_controller"});
})
}else if(type == "ns"){
- this.nsTemplateParameters = data;
+ if(typeof data["model"]=='string'){
+ this.nsTemplateParameters = JSON.parse(data["model"]);
+ }else{
+ this.nsTemplateParameters = data;
+ }
this.nsTemplateParameters["inputs2"] = [];
let inputs = this.nsTemplateParameters.inputs;
for(let key in inputs){
@@ -139,8 +143,8 @@ export class E2eCreationComponent implements OnInit {
this.service.globalSubscriberId = this.createParams.commonParams.customer.id;
this.service.serviceType = this.createParams.commonParams.serviceType.name;
- this.templateParameters.inputs.forEach((item)=>{
- this.service.parameters.requestInputs[item.name] = item.value == undefined ? item.defaultValue : item.value;
+ this.templateParameters.inputs.forEach((ipnut)=>{
+ this.service.parameters.requestInputs[ipnut.name] = ipnut.value == undefined ? ipnut.defaultValue : ipnut.value;
})
this.templateParameters.nestedTemplates.forEach((item)=>{
@@ -164,6 +168,8 @@ export class E2eCreationComponent implements OnInit {
}
}
nsService.parameters.locationConstraints.push(location);
+ }else{
+ nsService.parameters.requestInputs[input.name] = input.value == undefined ? input.defaultValue : input.value;
}
})
this.service.parameters.resources.push(nsService);