From 53266fd0f2709e2f1a3d87b073d317e0579fa1f0 Mon Sep 17 00:00:00 2001 From: zhangab Date: Wed, 14 Nov 2018 15:20:05 +0800 Subject: Modify the display of the list Change-Id: Idd8fd9f4bc4f6c972690e3a8c99200afb1c259e0 Issue-ID: USECASEUI-159 Signed-off-by: zhangab --- usecaseui-portal/src/app/onboard.service.ts | 101 +++++---------------- .../onboard-vnf-vm/onboard-vnf-vm.component.html | 87 ++++-------------- .../onboard-vnf-vm/onboard-vnf-vm.component.ts | 75 +++++++-------- 3 files changed, 72 insertions(+), 191 deletions(-) (limited to 'usecaseui-portal') diff --git a/usecaseui-portal/src/app/onboard.service.ts b/usecaseui-portal/src/app/onboard.service.ts index 017bf9fb..dfcd12f8 100644 --- a/usecaseui-portal/src/app/onboard.service.ts +++ b/usecaseui-portal/src/app/onboard.service.ts @@ -50,6 +50,7 @@ export class onboardService { //--------------------------------------------------------------------------------------- /* line up 线上*/ baseUrl = "/api/usecaseui-server/v1/uui-lcm/"; + // baseUrlUp = "/api/usecaseui/server/v1/"; url = { // 数据列表Data onboardTableData: this.baseUrl + "ns-packages", @@ -74,7 +75,6 @@ export class onboardService { deleteVnfPack: this.baseUrl + "deleteVnfPackage?vnfPkgId=", // Delete Pnf package deletePnfPack: this.baseUrl + "deletePnfPackage?pnfPkgId=", - // // download ns package // downloadNsData: this.baseUrl + "downLoadNsPackage?nsdInfoId=XXXXX", // //download vnf package @@ -82,30 +82,30 @@ export class onboardService { } - //-----------------------------------Function-local-start------------------------------------------------------ - /* Query data list */ + //-----------------------------------Function-start------------------------------------------------------ + /* 查询数据列表 */ // NS Data getOnboardTableData() { - return this.http.get(this.url.onboardTableData); - // return this.http.get(this.url["onboardTableData"]); + // return this.http.get(this.url.onboardTableData); + return this.http.get(this.url["onboardTableData"]); } // NS SDC Data getSDC_NSTableData(){ - return this.http.get(this.url.sdc_nsListData); - // return this.http.get(this.url["onboardTableData"]); + // return this.http.get(this.url.sdc_nsListData); + return this.http.get(this.url["sdc_nsListData"]); } // VNF Data getOnboardTableVnfData() { - return this.http.get(this.url.onboardDataVNF); + return this.http.get(this.url.onboardDataVNF); } // onboard VNF sdc Data getSDC_VNFTableData() { - return this.http.get(this.url["sdc_vnfListData"]); + return this.http.get(this.url["sdc_vnfListData"]); } - + // PNF Data getOnboardTablePnfData() { - return this.http.get(this.url.onboardDataPNF); + return this.http.get(this.url.onboardDataPNF); } //------------------------------------------------------------------------------------- @@ -131,86 +131,27 @@ export class onboardService { //-------------------------------------------------------------------------- // Delete ns vfc package - deleteNsIdData(paramsObj): Observable> { + deleteNsIdData(paramsObj) { // local test - let params = new HttpParams({ fromObject: paramsObj }); - console.log(11111, params) - return this.http.get(this.url.deleteNspack, { observe: 'response', params }); - + // return this.http.get(this.url.deleteNspack); // Online test - // return this.http.delete(this.url["deleteNspack"] + paramsObj); + return this.http.delete(this.url["deleteNspack"] + paramsObj); } - // delete ns sdc package - // deleteNssdcData(){ - // return this.http.get(this.url.deleteNssdcData); //Local simulation - // // return this.http.delete(this.url.deleteNssdcData + id); - // } // Delete Vnf vfc package - deleteVnfIdData(paramsObj): Observable> { - let params = new HttpParams({ fromObject: paramsObj }); - console.log(11111, params) - return this.http.get(this.url.deleteVnfPack, { observe: 'response', params }); + deleteVnfIdData(paramsObj) { + // return this.http.get(this.url.deleteVnfPack); //online test - // return this.http.delete(this.url["deleteVnfpack"] + paramsObj); + return this.http.delete(this.url["deleteVnfpack"] + paramsObj); } - // Delete Vnf sdc package - // deleteVnfsdcData(){ - // return this.http.get(this.url.deleteVnfsdcData); - // } - // Delete Pnf package - deletePnfIdData(paramsObj): Observable> { - let params = new HttpParams({ fromObject: paramsObj }); - console.log(11111, params) - return this.http.get(this.url.deletePnfPack, { observe: 'response', params }); + deletePnfIdData(paramsObj){ + //Local test + // return this.http.get(this.url.deletePnfPack); //online test - // return this.http.delete(this.url["deletePnfpack"] + paramsObj); + return this.http.delete(this.url["deletePnfpack"] + paramsObj); } - //-----------------------------------------Function-local-end------------------------------------- - - - // download nspak - // downloadNsData(paramsObj): Observable> { - // console.log(66,paramsObj) - // let params = new HttpParams({ fromObject: paramsObj }); - // return this.http.get(this.url.downloadNsData, { observe: 'response', params }); - // } - // // download Vnfpak - // downloadVnfData(){ - // return this.http.get(this.url.downloadVnfData) - // } - - // testObservable() { - // let myObservable = new Observable((observer) => { - // observer.next(1); - // observer.next((n) => { - // console.log(3 + n); - // }) - // setTimeout(() => { - // observer.next(66666) - // }, 100) - // observer.next(() => { - // setTimeout((n) => { - // console.log("9999---" + n); - // }, 10) - // }) - // // observer.error(2); - // // observer.complete(); - // }); - - // myObservable.subscribe((e) => { - // if (typeof e == "function") { - // e(5) - // } - // console.log(e); - // }, (err) => { - // console.log(err); - // }, () => { - // console.log(555); - // }) - // } //---------------------------------Function-end------------------------------------------- diff --git a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html index 44b4adec..6a605bfa 100644 --- a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html +++ b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.html @@ -13,26 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - @@ -52,16 +32,14 @@ - - NO + NO Name - - Version + Version Onboarding State - Operational State - Usage State + Operational State + Usage State Operation button @@ -71,26 +49,19 @@ {{item.uuid}} {{item.nsdName}} + 无 {{item.name}} - - {{item.nsdVersion}} {{ item.version }} - {{item.nsdOnboardingState}} + {{item.nsdOnboardingState}} {{status}} - {{item.nsdOperationalState}} {{item.nsdUsageState}} - - - - - @@ -113,22 +84,19 @@ - - NO - Name - Version - Onboarding State - usageState - Operational State - Operation button + NO + Name + Version + Onboarding State + Operational State + Usage State + Operation button - - {{item.id}} {{item.uuid}} {{item.vnfProductName}} @@ -138,20 +106,11 @@ {{item.onboardingState}} {{item.usageState}} {{item.operationalState}} - - - - - @@ -172,39 +131,27 @@ - - NO + NO Name Version - Onboarding State - usageState - Operation button + Onboarding State + Usage State + Operation button - - {{item.id}} {{item.pnfdName}} {{item.pnfdVersion}} {{item.pnfdOnboardingState}} {{item.pnfdUsageState}} - - - - - diff --git a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts index 27d1c17c..5e5495e2 100644 --- a/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts +++ b/usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts @@ -15,15 +15,7 @@ import { Title } from '@angular/platform-browser'; }) export class OnboardVnfVmComponent implements OnInit { @HostBinding('@routerAnimate') routerAnimateState; - //url - url = { - // ns: 'http://ip:port/api/nsd/v1/ns_descriptors/{nsdInfoId}/nsd_content', - // vnf: 'http://ip:port/api/vnfpkgm/v1/vnf_packages/{vnfPkgId}/package_content', - // pnf: 'http://ip:port/api/nsd/v1/pnf_descriptors/{pnfdInfoId}/pnfd_content' - ns: 'https://jsonplaceholder.typicode.com/posts/', - vnf: 'https://jsonplaceholder.typicode.com/posts/', - pnf: 'https://jsonplaceholder.typicode.com/posts/', - }; + // delete Modal confirmModal: NzModalRef; nsdInfoId = ''; @@ -38,6 +30,18 @@ export class OnboardVnfVmComponent implements OnInit { fileListPNF: UploadFile[] = []; // onboard initial value status = "Onboard Available"; + + //url + url = { + // line up + ns: 'http://172.30.3.100:30280/api/nsd/v1/ns_descriptors/'+this.nsdInfoId+'/nsd_content', + vnf: 'http://172.30.3.100:30280/api/vnfpkgm/v1/vnf_packages/'+this.vnfPkgId+'/package_content', + pnf: 'http://172.30.3.100:30280/api/nsd/v1/pnf_descriptors/'+this.pnfdInfoId+'/pnfd_content' + // 本地 + // ns: 'https://jsonplaceholder.typicode.com/posts/', + // vnf: 'https://jsonplaceholder.typicode.com/posts/', + // pnf: 'https://jsonplaceholder.typicode.com/posts/', + }; constructor(private myhttp: onboardService, private http: HttpClient, private msg: NzMessageService,private titleService: Title,private modal: NzModalService, private modalService: NzModalService) { } //default 默认调用ns数据 @@ -75,26 +79,20 @@ export class OnboardVnfVmComponent implements OnInit { console.log(this.url); switch (tab) { case 'NS': - // this.pageIndex = 1; - // this.pageSize = 10; this.getTableData(); break case 'VNF': - // this.pageIndex = 1; - // this.pageSize = 10; this.getTableVnfData() break case 'PNF': - // this.pageIndex = 1; - // this.pageSize = 10; this.getTablePnfData() break } } - //before put create--Drag and drop files to the page before uploading - requestBody = { + //before put 创建--上传之前将文件拖拽到页面时 + requestBody = { "userDefinedData": { "additionalProp1": "string", "additionalProp2": "string", @@ -106,12 +104,12 @@ export class OnboardVnfVmComponent implements OnInit { beforeUploadNS = (file: UploadFile): boolean => { this.fileListNS.push(file); console.log('beforeUpload'); - this.myhttp.getCreatensData("createNetworkServiceData",this.requestBody)//on-line - // this.myhttp.getCreatensData("creatensDataNS") //local + // this.myhttp.getCreatensData("createNetworkServiceData",requestBody)//线上 + this.myhttp.getCreatensData("creatensDataNS",this.requestBody) //本地 .subscribe((data) => { - console.log("Data returned after dragging a file NS-->", data); + console.log("拖拽文件后返回的数据NS-->", data); this.nsdInfoId = data["id"]; - console.log("Data returned after dragging a fileid-->",this.nsdInfoId); + console.log("拖拽文件后返回的数据的id-->",this.nsdInfoId); }, (err) => { console.log(err); }) @@ -122,12 +120,12 @@ export class OnboardVnfVmComponent implements OnInit { beforeUploadVNF = (file: UploadFile): boolean => { this.fileListVNF.push(file); console.log('beforeUpload'); - this.myhttp.getCreatensData("createVnfData",this.requestBody)//on-line - // this.myhttp.getCreatensData("creatensDataVNF") //local + // this.myhttp.getCreatensData("createVnfData",requestBody)//线上 + this.myhttp.getCreatensData("creatensDataVNF",this.requestBody) //本地 .subscribe((data) => { - console.log("Data returned after dragging a fileVNF-->", data); + console.log("拖拽文件后返回的数据VNF-->", data); this.vnfPkgId = data["id"]; - console.log("Data returned after dragging a file id-->",this.vnfPkgId); + console.log("拖拽文件后返回的数据的id-->",this.vnfPkgId); }, (err) => { console.log(err); }) @@ -138,12 +136,12 @@ export class OnboardVnfVmComponent implements OnInit { beforeUploadPNF = (file: UploadFile): boolean => { this.fileListPNF.push(file); console.log('beforeUpload'); - this.myhttp.getCreatensData("createPnfData",this.requestBody) //on-line - // this.myhttp.getCreatensData("creatensDataPNF") //local + // this.myhttp.getCreatensData("createPnfData",requestBody) //线上 + this.myhttp.getCreatensData("creatensDataPNF",this.requestBody) //本地 .subscribe((data) => { - console.log("Data returned after dragging a file PNF-->", data); + console.log("拖拽文件后返回的数据PNF-->", data); this.pnfdInfoId = data["id"]; - console.log("Data returned after dragging a file id-->",this.pnfdInfoId); + console.log("拖拽文件后返回的数据的id-->",this.pnfdInfoId); }, (err) => { console.log(err); }) @@ -201,7 +199,12 @@ export class OnboardVnfVmComponent implements OnInit { // this.nsuploading = true; // You can use any AJAX library you like - const req = new HttpRequest('POST', url, formData, { + // const req = new HttpRequest('POST', url, formData, { + // reportProgress: true, + // withCredentials: true + // }); + // line PUT + const req = new HttpRequest('PUT', url, formData, { reportProgress: true, withCredentials: true }); @@ -243,9 +246,6 @@ changeUploadingSta(tab) { this.myhttp.getOnboardTableData() .subscribe((data) => { console.log(data) - // this.total = data["body"].length; //body length - console.log( this.total) - // this.sdData = data.body.tableList; this.vfcData = data; console.log(typeof this.vfcData) console.log("NSlist-vfc-->",data) @@ -258,7 +258,6 @@ changeUploadingSta(tab) { console.log('NSlist-sdc-->',data) this.sdcData = data; this.tableData = this.MergeArray(this.vfcData, this.sdcData) - // this.tableData = this.vfcData.concat(this.sdcData) }, (err) => { console.log(err); }) @@ -266,12 +265,9 @@ changeUploadingSta(tab) { // 获取vnf列表 getTableVnfData() { - this.myhttp.getOnboardTableVnfData() .subscribe((data) => { console.log("vnfList-->", data); - // this.total = data["body"]; //body length - // console.log( this.total) this.vfcData = data; console.log("vnfList-vfc-->",data) }, (err) => { @@ -283,7 +279,6 @@ changeUploadingSta(tab) { .subscribe((data) => { console.log('vnfList-sdc-->', data) this.sdcData = data; - // this.tableData = this.vfcData.concat(this.sdcData) this.tableData = this.MergeArray(this.vfcData, this.sdcData) }, (err) => { console.log(err); @@ -292,7 +287,6 @@ changeUploadingSta(tab) { // 获取pnf列表 getTablePnfData() { - this.myhttp.getOnboardTablePnfData() .subscribe((data) => { console.log("pnfList-->", data); @@ -302,6 +296,7 @@ changeUploadingSta(tab) { console.log(err); }) } + /* onboard 上传按钮 */ // ns onboard @@ -320,7 +315,6 @@ changeUploadingSta(tab) { nzContent: 'Package Onboard Failed!' }); } - updataNsService(id) { console.log(id); let requestBody = { @@ -361,7 +355,6 @@ changeUploadingSta(tab) { }) } - // pnf onboard ? updataPnfService(id) { console.log('pnf',id); -- cgit 1.2.3-korg