Merge "Fix instance instantiation for CCVPN"

2 files changed, 33 insertions, 7 deletions

diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.html b/usecaseui-portal/src/app/services/services-list/services-list.component.html
index 770cda06..bb8e5140 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.html
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.html
@@ -52,16 +52,41 @@
         </div>
        <div class="select-list">
             <span style="display:inline-block;">SERVICE TYPE: </span>
-            <nz-select style="width: 176px;float: right;" [(ngModel)]="serviceTypeSelected2.name" nzAllowClear (ngModelChange)="choseTemplateType()">
+            <nz-select style="width: 176px;float: right;" [(ngModel)]="serviceTypeSelectedName" nzAllowClear>
                 <nz-option *ngFor="let item of serviceTypeList2" [nzValue]="item.name" [nzLabel]="item.name" ></nz-option>
             </nz-select>
         </div>
+		<div class="select-list">
+            <span style="display:inline-block;">Use Case: </span>
+            <nz-select style="width: 176px;float: right;" [(ngModel)]="templateTypeSelected" nzAllowClear
+                       (ngModelChange)="choseTemplateType()">
+                <!-- <nz-option *ngFor="let item of templateType" [nzValue]="item" [nzLabel]="item"></nz-option> -->
+                <nz-option nzValue="SOTN" nzLabel="SOTN"></nz-option>
+                <nz-option nzValue="CCVPN" nzLabel="CCVPN"></nz-option>
+                <nz-option nzValue="E2E Service" nzLabel="E2E Service"></nz-option>
+                <nz-option nzValue="Network Service" nzLabel="Network Service"></nz-option>
+            </nz-select>
+        </div>
   		<div class="select-list">
             <span style="display:inline-block;width:70px;">TEMPLATE: </span>
             <nz-select style="width: 176px;float: right;" [(ngModel)]="template1" nzAllowClear>
                 <nz-option *ngFor="let item of templates" [nzValue]="item" [nzLabel]="item.name"></nz-option>
             </nz-select>
         </div>
+        <div *ngIf="templateTypeSelected == 'E2E Service'">
+            <div class="select-list">
+                <span style="display:inline-block;width:70px;">Orchestrator: </span>
+                <nz-select style="width: 176px;float: right;" [(ngModel)]="orchestratorSelected" nzAllowClear>
+                    <nz-option *ngFor="let item of orchestratorList" [nzValue]="item" [nzLabel]="item.name"></nz-option>
+                </nz-select>
+            </div>
+        </div>
+        <div *ngIf="templateTypeSelected == 'E2E Service'">
+            <div class="check-box" style="margin:30px; height: 50px">
+                <input class="check-box-style" style="zoom: 1.8; width: 70px" type="checkbox" [(ngModel)]="isSol005Interface" value="true" nzAllowClear>
+                <label class="label" style="font-size: 20px; color: rgb(60,79,140,0.5)">Sol005</label>
+            </div>
+        </div>
     </nz-modal>
 </div>
 <nz-layout style=" padding: 20px 32px; ">
diff --git a/usecaseui-portal/src/app/services/services-list/services-list.component.ts b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
index 3a066746..bf1d5d00 100644
--- a/usecaseui-portal/src/app/services/services-list/services-list.component.ts
+++ b/usecaseui-portal/src/app/services/services-list/services-list.component.ts
@@ -44,7 +44,8 @@ export class ServicesListComponent implements OnInit {
   serviceTypeList2 = [];
   serviceTypeSelected = {name:null};
   serviceTypeSelected2 = {name: null};
-    templateTypeSelected =null;
+    serviceTypeSelectedName = "";
+    templateTypeSelected ="CCVPN";
   orchestratorSelected = {name:null,id:null};
   listSortMasters=JSON.parse(sessionStorage.getItem('listSortMasters'));
   language="en";
@@ -160,7 +161,7 @@ export class ServicesListComponent implements OnInit {
                     return false;
                 }
                 this.serviceTypeSelected2 = this.serviceTypeList2[0];
-                this.templateTypeSelected = this.serviceTypeList2[0].name;
+                this.serviceTypeSelectedName = this.serviceTypeSelected2.name;
                 console.log(this.serviceTypeList2);
                 this.getAlltemplates();
             })
@@ -179,10 +180,10 @@ export class ServicesListComponent implements OnInit {
   }
   //
   templates = [];
-    template1={name:null};
-    template2={name:null};
-    template3={name:null};
-    template4={name:null};
+    template1 = {name: null};
+    // template2 = {name: null};
+    // template3 = {name: null};
+    // template4 = {name: null};
 
   getAlltemplates(){  //
     this.myhttp.getAllServiceTemplates(this.templateTypeSelected)