summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorguochuyicmri <guochuyi@chinamobile.com>2019-05-09 17:16:26 +0800
committerguochuyicmri <guochuyi@chinamobile.com>2019-05-09 17:16:32 +0800
commitd72175c1e88052929dec9f59d5f620cc2d964cdd (patch)
treef2a89c8bfaaa7abfa039a56b6e1986dc07d6f6a8
parente31a1c4a8e25dbcc12348e210cee3c292547b90d (diff)
Package management interface development
Change-Id: I4e1cad1463eae8beb43760164cbe96733925a1da Issue-ID: USECASEUI-211 Signed-off-by: guochuyicmri <guochuyi@chinamobile.com>
-rw-r--r--usecaseui-portal/src/app/services/onboard-vnf-vm/onboard-vnf-vm.component.ts13
-rw-r--r--usecaseui-portal/src/assets/i18n/cn.json (renamed from usecaseui-portal/src/assets/i18n/zh.json)0
2 files changed, 7 insertions, 6 deletions
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 97299073..fb6684ce 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
@@ -52,9 +52,9 @@ export class OnboardVnfVmComponent implements OnInit {
//url
url = {
// line up
- ns: '/api/nsd/v1/ns_descriptors/'+this.nsdInfoId +'/nsd_content',
- vnf: '/api/vnfpkgm/v1/vnf_packages/'+this.vnfPkgId+'/package_content',
- pnf: '/api/nsd/v1/pnf_descriptors/'+this.pnfdInfoId+'/pnfd_content'
+ ns: '/api/nsd/v1/ns_descriptors/*_*/nsd_content',
+ vnf: '/api/vnfpkgm/v1/vnf_packages/*_*/package_content',
+ pnf: '/api/nsd/v1/pnf_descriptors/*_*/pnfd_content'
// line local
//ns: 'https://jsonplaceholder.typicode.com/posts/',
//vnf: 'https://jsonplaceholder.typicode.com/posts/',
@@ -209,20 +209,21 @@ export class OnboardVnfVmComponent implements OnInit {
switch (tab) {
case 'NS':
console.log(this.nsdInfoId);
+ console.log(this.url.ns.replace("*_*",this.nsdInfoId));
// this.handleUpload('/api/nsd/v1/ns_descriptors/'+this.nsdInfoId+'/nsd_content',tab);
- this.handleUpload(this.url.ns, tab);
+ this.handleUpload(this.url.ns.replace("*_*",this.nsdInfoId), tab);
this.getTableData();
break
case 'VNF':
console.log(this.vnfPkgId);
// this.handleUpload('/api/vnfpkgm/v1/vnf_packages/'+this.vnfPkgId+'/package_content',tab);
- this.handleUpload(this.url.vnf, tab);
+ this.handleUpload(this.url.vnf.replace("*_*",this.nsdInfoId), tab);
this.getTableVnfData()
break
case 'PNF':
console.log(this.pnfdInfoId);
// this.handleUpload('/api/nsd/v1/pnf_descriptors/'+this.pnfdInfoId+'/pnfd_content',tab);
- this.handleUpload(this.url.pnf, tab);
+ this.handleUpload(this.url.pnf.replace("*_*",this.nsdInfoId), tab);
this.getTablePnfData();
break
}
diff --git a/usecaseui-portal/src/assets/i18n/zh.json b/usecaseui-portal/src/assets/i18n/cn.json
index 208c932a..208c932a 100644
--- a/usecaseui-portal/src/assets/i18n/zh.json
+++ b/usecaseui-portal/src/assets/i18n/cn.json