aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfujinhua <fu.jinhua@zte.com.cn>2017-08-15 14:30:06 +0800
committerfujinhua <fu.jinhua@zte.com.cn>2017-08-15 14:30:06 +0800
commit342c3b2fe8e4f069846e2227b642fc44c3e1f785 (patch)
tree8454138a4e556927068fe49f6836b7d8dbfa2994
parentcc42d7ab095dd50a791a7673e94e524f007ded60 (diff)
Change url of old interface to v0
Change-Id: I4808beff85560f79797c99ddfc50f9eb64b84d51 Issue-Id: VFC-93 Signed-off-by: fujinhua <fu.jinhua@zte.com.cn>
-rw-r--r--lcm/packages/tests/test_nf.py8
-rw-r--r--lcm/packages/tests/test_ns.py38
-rw-r--r--lcm/packages/urls.py14
3 files changed, 30 insertions, 30 deletions
diff --git a/lcm/packages/tests/test_nf.py b/lcm/packages/tests/test_nf.py
index 516a6b02..8e7bad03 100644
--- a/lcm/packages/tests/test_nf.py
+++ b/lcm/packages/tests/test_nf.py
@@ -160,7 +160,7 @@ class TestNfPackage(TestCase):
@mock.patch.object(NfOnBoardingThread, 'run')
def test_nf_pkg_on_boarding_normal(self, mock_run):
- resp = self.client.post("/api/nslcm/v1/vnfpackage", {
+ resp = self.client.post("/api/nslcm/v0/vnfpackage", {
"csarId": "1",
"vimIds": ["1"]
}, format='json')
@@ -190,7 +190,7 @@ class TestNfPackage(TestCase):
@mock.patch.object(restcall, 'call_req')
def test_nf_on_boarding_when_nfd_already_exists(self, mock_call_req):
mock_vals = {
- "/api/catalog/v1/csars/2":
+ "/api/catalog/v0/csars/2":
[0, json.JSONEncoder().encode({
"onBoardState": "onBoardFailed", "processState": "deleteFailed"}), '200'],
"/api/catalog/v1/servicetemplates/queryingrawdata":
@@ -321,7 +321,7 @@ class TestNfPackage(TestCase):
VnfPackageFileModel(id="1", filename="filename", imageid="00001",
vimid="1", vimuser="001", tenant="12", status="1", vnfpid="13").save()
NfInstModel(nfinstid="1", mnfinstid="001", nf_name="name", package_id="13").save()
- resp = self.client.get("/api/nslcm/v1/vnfpackage/13")
+ resp = self.client.get("/api/nslcm/v0/vnfpackage/13")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
expect_data = {
"csarId": '13',
@@ -462,7 +462,7 @@ class TestNfPackage(TestCase):
def test_get_nf_csars_normal(self):
NfPackageModel(uuid="01", nfpackageid="1", vnfdid="2").save()
- resp = self.client.get("/api/nslcm/v1/vnfpackage")
+ resp = self.client.get("/api/nslcm/v0/vnfpackage")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
self.assertEqual(1, len(resp.data["csars"]))
self.assertEqual("1", resp.data["csars"][0]["csarId"])
diff --git a/lcm/packages/tests/test_ns.py b/lcm/packages/tests/test_ns.py
index d41fe9c5..54d7b65b 100644
--- a/lcm/packages/tests/test_ns.py
+++ b/lcm/packages/tests/test_ns.py
@@ -144,7 +144,7 @@ class TestNsPackage(TestCase):
@mock.patch.object(restcall, 'call_req')
def test_ns_pkg_on_boarding_when_on_boarded(self, mock_call_req):
mock_call_req.return_value = [0, json.JSONEncoder().encode({"onBoardState": "onBoarded"}), '200']
- resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "1"}, format='json')
+ resp = self.client.post("/api/nslcm/v0/nspackage", {"csarId": "1"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(1) already onBoarded.", resp.data["statusDescription"])
@@ -163,7 +163,7 @@ class TestNsPackage(TestCase):
mock_call_req.side_effect = side_effect
NSDModel(id="1", nsd_id="2").save()
- resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "2"}, format='json')
+ resp = self.client.post("/api/nslcm/v0/nspackage", {"csarId": "2"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("NSD(2) already exists.", resp.data["statusDescription"])
@@ -182,7 +182,7 @@ class TestNsPackage(TestCase):
return mock_vals[args[4]]
mock_call_req.side_effect = side_effect
- resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "3"}, format='json')
+ resp = self.client.post("/api/nslcm/v0/nspackage", {"csarId": "3"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("VNF package(3) is not onBoarded.", resp.data["statusDescription"])
@@ -204,7 +204,7 @@ class TestNsPackage(TestCase):
mock_call_req.side_effect = side_effect
NfPackageModel(uuid="1", nfpackageid="5", vnfdid="6").save()
- resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "4"}, format='json')
+ resp = self.client.post("/api/nslcm/v0/nspackage", {"csarId": "4"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("VNF package(5) is not onBoarded on catalog.", resp.data["statusDescription"])
@@ -236,7 +236,7 @@ class TestNsPackage(TestCase):
mock_call_req.side_effect = side_effect
NfPackageModel(uuid="1", nfpackageid="6", vnfdid="7").save()
- resp = self.client.post("/api/nslcm/v1/nspackage", {"csarId": "5"}, format='json')
+ resp = self.client.post("/api/nslcm/v0/nspackage", {"csarId": "5"}, format='json')
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("CSAR(5) onBoarded successfully.", resp.data["statusDescription"])
@@ -248,7 +248,7 @@ class TestNsPackage(TestCase):
@mock.patch.object(restcall, 'call_req')
def test_delete_csar_when_id_not_exist(self, mock_call_req):
mock_call_req.return_value = [0, "", '204']
- resp = self.client.delete("/api/nslcm/v1/nspackage/6")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/6")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Delete CSAR(6) successfully.", resp.data["statusDescription"])
@@ -260,7 +260,7 @@ class TestNsPackage(TestCase):
NSDModel(id="7", nsd_id="2").save()
NSInstModel(id="1", nspackage_id="7").save()
- resp = self.client.delete("/api/nslcm/v1/nspackage/7")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/7")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Set deletionPending to True of CSAR(7) successfully.",
@@ -272,14 +272,14 @@ class TestNsPackage(TestCase):
NSDModel(id="8", nsd_id="2").save()
- resp = self.client.delete("/api/nslcm/v1/nspackage/8")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/8")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Delete CSAR(8) successfully.", resp.data["statusDescription"])
###############################################################################################################
def test_delete_pending_csar_when_id_not_exist(self):
- resp = self.client.delete("/api/nslcm/v1/nspackage/9/deletionpending")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/9/deletionpending")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Delete pending CSAR(9) successfully.", resp.data["statusDescription"])
@@ -288,7 +288,7 @@ class TestNsPackage(TestCase):
def test_delete_pending_csar_when_pending_is_false(self, mock_call_req):
mock_call_req.return_value = [0, '{"deletionPending": "false"}', '200']
NSDModel(id="10", nsd_id="2").save()
- resp = self.client.delete("/api/nslcm/v1/nspackage/10/deletionpending")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/10/deletionpending")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(10) need not to be deleted.", resp.data["statusDescription"])
@@ -298,7 +298,7 @@ class TestNsPackage(TestCase):
mock_call_req.return_value = [0, '{"deletionPending": "true"}', '200']
NSDModel(id="11", nsd_id="2").save()
NSInstModel(id="1", nspackage_id="11").save()
- resp = self.client.delete("/api/nslcm/v1/nspackage/11/deletionpending")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/11/deletionpending")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(11) is in using, cannot be deleted.", resp.data["statusDescription"])
@@ -309,7 +309,7 @@ class TestNsPackage(TestCase):
[0, '{"deletionPending": "true"}', '200'],
[0, "OK", '204']]
NSDModel(id="12", nsd_id="2").save()
- resp = self.client.delete("/api/nslcm/v1/nspackage/12/deletionpending")
+ resp = self.client.delete("/api/nslcm/v0/nspackage/12/deletionpending")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Delete CSAR(12) successfully.", resp.data["statusDescription"])
@@ -337,7 +337,7 @@ class TestNsPackage(TestCase):
NSInstModel(id="1", nspackage_id="13", name="11").save()
NSInstModel(id="2", nspackage_id="13", name="22").save()
- resp = self.client.get("/api/nslcm/v1/nspackage/13")
+ resp = self.client.get("/api/nslcm/v0/nspackage/13")
self.assertEqual(resp.status_code, status.HTTP_200_OK)
expect_data = {"nsInstanceInfo": [{"nsInstanceId": "1", "nsInstanceName": "11"},
{"nsInstanceId": "2", "nsInstanceName": "22"}], "csarId": "13",
@@ -351,7 +351,7 @@ class TestNsPackage(TestCase):
###############################################################################################################
def test_disable_csar_when_id_not_exist_table(self):
- resp = self.client.put("/api/nslcm/v1/nspackage/14/disabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/14/disabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(14) does not exist.", resp.data["statusDescription"])
@@ -360,7 +360,7 @@ class TestNsPackage(TestCase):
def test_disable_csar_when_csar_is_disabled(self, mock_call_req):
NSDModel(id="15", nsd_id="2").save()
mock_call_req.return_value = [0, json.JSONEncoder().encode({"operationalState": "Disabled"}), '200']
- resp = self.client.put("/api/nslcm/v1/nspackage/15/disabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/15/disabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(15) already disabled.", resp.data["statusDescription"])
@@ -378,14 +378,14 @@ class TestNsPackage(TestCase):
return mock_vals[args[4]]
mock_call_req.side_effect = side_effect
- resp = self.client.put("/api/nslcm/v1/nspackage/16/disabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/16/disabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Set operationState to Disabled of CSAR(16) successfully.", resp.data["statusDescription"])
###############################################################################################################
def test_enable_csar_when_id_not_exist_table(self):
- resp = self.client.put("/api/nslcm/v1/nspackage/17/enabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/17/enabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(17) does not exist.", resp.data["statusDescription"])
@@ -394,7 +394,7 @@ class TestNsPackage(TestCase):
def test_enable_csar_when_csar_is_enabled(self, mock_call_req):
NSDModel(id="18", nsd_id="2").save()
mock_call_req.return_value = [0, json.JSONEncoder().encode({"operationalState": "Enabled"}), '200']
- resp = self.client.put("/api/nslcm/v1/nspackage/18/enabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/18/enabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("failed", resp.data["status"])
self.assertEqual("CSAR(18) already enabled.", resp.data["statusDescription"])
@@ -412,7 +412,7 @@ class TestNsPackage(TestCase):
return mock_vals[args[4]]
mock_call_req.side_effect = side_effect
- resp = self.client.put("/api/nslcm/v1/nspackage/19/enabled")
+ resp = self.client.put("/api/nslcm/v0/nspackage/19/enabled")
self.assertEqual(resp.status_code, status.HTTP_202_ACCEPTED)
self.assertEqual("success", resp.data["status"])
self.assertEqual("Set operationState to Enabled of CSAR(19) successfully.", resp.data["statusDescription"]) \ No newline at end of file
diff --git a/lcm/packages/urls.py b/lcm/packages/urls.py
index 0f67d86b..b2fd0ee6 100644
--- a/lcm/packages/urls.py
+++ b/lcm/packages/urls.py
@@ -17,15 +17,15 @@ from rest_framework.urlpatterns import format_suffix_patterns
from lcm.packages import views
urlpatterns = [
- url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.ns_access_csar, name='ns_access_csar'),
- url(r'^api/nslcm/v1/nspackage$', views.ns_on_boarding, name='ns_on_boarding'),
- url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$',
+ url(r'^api/nslcm/v0/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.ns_access_csar, name='ns_access_csar'),
+ url(r'^api/nslcm/v0/nspackage$', views.ns_on_boarding, name='ns_on_boarding'),
+ url(r'^api/nslcm/v0/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$',
views.ns_delete_pending_csar, name='ns_delete_pending_csar'),
- url(r'^api/nslcm/v1/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/(?P<operation>(disabled|enabled))$',
+ url(r'^api/nslcm/v0/nspackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/(?P<operation>(disabled|enabled))$',
views.ns_set_state_csar, name='ns_set_state_csar'),
- url(r'^api/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nf_access_csar, name='nf_access_csar'),
- url(r'^api/nslcm/v1/vnfpackage$', views.nf_on_boarding, name='nf_on_boarding'),
- url(r'^api/nslcm/v1/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$',
+ url(r'^api/nslcm/v0/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)$', views.nf_access_csar, name='nf_access_csar'),
+ url(r'^api/nslcm/v0/vnfpackage$', views.nf_on_boarding, name='nf_on_boarding'),
+ url(r'^api/nslcm/v0/vnfpackage/(?P<csarId>[0-9a-zA-Z\-\_]+)/deletionpending$',
views.nf_delete_pending_csar, name='nf_delete_pending_csar'), ]
urlpatterns = format_suffix_patterns(urlpatterns)