diff options
Diffstat (limited to 'zte/vmanager/driver/interfaces/views.py')
| -rw-r--r-- | zte/vmanager/driver/interfaces/views.py | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/zte/vmanager/driver/interfaces/views.py b/zte/vmanager/driver/interfaces/views.py index 7b445255..ce625a35 100644 --- a/zte/vmanager/driver/interfaces/views.py +++ b/zte/vmanager/driver/interfaces/views.py @@ -116,23 +116,13 @@ def instantiate_vnf(request, *args, **kwargs): data = {} data["NFVOID"] = 1 data["VNFMID"] = vnfm_id - # data["VNFD"] = ignorcase_get(packageInfo, "downloadUri") - # data["VNFURL"] = ignorcase_get(packageInfo, "downloadUri") vnfdId = ignorcase_get(packageInfo, "vnfdId") from urlparse import urlparse vnfm_ip = urlparse(ignorcase_get(vnfm_info, "url")).netloc.split(':')[0] - if "vCSCF_NF_ZTE" == vnfdId: - data["VNFD"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/CSCF" - data["VNFURL"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/CSCF" - elif "vPCRF_NF_ZTE" == vnfdId: - data["VNFD"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/PCRF" - data["VNFURL"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/PCRF" - elif "vTAS_NF_ZTE" == vnfdId: - data["VNFD"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/SSS" - data["VNFURL"] = "ftp://VMVERSION:vmversion@" + "192.168.128.159" + ":21/SSS" - elif "vSPGW_NF_ZTE" == vnfdId: - data["VNFD"] = "ftp://VMVERSION:vmversion@" + "192.168.237.159" + ":21/vgw31" - data["VNFURL"] = "ftp://VMVERSION:vmversion@" + "192.168.237.159" + ":21/vgw31" + VNFS = ["SPGW", "MME"] + if vnfdId in VNFS: + data["VNFD"] = "ftp://VMVERSION:vmversion@" + vnfm_ip + ":21/" + vnfdId + data["VNFURL"] = "ftp://VMVERSION:vmversion@" + vnfm_ip + ":21/" + vnfdId else: data["VNFD"] = ignorcase_get(packageInfo, "downloadUri") data["VNFURL"] = ignorcase_get(packageInfo, "downloadUri") |