diff options
Diffstat (limited to 'usecaseui-portal/src')
5 files changed, 45 insertions, 3 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 289d1221..3d2bfc57 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 @@ -179,7 +179,10 @@ export class E2eCreationComponent implements OnInit { }) this.service.parameters.resources.push(nsService); }) - + this.service.parameters.requestInputs['orchestrator'] = this.createParams.orchestrator.name; + if(this.createParams.isSol005Interface){ + this.service.parameters.requestInputs['isSol005Interface'] = this.createParams.isSol005Interface; + } this.e2eCloseCreate.emit({service:this.service}); }else if(type == "ns"){ diff --git a/usecaseui-portal/src/app/dataInterface.ts b/usecaseui-portal/src/app/dataInterface.ts index e092bd03..7b8d529a 100644 --- a/usecaseui-portal/src/app/dataInterface.ts +++ b/usecaseui-portal/src/app/dataInterface.ts @@ -1,5 +1,5 @@ enum baseUrl{ - baseUrl = '/api/usecaseui-server/v1' //online + baseUrl = '/api/usecaseui/server/v1' //online // baseUrl = 'http://172.19.44.223/api/usecaseui-server/v1' //local one // baseUrl = 'http://10.73.191.100:8082' //local two } diff --git a/usecaseui-portal/src/app/myhttp.service.ts b/usecaseui-portal/src/app/myhttp.service.ts index 753c05f6..199c99e7 100644 --- a/usecaseui-portal/src/app/myhttp.service.ts +++ b/usecaseui-portal/src/app/myhttp.service.ts @@ -26,6 +26,7 @@ export class MyhttpService { url = { listSortMasters:this.baseUrl+"/listSortMasters", customers: this.baseUrl + "/uui-lcm/customers", + orchestrators: this.baseUrl + "/uui-lcm/orchestrators", serviceType: this.baseUrl + "/uui-lcm/customers/" + "*_*" + "/service-subscriptions", servicesTableData: this.baseUrl + '/uui-lcm/service-instances', serviceTemplates: this.baseUrl + "/uui-lcm/service-templates", @@ -67,6 +68,11 @@ export class MyhttpService { return this.http.get<any>(this.url.customers); } + // Get all Orchestrators + getAllOrchestrators() { + return this.http.get<any>(this.url.orchestrators); + } + // Get relevant serviceType getServiceTypes(customer) { let url = this.url.serviceType.replace("*_*", customer.id); 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 57e74464..4a1a44d3 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 @@ -77,6 +77,14 @@ </div> </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'||templateTypeSelected == 'Network Service'"> <div class="select-list"> <span style="display:inline-block;width:70px;">TEMPLATE: </span> @@ -85,6 +93,12 @@ </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,.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 4263c20e..0b550caa 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 @@ -34,8 +34,11 @@ export class ServicesListComponent implements OnInit { this.inputNamests(); } // customer servicetype + isSol005Interface = false; customerList = []; + orchestratorList = []; customerSelected = {name:null,id:null}; + orchestratorSelected = {name:null,id:null}; serviceTypeList = []; serviceTypeSelected = {name:null}; listSortMasters=JSON.parse(sessionStorage.getItem('listSortMasters')); @@ -74,6 +77,18 @@ export class ServicesListComponent implements OnInit { }) } + getallOrchestrators(){ + this.myhttp.getAllOrchestrators() + .subscribe((data)=>{ + this.orchestratorList = data.map((item)=>{return {name:item["name"],id:item["name"]}}); + if(this.orchestratorList.length==0){ + console.log("orchestratorList.length == 0",this.orchestratorList); + return false; + } + this.orchestratorSelected = this.orchestratorList[0]; + }) + } + choseCustomer(item){ this.customerSelected = item; this.myhttp.getServiceTypes(this.customerSelected) @@ -88,6 +103,7 @@ export class ServicesListComponent implements OnInit { // console.log(this.listServiceTypes); }) } + choseServiceType(item){ this.serviceTypeSelected = item; this.getTableData(); @@ -98,11 +114,13 @@ export class ServicesListComponent implements OnInit { isVisible = false; createModal(): void { this.isVisible = true; + this.getallOrchestrators(); this.getAlltemplates(); } // templateTypeSelected = "SOTN"; choseTemplateType(){ + this.getallOrchestrators(); this.getAlltemplates(); } // @@ -153,7 +171,7 @@ export class ServicesListComponent implements OnInit { this.createshow = true; this.listDisplay = true; }else if(this.templateTypeSelected=="E2E Service"||this.templateTypeSelected=="Network Service"){ - this.createData = {commonParams:{customer:this.customerSelected, serviceType:this.serviceTypeSelected, templateType:this.templateTypeSelected},template:this.template4}; + this.createData = {commonParams:{customer:this.customerSelected, serviceType:this.serviceTypeSelected, templateType:this.templateTypeSelected},template:this.template4, orchestrator:this.orchestratorSelected, isSol005Interface:this.isSol005Interface}; this.createshow2 = true; this.listDisplay = true; } @@ -440,6 +458,7 @@ export class ServicesListComponent implements OnInit { this.detailshow2 = true; } this.listDisplay = true; + this.detailshow = true; this.detailData = service; console.log(service); } |