Fix instance instantiation for NS/E2E

Change-Id: I105991cefd8d65c34726fba85161adac801e5b43
Issue-ID: USECASEUI-252
Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>

diff --git a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
index 10bcba1..3f642e9 100644 (file)
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
@@ -17,9 +17,9 @@
 <div class="model creation-model">
   <!-- Create data -->
     <div class="top-title">
-        <h3 class="title fl">{{createParams.commonParams.templateType}} Instance Creation</h3>
+        <h3 class="title fl">{{createParams.commonParams.templateType}}  {{"i18nTextDefine_InstanceCreation" | translate}} </h3>
         <div class="fl" style="width: 20%">
-            <button class="submit" nz-button (click)="submit()"><span>Create</span></button>
+            <button class="submit" nz-button (click)="submit()"><span> {{"i18nTextDefine_Create" | translate}} </span></button>
             <button class="back" nz-button (click)="goback()">
                 <i class="anticon anticon-arrow-left" style="transform: scale(1.5)"></i>
             </button>
@@ -30,7 +30,7 @@
         <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix">
             <!--2019.02.21 add-->
             <div class="vnf-box">
-                <h3>Base</h3>
+                    <h3> {{"i18nTextDefine_Base" | translate}} </h3>
                 <ul class="clearfix">
                     <li><span>Name:</span> <input nz-input [(ngModel)]="service.name"></li>
                     <li><span>Description:</span> <input nz-input [(ngModel)]="service.description"></li>
@@ -39,7 +39,7 @@
                 </ul>
             </div>
             <div class="vnf-box" *ngIf="templateParameters.inputs.length>0">
-                <h3>template Inputs</h3>
+                    <h3>{{"i18nTextDefine_templateInputs" | translate}}</h3>
                 <ul>
                     <li *ngFor="let parameter of templateParameters.inputs; let i = index;">
                         <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'">{{parameter.name}}:</span>
@@ -88,14 +88,14 @@
 
         <div *ngIf="createParams.commonParams.templateType=='Network Service'" class="baseparms clearfix">
             <div class="vnf-box">
-                <h3>Base</h3>
+                    <h3> {{"i18nTextDefine_Base" | translate}} </h3>
                 <ul class="clearfix">
                     <li><span>Name:</span> <input nz-input [(ngModel)]="ns_service.nsName"></li>
                     <li><span>Description:</span> <input nz-input [(ngModel)]="ns_service.description"></li>
                 </ul>
             </div>
             <div class="vnf-box" *ngIf="nsTemplateParameters.inputs2.length>0">
-                <h4>template Inputs</h4>
+                    <h4>{{"i18nTextDefine_templateInputs" | translate}}</h4>
                 <ul>
                     <li *ngFor="let parameter of nsTemplateParameters.inputs2; let i = index;">
                         <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'">{{parameter.name}}:</span>

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 a1db49b..d5e1a3a 100644 (file)
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.ts
@@ -218,6 +218,7 @@ export class E2eCreationComponent implements OnInit {
         })
         this.service.parameters.resources.push(nsService);
       })
+           console.log(this.service)
       this.service.parameters.requestInputs['orchestrator'] = this.createParams.orchestrator.name;
       if(this.createParams.isSol005Interface){
           this.service.parameters.requestInputs['isSol005Interface'] = this.createParams.isSol005Interface;