From 5d6c30fdbfa3d4f15b702652c48107b413a73fff Mon Sep 17 00:00:00 2001 From: "phani.y" Date: Wed, 11 Mar 2020 17:01:13 +0530 Subject: final changes Issue-ID: USECASEUI-411 Signed-off-by: phani.y Change-Id: I8c295b112af7eef92798ee4615d13db44c5e1795 --- .../manage-service/manage-service.component.ts | 243 ++++----------------- 1 file changed, 47 insertions(+), 196 deletions(-) (limited to 'usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts') diff --git a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts index 130fbe27..098eedd2 100644 --- a/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts +++ b/usecaseui-portal/src/app/views/services/sotn-management/manage-service/manage-service.component.ts @@ -1,6 +1,6 @@ import { Component, OnInit, SimpleChanges } from '@angular/core'; import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/common/http'; - +import { baseUrl } from '../../../../datainterface'; @Component({ selector: 'app-manage-service', templateUrl: './manage-service.component.html', @@ -8,21 +8,11 @@ import { HttpClient, HttpHeaders, HttpParams, HttpResponse } from '@angular/comm }) export class ManageServiceComponent implements OnInit { - selectedSubscriptionType:string = "SOTN"; - serviceSubscriptionList:any = [{ - serviceType:"SOTN" - }]; - selectedServiceInstance:string = ""; - serviceInstanceList:any = [ - { - serviceInstance: "SiteService-5011", - serviceInstancename: "SiteService-5011" - }, - { - serviceInstance: "ISAAC-IS0333", - serviceInstancename: "ISAAC-IS0333" - } - ]; + selectedSubscriptionType: string = ""; + serviceSubscriptionList = [] as Array; + selectedServiceInstance: string = "" ; + serviceInstanceList = [] as Array; + expandDataSet = [ { rowIdx: 1, name: 'i18nTextDefine_serviceInformation', expand: true }, { rowIdx: 2, name: 'i18nTextDefine_vpnInformation', expand: true }, @@ -35,7 +25,7 @@ export class ManageServiceComponent implements OnInit { uniInfo = []; mapped: any; myKeys = [] as Array; - baseUrl:string = '/api/usecaseui-server/v1' + baseUrl = baseUrl.baseUrl constructor(private http: HttpClient) { } ngOnInit() { @@ -45,22 +35,11 @@ export class ManageServiceComponent implements OnInit { //Get SubscriptionType getSubscribeTypes() { let url = this.baseUrl + "/uui-lcm/customers/service-subscriptions"; - // this.http.get(url, {}).subscribe((data) => { - // this.serviceSubscriptionList = data.subscriptions; - // this.selectedSubscriptionType = this.serviceSubscriptionList[0].serviceType; - // this.getServiceInstanceList(this.selectedSubscriptionType); - // }, (err) => { - // console.log(err); - // }); - let data = { - "subscriptions": [ - { - "serviceType": "SOTN", - }] - } - this.serviceSubscriptionList = data.subscriptions; - this.selectedSubscriptionType = this.serviceSubscriptionList[0].serviceType; - this.getServiceInstanceList(this.selectedSubscriptionType); + this.http.get(url, {}).subscribe((data) => { + this.serviceSubscriptionList = data.subscriptions; + }, (err) => { + console.log(err); + }); } //Get subscription instanceID by calling With Subscription Type @@ -68,186 +47,58 @@ export class ManageServiceComponent implements OnInit { this.serviceInstanceList = []; this.selectedServiceInstance=""; let url = this.baseUrl + "/uui-lcm/Sotnservices/ServiceInstances/"+subscriptionType; - // this.http.get(url,{}).subscribe((data) => { - // this.serviceInstanceList = data.serviceInstanceList; - // this.selectedServiceInstance = data.serviceInstanceList[0].serviceInstance; - // this.getSubscribedSites(data.serviceInstanceList[0]); - // }, (err) => { - // console.log(err); - // }); - let data = { - "serviceInstanceList": [ - { - "serviceInstance": "ISAAC-IS02", - "serviceInstancename":"SiteService-5011" - }, - { - "serviceInstance": "ISAAC-IS03", - "serviceInstancename":"ISAAC-IS0333" - } - ] - } - this.serviceInstanceList = data.serviceInstanceList; - this.selectedServiceInstance = data.serviceInstanceList[0].serviceInstance; - this.getSubscribedSites(data.serviceInstanceList[0]); - var datas = { - "service":{ - "name":"CCVPNServiceV2-36", - "description":"CCVPNServiceV2", - "serviceInvariantUuid":"57c8a933-1364-4f85-b7a9-666d80ecc5b6", - "serviceUuid":"0734e398-a427-49f2-9abe-de8eb02542ad", - "globalSubscriberId": "{{customer}}", - "serviceType": "{{service-subscription}}", - "parameters":{ - "locationConstraints":[], - "resources":[], - "requestInputs":{ - "sotnUnderlay":[ - { - l2vpn:[ - { - "l2vpn_COS": "123", - "l2vpn_dualLink": "Yes", - "l2vpn_description": "VPN Description", - "l2vpn_name": "VPN2", - "l2vpn_tenantId": "989933", - "l2vpn_vpnType": "SOTN", - "l2vpn_cbs": "123", - "l2vpn_ebs": "23", - "l2vpn_colorAware": "true", - "l2vpn_reroute": "Yes", - "l2vpn_couplingFlag": "true", - "l2vpn_cir": "100", - "l2vpn_startTime": "28-02-2020", - "l2vpn_endTime": "21-02-2020", - "l2vpn_eir": "1000", - "l2vpn_SLS": "1234" - } - ], - "sotnUni":[ - { - "sotnuni_cVLAN": "Huawei", - "sotnuni_tpId": "Huawei-112233" - }, - { - "sotnuni_cVLAN": "Huawei-1", - "sotnuni_tpId": "Huawei1-554433" - } - ] - } - ] - } - } - } - } - this.assignData(datas, false); + this.http.get(url,{}).subscribe((data) => { + this.serviceInstanceList = data.serviceInstanceList; + }, (err) => { + console.log(err); + }); } - getSubscribedSites(selectedServiceInstance) {} - - deleteSelectedService() - { - + deleteSelectedService() { let url = this.baseUrl + "/uui-lcm/Sotnservices/servicesubscription/"+this.selectedSubscriptionType+'/serviceinstance/'+this.selectedServiceInstance; - // this.http.delete(url,{}).subscribe((data) => { - // this.serviceInstanceList = []; - // this.selectedServiceInstance = ""; - // this.getServiceInstanceList(this.selectedSubscriptionType); - // }, (err) => { - // console.log(err); - // }); + this.http.delete(url,{}).subscribe((data) => { + this.serviceInstanceList = []; + this.selectedServiceInstance = ""; + this.getServiceInstanceList(this.selectedSubscriptionType); + }, (err) => { + console.log(err); + }); } - ngOnChanges(changes: SimpleChanges) { + getSubscribedSites() { console.log("on change"); if (this.selectedServiceInstance) { - // let url = this.baseUrl + "/uui-lcm/Sotnservices/servicesubscription/"+this.selectedSubscriptionType+'/serviceinstance/'+this.selectedServiceInstance; - // this.http.get(url, {}).subscribe((data) => { - // this.assignData(data, false); - // }, (err) => { - // console.log(err); - // }); - var datas = { - "service":{ - "name":"CCVPNServiceV2-36", - "description":"CCVPNServiceV2", - "serviceInvariantUuid":"57c8a933-1364-4f85-b7a9-666d80ecc5b6", - "serviceUuid":"0734e398-a427-49f2-9abe-de8eb02542ad", - "globalSubscriberId": "{{customer}}", - "serviceType": "{{service-subscription}}", - "parameters":{ - "locationConstraints":[], - "resources":[], - "requestInputs":{ - "sotnUnderlay":[ - { - l2vpn:[ - { - "l2vpn_COS": "123", - "l2vpn_dualLink": "Yes", - "l2vpn_description": "VPN Description", - "l2vpn_name": "VPN2", - "l2vpn_tenantId": "989933", - "l2vpn_vpnType": "SOTN", - "l2vpn_cbs": "123", - "l2vpn_ebs": "23", - "l2vpn_colorAware": "true", - "l2vpn_reroute": "Yes", - "l2vpn_couplingFlag": "true", - "l2vpn_cir": "100", - "l2vpn_startTime": "28-02-2020", - "l2vpn_endTime": "21-02-2020", - "l2vpn_eir": "1000", - "l2vpn_SLS": "1234" - } - ], - "sotnUni":[ - { - "sotnuni_cVLAN": "Huawei", - "sotnuni_tpId": "Huawei-112233" - }, - { - "sotnuni_cVLAN": "Huawei-1", - "sotnuni_tpId": "Huawei1-554433" - } - ] - } - ] - } - } - } - } - this.assignData(datas, false); + let url = this.baseUrl + "/uui-lcm/Sotnservices/servicesubscription/"+this.selectedSubscriptionType+'/serviceinstance/'+this.selectedServiceInstance; + this.http.get(url, {}).subscribe((data) => { + this.assignData(data, false); + }, (err) => { + console.log(err); + }); } else { - // const httpOptions = { - // headers: new HttpHeaders({ - // 'Content-Type': 'application/json', - // }) - // }; - // let body = JSON.stringify({}); //this.orderServiceData - // let url = this.baseUrl + "/uui-lcm/Sotnservices/cost"; - // return this.http.post(url,body,httpOptions).subscribe((data) => { - // this.assignData(data, true); - // }, (err) => { - // console.log(err); - // }); + const httpOptions = { + headers: new HttpHeaders({ + 'Content-Type': 'application/json', + }) + }; + let body = JSON.stringify({}); //this.orderServiceData + + let url = this.baseUrl + "/uui-lcm/Sotnservices/cost"; + return this.http.post(url,body,httpOptions).subscribe((data) => { + this.assignData(data, true); + }, (err) => { + console.log(err); + }); } } assignData(data,isCost) { this.summaryInfo = data.service; this.mapped = JSON.parse(JSON.stringify(this.summaryInfo)); - // delete this.mapped.vpninformations; - // delete this.mapped.vpnInformations; - // if(isCost) - // { - // delete this.mapped.cost; - // this.expandDataSet[0].cost = this.summaryInfo["cost"]["serviceCost"]; - // this.expandDataSet[1].cost = this.summaryInfo["cost"]["vpnCost"]; - // } + delete this.mapped.vpninformations; + delete this.mapped.vpnInformations; this.myKeys = Object.keys(this.mapped); this.vpnInfo = this.summaryInfo["parameters"]["requestInputs"]["sotnUnderlay"][0].l2vpn[0]; this.uniInfo = this.summaryInfo["parameters"]["requestInputs"]["sotnUnderlay"][0].sotnUni; -- cgit 1.2.3-korg