From 5ef13de25ac067e81e7dd7e9c6c474c253c33476 Mon Sep 17 00:00:00 2001 From: fengyuanxing Date: Tue, 6 Mar 2018 09:52:06 +0800 Subject: [PATCH] Refactor code of scaling aspect Change-Id: Ia541e691eb9b71d6e951e496b80bf277ba6bcd2c Issue-ID: VFC-784 Signed-off-by: fengyuanxing --- lcm/ns/data/scalemapping.json | 18 +++++++++--------- lcm/pub/utils/scaleaspect.py | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/lcm/ns/data/scalemapping.json b/lcm/ns/data/scalemapping.json index 59ebc73d..7b6765dd 100644 --- a/lcm/ns/data/scalemapping.json +++ b/lcm/ns/data/scalemapping.json @@ -3,10 +3,10 @@ { "nsd_id":"23", "ns_scale_aspect": "TIC_EDGE_IMS", - "ns_scale_info_list": [ + "ns_scale_info": [ { "step": "1", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_zte_cscf", "vnf_scaleAspectId": "gpu", @@ -21,7 +21,7 @@ }, { "step": "2", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_zte_cscf", "vnf_scaleAspectId": "mpu", @@ -39,10 +39,10 @@ { "nsd_id":"23", "ns_scale_aspect": "TIC_EDGE_HW", - "ns_scale_info_list": [ + "ns_scale_info": [ { "step": "4", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_hw_cscf", "vnf_scaleAspectId": "gpu", @@ -57,7 +57,7 @@ }, { "step": "6", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_HW_cscf", "vnf_scaleAspectId": "gpu", @@ -75,10 +75,10 @@ { "nsd_id":"235", "ns_scale_aspect": "TIC_EDGE_HW", - "ns_scale_info_list": [ + "ns_scale_info": [ { "step": "4", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_hw_cscf", "vnf_scaleAspectId": "gpu", @@ -93,7 +93,7 @@ }, { "step": "6", - "vnf_scale_list":[ + "vnf_scale_info":[ { "vnfd_id":"nf_HW_cscf", "vnf_scaleAspectId": "gpu", diff --git a/lcm/pub/utils/scaleaspect.py b/lcm/pub/utils/scaleaspect.py index d3dd0db6..521bf583 100644 --- a/lcm/pub/utils/scaleaspect.py +++ b/lcm/pub/utils/scaleaspect.py @@ -75,7 +75,7 @@ def get_vnf_scale_info(filename, ns_instanceId, aspect, step): for j in range(ns_scale_info_list.__len__()): ns_scale_info = ns_scale_info_list[j] if ns_scale_info["step"] == step: - return ns_scale_info["vnf_scale_list"] + return ns_scale_info["vnf_scale_info"] return None @@ -92,7 +92,7 @@ def get_vnf_scale_info_package(scalingmap_json, nsd_id, aspect, step): for j in range(ns_scale_info_list.__len__()): ns_scale_info = ns_scale_info_list[j] if ns_scale_info["step"] == step: - vnf_scale_info_list = ns_scale_info["vnf_scale_list"] + vnf_scale_info_list = ns_scale_info["vnf_scale_info"] return vnf_scale_info_list -- 2.16.6