From d72175c1e88052929dec9f59d5f620cc2d964cdd Mon Sep 17 00:00:00 2001 From: guochuyicmri Date: Thu, 9 May 2019 17:16:26 +0800 Subject: Package management interface development Change-Id: I4e1cad1463eae8beb43760164cbe96733925a1da Issue-ID: USECASEUI-211 Signed-off-by: guochuyicmri --- .../onboard-vnf-vm/onboard-vnf-vm.component.ts | 13 +- usecaseui-portal/src/assets/i18n/cn.json | 138 +++++++++++++++++++++ usecaseui-portal/src/assets/i18n/zh.json | 138 --------------------- 3 files changed, 145 insertions(+), 144 deletions(-) create mode 100644 usecaseui-portal/src/assets/i18n/cn.json delete mode 100644 usecaseui-portal/src/assets/i18n/zh.json 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/cn.json b/usecaseui-portal/src/assets/i18n/cn.json new file mode 100644 index 00000000..208c932a --- /dev/null +++ b/usecaseui-portal/src/assets/i18n/cn.json @@ -0,0 +1,138 @@ +{ + "Language":"--:", + "zh":"中文", + "en":"英文", + + "app-component":"--:", + "i18nTextDefine_Home":"首页", + "i18nTextDefine_Customer":"用户", + "i18nTextDefine_Monitor":"监控", + "i18nTextDefine_Services":"服务", + "i18nTextDefine_ServicesList":"服务列表", + "i18nTextDefine_PackageManagement":"包管理", + "i18nTextDefine_Alarm":"告警", + "i18nTextDefine_Performance":"性能", + "i18nTextDefine_NetworkTopology":"网络拓扑", + + "home-component":"--:", + "i18nTextDefine_SERVICES":"服务", + "i18nTextDefine_PACKAGE":"包", + "i18nTextDefine_Total":"总数", + "i18nTextDefine_cutomers_and":"用户和", + "i18nTextDefine_service_instance":"服务实例", + "i18nTextDefine_ViewDetails":"查看详情", + "i18nTextDefine_ALARM":"告警", + "i18nTextDefine_VNF_Alarm":"VNF告警", + "i18nTextDefine_VM_Alarm":"VM告警", + "i18nTextDefine_VM_Performance":"VM性能", + + "services-list-component":"--:", + "i18nTextDefine_ServiceType":"服务类型", + "i18nTextDefine_Create":"创建", + "i18nTextDefine_Failed":"失败", + "i18nTextDefine_Success":"成功", + "i18nTextDefine_InProgress":"执行中", + "i18nTextDefine_End_To_End_Service":"端到端服务", + "i18nTextDefine_Network_Service":"NS服务", + "i18nTextDefine_Cross_Domain_and_Cross_Layer_VPN":"CCVPN服务", + "i18nTextDefine_NO":"序号", + "i18nTextDefine_Name":"名称", + "i18nTextDefine_Description":"描述", + "i18nTextDefine_UseCase":"场景用例", + "i18nTextDefine_Status":"状态", + "i18nTextDefine_Action":"动作", + "i18nTextDefine_Template":"模板", + "i18nTextDefine_Orchestrator":"编排器", + "i18nTextDefine_ServiceCreation":"服务创建", + "i18nTextDefine_Cancel":"取消", + "i18nTextDefine_modelOk":"确认", + "i18nTextDefine_Scale":"缩扩容", + "i18nTextDefine_SureScale":"您确定缩扩容此实例吗？", + "i18nTextDefine_InstanceName":"实例名称", + "i18nTextDefine_InstanceID":"实例ID", + "i18nTextDefine_ScaleType":"缩扩容类型", + "i18nTextDefine_AspectId":"详情Id", + "i18nTextDefine_Number_Of_Steps":"级数", + "i18nTextDefine_ScalingDirection":"缩扩容方向", + "i18nTextDefine_delete":"删除", + "i18nTextDefine_SureDelete":"您确定删除此实例吗？", + "i18nTextDefine_terminationType":"终止类型", + "i18nTextDefine_graceful":"优雅", + "i18nTextDefine_forceful":"强制", + "i18nTextDefine_gracefulTerminationTimeout":"优雅终止超时时间", + "i18nTextDefine_Heal":"自愈", + "i18nTextDefine_SureHeal":"您确定自愈此实例吗？", + "i18nTextDefine_degreeHealing":"自愈程度", + "i18nTextDefine_actionsHealing":"自愈行为", + "i18nTextDefine_healScript":"自愈脚本", + "i18nTextDefine_additionalParamsforNs":"NS附加参数", + "i18nTextDefine_cause":"原因", + "i18nTextDefine_action":"动作", + "i18nTextDefine_actionvminfo":"操作虚拟机信息", + "i18nTextDefine_InstanceCreationStarting":"创建开始", + "i18nTextDefine_InstanceCreatedSuccessfully":"创建成功", + "i18nTextDefine_InstanceCreationFailed":"创建失败！", + "i18nTextDefine_InstanceTeminationStarting":"删除开始", + "i18nTextDefine_InstanceTeminatedSuccessfully":"删除成功", + "i18nTextDefine_InstanceTeminationFailed":" 删除失败", + "i18nTextDefine_InstanceScaleStarting":"缩扩容开始", + "i18nTextDefine_InstanceScaledSuccessfully":"缩扩容成功", + "i18nTextDefine_InstanceScaleFailed":"缩扩容失败", + "i18nTextDefine_InstanceHealingStarting":"自愈开始", + "i18nTextDefine_InstanceHealedSuccessfully":"自愈成功", + "i18nTextDefine_InstanceHealingFailed":"自愈失败", + "i18nTextDefine_InstanceUpdateStarting":"更新开始", + "i18nTextDefine_InstanceUpdatedSuccessfully":"更新成功", + "i18nTextDefine_InstanceUpdateFailed":"更新失败", + + "ccvpn-creation-component":"--:", + "i18nTextDefine_InstanceCreation":"实例创建", + "i18nTextDefine_InstanceTopology":"实例拓扑", + "i18nTextDefine_Add":"新增", + "i18nTextDefine_Base":"基本信息", + "i18nTextDefine_templateInputs":"模板输入", + + "ccvpn-detail-component":"--:", + "i18nTextDefine_InstanceDetail":"实例详情", + + "onboard-vnf-vm-component":"--:", + "i18nTextDefine_Click_CSAR_File":"单击此处或拖入CSAR文件", + "i18nTextDefine_Uploaded_files":"已上传文件", + "i18nTextDefine_Uploading":"上传中", + "i18nTextDefine_StartUpload":"开始上传", + "i18nTextDefine_File_upload_completed":"文件上传完毕", + "i18nTextDefine_Version":"版本", + "i18nTextDefine_OnboardingState":"分发状态", + "i18nTextDefine_OperationalState":"操作状态", + "i18nTextDefine_UsageState":"使用状态", + "i18nTextDefine_Operationbutton":"操作按钮", + + "management-component":"--:", + "i18nTextDefine_Create_initial_customer":"创建初始用户", + "i18nTextDefine_Customer_not_in_ONAP":"ONAP尚未存在已创建用户", + "i18nTextDefine_createCustomer&serviceType":"请创建用户及其服务类型", + "i18nTextDefine_input_customerName":"输入用户名称", + + "customer-component":"--:", + "i18nTextDefine_Instance_Count_of_Customer":"用户实例计数", + "i18nTextDefine_users":"用户", + "i18nTextDefine_Instance_Count_of_ServiceType":"服务类型实例计数", + "i18nTextDefine_Input_ServicesType":"输入服务类型", + "i18nTextDefine_Input_Sure_deleteCustomer":"您确定删除此用户吗？", + "i18nTextDefine_Input_Sure_deleteServiceType":"您确定删除此服务类型吗？", + "i18nTextDefine_CustomerName":"用户名称", + "i18nTextDefine_CustomerID":"用户ID", + + "ccvpn-network-component":"--:", + "i18nTextDefine_AddLink":"添加链接", + "i18nTextDefine_SetAttribtes":"设置属性", + "i18nTextDefine_LinkName":"链接名称", + "i18nTextDefine_LeftPort":"左侧端口", + "i18nTextDefine_Network":"网络", + "i18nTextDefine_Node":"节点", + "i18nTextDefine_TerminalPoint":"终端", + "i18nTextDefine_RightPort":"右侧端口", + "i18nTextDefine_PartnerNetwork":"伙伴网络", + "i18nTextDefine_HostUrl":"主机网址", + "i18nTextDefine_deleteLink":"删除链接" +} \ No newline at end of file diff --git a/usecaseui-portal/src/assets/i18n/zh.json b/usecaseui-portal/src/assets/i18n/zh.json deleted file mode 100644 index 208c932a..00000000 --- a/usecaseui-portal/src/assets/i18n/zh.json +++ /dev/null @@ -1,138 +0,0 @@ -{ - "Language":"--:", - "zh":"中文", - "en":"英文", - - "app-component":"--:", - "i18nTextDefine_Home":"首页", - "i18nTextDefine_Customer":"用户", - "i18nTextDefine_Monitor":"监控", - "i18nTextDefine_Services":"服务", - "i18nTextDefine_ServicesList":"服务列表", - "i18nTextDefine_PackageManagement":"包管理", - "i18nTextDefine_Alarm":"告警", - "i18nTextDefine_Performance":"性能", - "i18nTextDefine_NetworkTopology":"网络拓扑", - - "home-component":"--:", - "i18nTextDefine_SERVICES":"服务", - "i18nTextDefine_PACKAGE":"包", - "i18nTextDefine_Total":"总数", - "i18nTextDefine_cutomers_and":"用户和", - "i18nTextDefine_service_instance":"服务实例", - "i18nTextDefine_ViewDetails":"查看详情", - "i18nTextDefine_ALARM":"告警", - "i18nTextDefine_VNF_Alarm":"VNF告警", - "i18nTextDefine_VM_Alarm":"VM告警", - "i18nTextDefine_VM_Performance":"VM性能", - - "services-list-component":"--:", - "i18nTextDefine_ServiceType":"服务类型", - "i18nTextDefine_Create":"创建", - "i18nTextDefine_Failed":"失败", - "i18nTextDefine_Success":"成功", - "i18nTextDefine_InProgress":"执行中", - "i18nTextDefine_End_To_End_Service":"端到端服务", - "i18nTextDefine_Network_Service":"NS服务", - "i18nTextDefine_Cross_Domain_and_Cross_Layer_VPN":"CCVPN服务", - "i18nTextDefine_NO":"序号", - "i18nTextDefine_Name":"名称", - "i18nTextDefine_Description":"描述", - "i18nTextDefine_UseCase":"场景用例", - "i18nTextDefine_Status":"状态", - "i18nTextDefine_Action":"动作", - "i18nTextDefine_Template":"模板", - "i18nTextDefine_Orchestrator":"编排器", - "i18nTextDefine_ServiceCreation":"服务创建", - "i18nTextDefine_Cancel":"取消", - "i18nTextDefine_modelOk":"确认", - "i18nTextDefine_Scale":"缩扩容", - "i18nTextDefine_SureScale":"您确定缩扩容此实例吗？", - "i18nTextDefine_InstanceName":"实例名称", - "i18nTextDefine_InstanceID":"实例ID", - "i18nTextDefine_ScaleType":"缩扩容类型", - "i18nTextDefine_AspectId":"详情Id", - "i18nTextDefine_Number_Of_Steps":"级数", - "i18nTextDefine_ScalingDirection":"缩扩容方向", - "i18nTextDefine_delete":"删除", - "i18nTextDefine_SureDelete":"您确定删除此实例吗？", - "i18nTextDefine_terminationType":"终止类型", - "i18nTextDefine_graceful":"优雅", - "i18nTextDefine_forceful":"强制", - "i18nTextDefine_gracefulTerminationTimeout":"优雅终止超时时间", - "i18nTextDefine_Heal":"自愈", - "i18nTextDefine_SureHeal":"您确定自愈此实例吗？", - "i18nTextDefine_degreeHealing":"自愈程度", - "i18nTextDefine_actionsHealing":"自愈行为", - "i18nTextDefine_healScript":"自愈脚本", - "i18nTextDefine_additionalParamsforNs":"NS附加参数", - "i18nTextDefine_cause":"原因", - "i18nTextDefine_action":"动作", - "i18nTextDefine_actionvminfo":"操作虚拟机信息", - "i18nTextDefine_InstanceCreationStarting":"创建开始", - "i18nTextDefine_InstanceCreatedSuccessfully":"创建成功", - "i18nTextDefine_InstanceCreationFailed":"创建失败！", - "i18nTextDefine_InstanceTeminationStarting":"删除开始", - "i18nTextDefine_InstanceTeminatedSuccessfully":"删除成功", - "i18nTextDefine_InstanceTeminationFailed":" 删除失败", - "i18nTextDefine_InstanceScaleStarting":"缩扩容开始", - "i18nTextDefine_InstanceScaledSuccessfully":"缩扩容成功", - "i18nTextDefine_InstanceScaleFailed":"缩扩容失败", - "i18nTextDefine_InstanceHealingStarting":"自愈开始", - "i18nTextDefine_InstanceHealedSuccessfully":"自愈成功", - "i18nTextDefine_InstanceHealingFailed":"自愈失败", - "i18nTextDefine_InstanceUpdateStarting":"更新开始", - "i18nTextDefine_InstanceUpdatedSuccessfully":"更新成功", - "i18nTextDefine_InstanceUpdateFailed":"更新失败", - - "ccvpn-creation-component":"--:", - "i18nTextDefine_InstanceCreation":"实例创建", - "i18nTextDefine_InstanceTopology":"实例拓扑", - "i18nTextDefine_Add":"新增", - "i18nTextDefine_Base":"基本信息", - "i18nTextDefine_templateInputs":"模板输入", - - "ccvpn-detail-component":"--:", - "i18nTextDefine_InstanceDetail":"实例详情", - - "onboard-vnf-vm-component":"--:", - "i18nTextDefine_Click_CSAR_File":"单击此处或拖入CSAR文件", - "i18nTextDefine_Uploaded_files":"已上传文件", - "i18nTextDefine_Uploading":"上传中", - "i18nTextDefine_StartUpload":"开始上传", - "i18nTextDefine_File_upload_completed":"文件上传完毕", - "i18nTextDefine_Version":"版本", - "i18nTextDefine_OnboardingState":"分发状态", - "i18nTextDefine_OperationalState":"操作状态", - "i18nTextDefine_UsageState":"使用状态", - "i18nTextDefine_Operationbutton":"操作按钮", - - "management-component":"--:", - "i18nTextDefine_Create_initial_customer":"创建初始用户", - "i18nTextDefine_Customer_not_in_ONAP":"ONAP尚未存在已创建用户", - "i18nTextDefine_createCustomer&serviceType":"请创建用户及其服务类型", - "i18nTextDefine_input_customerName":"输入用户名称", - - "customer-component":"--:", - "i18nTextDefine_Instance_Count_of_Customer":"用户实例计数", - "i18nTextDefine_users":"用户", - "i18nTextDefine_Instance_Count_of_ServiceType":"服务类型实例计数", - "i18nTextDefine_Input_ServicesType":"输入服务类型", - "i18nTextDefine_Input_Sure_deleteCustomer":"您确定删除此用户吗？", - "i18nTextDefine_Input_Sure_deleteServiceType":"您确定删除此服务类型吗？", - "i18nTextDefine_CustomerName":"用户名称", - "i18nTextDefine_CustomerID":"用户ID", - - "ccvpn-network-component":"--:", - "i18nTextDefine_AddLink":"添加链接", - "i18nTextDefine_SetAttribtes":"设置属性", - "i18nTextDefine_LinkName":"链接名称", - "i18nTextDefine_LeftPort":"左侧端口", - "i18nTextDefine_Network":"网络", - "i18nTextDefine_Node":"节点", - "i18nTextDefine_TerminalPoint":"终端", - "i18nTextDefine_RightPort":"右侧端口", - "i18nTextDefine_PartnerNetwork":"伙伴网络", - "i18nTextDefine_HostUrl":"主机网址", - "i18nTextDefine_deleteLink":"删除链接" -} \ No newline at end of file -- cgit 1.2.3-korg