Fix instance instantiation for E2E

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

1 files changed, 173 insertions, 100 deletions

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 0ada7dd1..4a2f2f69 100644
--- a/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
+++ b/usecaseui-portal/src/app/components/e2e-creation/e2e-creation.component.html
@@ -1,5 +1,5 @@
 <!--
-    Copyright (C) 2018 CMCC, Inc. and others. All rights reserved.
+    Copyright (C) 2019 CMCC, Inc. and others. All rights reserved.
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.
@@ -13,111 +13,184 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 -->
-<h3 class="title"> Services List </h3>
-<hr>
-<div class="model">
-  <!-- 创建数据 -->
-  <button class="back" nz-button (click)="goback()"><span><i class="anticon anticon-rollback"></i></span></button>
-  <div class="creation fl">
-    <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix">
-      <h3>Base</h3>
-      <ul>
-        <li><span>Name*</span> <input nz-input [(ngModel)]="service.name"></li>
-        <li><span>Description*</span> <input nz-input [(ngModel)]="service.description"></li>
-      </ul>
-      <br>
-      <h3>Template Parameters</h3>
-      <h4>template Inputs</h4>
-      <ul>
-        <li *ngFor="let parameter of templateParameters.inputs; let i = index;">
-          <span *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'">{{parameter.name}}:</span> 
-          <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input [(ngModel)]="parameter.value">
-
-          <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: {{parameter.name}}</h5>
-          <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span>
-          <nz-select *ngIf="parameter.type === 'vf_location'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
-            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
-          </nz-select>
-          <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
-            <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
-          </nz-select> -->
-        </li>
-      </ul>
-      <h4>nestedTemplate Inputs</h4>
-      <div *ngFor="let template of templateParameters.nestedTemplates;">
-          <h4 style="font:400 14px 'Arial';color:#aaa;">templateName: {{template.name}}</h4>
-          <ul>
-            <li *ngFor="let input of template.inputs; let i = index;">
-              <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" > {{input.name}}: </span>
-              <input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input [(ngModel)]="input.value">
-
-              <h5 *ngIf="input.type === 'vf_location'" style="padding-left:10px;">id: {{input.name}}</h5>
-              <span *ngIf="input.type === 'vf_location'"> vf_location: </span>
-              <nz-select *ngIf="input.type === 'vf_location'" style="width: 165px;" [(ngModel)]="input.value" nzAllowClear >
-                <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
-              </nz-select>
-              <!-- <nz-select *ngIf="input.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="input.value" nzAllowClear >
-                <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
-              </nz-select> -->
-            </li>
-          </ul>
-      </div>
-
+<!--<h3 class="title"> Services List </h3>-->
+<div class="model creation-model">
+  
+    <div class="top-title">
+        <h3 class="title fl">{{createParams.commonParams.templateType}} Instance Creation</h3>
+        <div class="fl" style="width: 20%">
+            <button class="submit" nz-button (click)="submit()"><span>Create</span></button>
+            <button class="back" nz-button (click)="goback()">
+                <i class="anticon anticon-arrow-left" style="transform: scale(1.5)"></i>
+            </button>
+        </div>
+    </div>
+    <div class="creation fl">
+        <div *ngIf="createParams.commonParams.templateType=='E2E Service'" class="baseparms clearfix">
+            <!--2019.02.21 add-->
+            <div class="vnf-box">
+                <h3>Base</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>
+                    <li><span>COS:</span> <input nz-input [(ngModel)]="service.COS"></li>
+                    <li><span>EBS:</span> <input nz-input [(ngModel)]="service.EBS"></li>
+                    <li>
+                        <span style="vertical-align: top;margin-top: 3px;">checkbox</span>
+                        <nz-checkbox-wrapper style="width: 100%;" (nzOnChange)="log($event)">
+                            <div nz-row>
+                                <div nz-col style="margin-bottom: 10px"><label nz-checkbox nzValue="A"
+                                                                               [nzDisabled]="true">Mauris rutrum quam p
+                                </label></div>
+                                <div nz-col><label nz-checkbox nzValue="B" [ngModel]="true">fince in felis nec e
+                                </label></div>
+                            </div>
+                        </nz-checkbox-wrapper>
+                    </li>
+                </ul>
+            </div>
+            <div class="vnf-box">
+                <h3>VNF1</h3>
+                <ul class="clearfix">
+                    <li><span>Name:</span> <input nz-input></li>
+                    <li><span>Description:</span> <input nz-input></li>
+                    <li>
+                        <span style="vertical-align: top;margin-top: 3px;">radio button</span>
+                        <nz-radio-group [(ngModel)]="radioValue1" nzName="radiogroup">
+                            <label nz-radio [ngStyle]="{'margin-bottom':'10px'}" nzValue="Selected" [ngModel]="true">Selected</label>
+                            <br>
+                            <label nz-radio [ngStyle]="style" nzValue="Disaled">Disaled</label>
+                        </nz-radio-group>
+                    </li>
+                    <li>
+                        <span>pull down:</span>
+                        <nz-select nzAllowClear [(ngModel)]="selectedValue">
+                            <nz-option nzValue="Heresanoption" nzLabel="Heresanoption"></nz-option>
+                            <nz-option nzValue="Anotheroption" nzLabel="Anotheroption"></nz-option>
+                            <nz-option nzValue="Thirdoption" nzLabel="Thirdoption"></nz-option>
+                            <nz-option nzValue="Noneoftheabove" nzLabel="Noneoftheabove"></nz-option>
+                        </nz-select>
+                    </li>
+                </ul>
+            </div>
+            <div class="vnf-box">
+                <h3>VNF2</h3>
+                <ul class="clearfix">
+                    <li><span>Name:</span> <input nz-input></li>
+                    <li><span>Description:</span> <input nz-input></li>
+                    <li>
+                        <span style="vertical-align: top;margin-top: 3px;" nzName="radiogroup2">radio button</span>
+                        <nz-radio-group [(ngModel)]="radioValue2">
+                            <label nz-radio [ngStyle]="{'margin-bottom':'10px'}" nzValue="Selected2" [ngModel]="true">Selected2</label>
+                            <br>
+                            <label nz-radio [ngStyle]="style" nzValue="Disaled2">Disaled2</label>
+                        </nz-radio-group>
+                    </li>
+                </ul>
+            </div>
+            <div class="vnf-box">
+                <h3>template Inputs</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>
+                        <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input
+                               [(ngModel)]="parameter.value">
+
+                        <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id:
+                            {{parameter.name}}</h5>
+                        <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span>
+                        <nz-select *ngIf="parameter.type === 'vf_location'" style="width: 165px;"
+                                   [(ngModel)]="parameter.value" nzAllowClear>
+                            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
+                        </nz-select>
+                        <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
+                          <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
+                        </nz-select> -->
+                    </li>
+                </ul>
+                <h4>nestedTemplate Inputs</h4>
+                <div *ngFor="let template of templateParameters.nestedTemplates;">
+                    <h4 style="font:400 14px 'Arial';color:#aaa;">templateName: {{template.name}}</h4>
+                    <ul>
+                        <li *ngFor="let input of template.inputs; let i = index;">
+                            <span *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'"> {{input.name}}: </span>
+                            <input *ngIf="input.type !== 'vf_location' && input.type !== 'sdn_controller'" nz-input
+                                   [(ngModel)]="input.value">
+
+                            <h5 *ngIf="input.type === 'vf_location'" style="padding-left:10px;">id: {{input.name}}</h5>
+                            <span *ngIf="input.type === 'vf_location'"> vf_location: </span>
+                            <nz-select *ngIf="input.type === 'vf_location'" style="width: 165px;"
+                                       [(ngModel)]="input.value"
+                                       nzAllowClear>
+                                <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim"
+                                           [nzLabel]="vim.name"></nz-option>
+                            </nz-select>
+                            <!-- <nz-select *ngIf="input.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="input.value" nzAllowClear >
+                              <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
+                            </nz-select> -->
+                        </li>
+                    </ul>
+                </div>
+            </div>
+        </div>
+
+        <div *ngIf="createParams.commonParams.templateType=='Network Service'" class="baseparms clearfix">
+            <div class="vnf-box">
+                <h3>Base</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">
+                <h3>Template Parameters</h3>
+                <h4>template Inputs</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>
+                        <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input
+                               [(ngModel)]="parameter.value">
+
+                        <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id:
+                            {{parameter.name}}</h5>
+                        <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span>
+                        <nz-select *ngIf="parameter.type === 'vf_location'" style="width: 165px;"
+                                   [(ngModel)]="parameter.value" nzAllowClear>
+                            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
+                        </nz-select>
+                        <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
+                          <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
+                        </nz-select> -->
+                    </li>
+                </ul>
+
+                <h4>vnfs Inputs</h4>
+
+                <ul>
+                    <li *ngFor="let vnf of nsTemplateParameters.vnfs;">
+                        <h5 style="padding-left:10px;">id: {{vnf.vnf_id}}</h5>
+                        <span> vf_location: </span>
+                        <nz-select style="width: 165px;" [(ngModel)]="vnf.value" nzAllowClear>
+                            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
+                        </nz-select>
+                    </li>
+                </ul>
+            </div>
+        </div>
     </div>
 
-    <div *ngIf="createParams.commonParams.templateType=='Network Service'" class="baseparms clearfix">
-      <h3>Base</h3>
-      <ul>
-        <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>
-      <h3>Template Parameters</h3>
-      <h4>template Inputs</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> 
-          <input *ngIf="parameter.type !== 'vf_location' && parameter.type !== 'sdn_controller'" nz-input [(ngModel)]="parameter.value">
-
-          <h5 *ngIf="parameter.type === 'vf_location'" style="padding-left:10px;">id: {{parameter.name}}</h5>
-          <span *ngIf="parameter.type === 'vf_location'"> vf_location: </span>
-          <nz-select *ngIf="parameter.type === 'vf_location'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
-            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
-          </nz-select>
-          <!-- <nz-select *ngIf="parameter.type === 'sdn_controller'" style="width: 165px;" [(ngModel)]="parameter.value" nzAllowClear >
-            <nz-option *ngFor="let control of sdnControllers" [nzValue]="control" [nzLabel]="control.name"></nz-option>
-          </nz-select> -->
-        </li>
-      </ul>
+    <!-- chart -->
+    <div class="chart fr">
+        <div id="createChart">
+            <svg width="100%" height="100%">
 
-      <h4>vnfs Inputs</h4>
+                <image xlink:href="./assets/images/cloud-site.png"
+                       x="25%" y="30%" width="50%"/>
 
-      <ul>
-        <li *ngFor="let vnf of nsTemplateParameters.vnfs;">
-          <h5 style="padding-left:10px;">id: {{vnf.vnf_id}}</h5>
-          <span> vf_location: </span>
-          <nz-select style="width: 165px;" [(ngModel)]="vnf.value" nzAllowClear >
-            <nz-option *ngFor="let vim of vimInfos" [nzValue]="vim" [nzLabel]="vim.name"></nz-option>
-          </nz-select>
-        </li>
-      </ul>
+            </svg>
 
+        </div>
     </div>
-    <button class="submit" nz-button [nzType]="'primary'" (click)="submit()"><span>Create</span></button>
-  </div>
-
-  <!-- 图 -->
-  <div class="chart fr">
-      Create Service
-      <div id="createChart">
-        <svg width="100%" height="100%">
-         
-          <image xlink:href="./assets/images/cloud-site.png"
-                  x="25%" y="30%"  width="50%"/> 
-
-        </svg>
-
-      </div>
-  </div>
 
 </div>