summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lcm/lcm/nf/tests/test_change_ext_conn.py59
-rw-r--r--lcm/lcm/nf/tests/test_change_flavour.py6
-rw-r--r--lcm/lcm/nf/tests/test_scale_vnf.py7
-rw-r--r--lcm/lcm/nf/tests/test_scale_vnf_to_level.py7
-rw-r--r--lcm/lcm/nf/urls.py8
5 files changed, 74 insertions, 13 deletions
diff --git a/lcm/lcm/nf/tests/test_change_ext_conn.py b/lcm/lcm/nf/tests/test_change_ext_conn.py
index 21200f15..f91f2195 100644
--- a/lcm/lcm/nf/tests/test_change_ext_conn.py
+++ b/lcm/lcm/nf/tests/test_change_ext_conn.py
@@ -15,18 +15,71 @@ from django.test import TestCase
from rest_framework import status
from rest_framework.test import APIClient
+from lcm.pub.database.models import NfInstModel
+
class TestChangeExtConn(TestCase):
def setUp(self):
self.client = APIClient()
+ NfInstModel(nfinstid='12345',
+ nf_name='VNF1',
+ nf_desc="VNF DESC",
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
+ status='NOT_INSTANTIATED').save()
+ self.req_data = {
+ "extVirtualLinks": [{
+ "id": "string",
+ "resourceId": "329efb86-5cbb-4fc0-bc7c-6ea28f9d7389",
+ "resourceSubnetId": "429efb86-5cbb-4fc0-bc7c-6ea28f9d7389",
+ "extCps": [{
+ "cpdId": "ext_cp",
+ "cpConfig": [{
+ "cpInstanceId": "",
+ "cpProtocolData": [{
+ "layerProtocol": "IP_OVER_ETHERNET",
+ "ipOverEthernet": {
+ "ipAddresses": [{
+ "type": "IPV4",
+ "numDynamicAddresses": 0,
+ "subnetId": "59e9ffa9-b67e-4c05-b191-ed179007536e"
+ }]
+ }
+ }]
+ }]
+ }],
+ "extLinkPorts": []
+ }],
+ "vimConnectionInfo": [{
+ "id": "tecs_RegionOne",
+ "vimType": "openstack",
+ "vimId": "tecs_RegionOne",
+ "accessInfo": {
+ "tenant": "admin"
+ }
+ }],
+ "additionalParams": {
+ "vmid": "552ea058-6441-4de5-b4c1-b0a52c7557e8"
+ }
+ }
def tearDown(self):
- pass
+ NfInstModel.objects.filter(nfinstid='12345').delete()
def test_change_ext_conn_not_found(self):
- req_data = {}
url = "/api/vnflcm/v1/vnf_instances/12/change_ext_conn"
response = self.client.post(url,
- data=req_data,
+ data=self.req_data,
format='json')
self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
+
+ def test_change_ext_conn_conflict(self):
+ url = "/api/vnflcm/v1/vnf_instances/12345/change_ext_conn"
+ response = self.client.post(url,
+ data=self.req_data,
+ format='json')
+ self.failUnlessEqual(status.HTTP_409_CONFLICT, response.status_code)
diff --git a/lcm/lcm/nf/tests/test_change_flavour.py b/lcm/lcm/nf/tests/test_change_flavour.py
index b4330a35..d8da3ae7 100644
--- a/lcm/lcm/nf/tests/test_change_flavour.py
+++ b/lcm/lcm/nf/tests/test_change_flavour.py
@@ -19,14 +19,16 @@ from rest_framework.test import APIClient
class TestFlavour(TestCase):
def setUp(self):
self.client = APIClient()
+ self.req_data = {
+ "newFlavourId": "myFlavour_new"
+ }
def tearDown(self):
pass
def test_change_flavour_not_found(self):
- req_data = {}
url = "/api/vnflcm/v1/vnf_instances/12/change_flavour"
response = self.client.post(url,
- data=req_data,
+ data=self.req_data,
format='json')
self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
diff --git a/lcm/lcm/nf/tests/test_scale_vnf.py b/lcm/lcm/nf/tests/test_scale_vnf.py
index f8bb6c5d..0024840c 100644
--- a/lcm/lcm/nf/tests/test_scale_vnf.py
+++ b/lcm/lcm/nf/tests/test_scale_vnf.py
@@ -19,14 +19,17 @@ from rest_framework.test import APIClient
class TestNfScale(TestCase):
def setUp(self):
self.client = APIClient()
+ self.req_data = {
+ "type": "SCALE_IN",
+ "aspectId": "sunshine_aspect"
+ }
def tearDown(self):
pass
def test_scale_vnf_not_found(self):
- req_data = {}
url = "/api/vnflcm/v1/vnf_instances/12/scale"
response = self.client.post(url,
- data=req_data,
+ data=self.req_data,
format='json')
self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
diff --git a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py
index 38c55bcf..c4298d85 100644
--- a/lcm/lcm/nf/tests/test_scale_vnf_to_level.py
+++ b/lcm/lcm/nf/tests/test_scale_vnf_to_level.py
@@ -19,14 +19,17 @@ from rest_framework.test import APIClient
class TestNfScaleToLevel(TestCase):
def setUp(self):
self.client = APIClient()
+ self.req_data = {
+ "instantiationLevelId": "instantiation_level_2",
+ "scaleInfo": []
+ }
def tearDown(self):
pass
def test_scale_vnf_to_level_not_found(self):
- req_data = {}
url = "/api/vnflcm/v1/vnf_instances/12/scale_to_level"
response = self.client.post(url,
- data=req_data,
+ data=self.req_data,
format='json')
self.failUnlessEqual(status.HTTP_404_NOT_FOUND, response.status_code)
diff --git a/lcm/lcm/nf/urls.py b/lcm/lcm/nf/urls.py
index 88d78fb3..3fdb3433 100644
--- a/lcm/lcm/nf/urls.py
+++ b/lcm/lcm/nf/urls.py
@@ -34,10 +34,10 @@ urlpatterns = [
url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/terminate$', TerminateVnfView.as_view()),
url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/heal$', HealVnfView.as_view()),
url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/operate$', OperateVnfView.as_view()),
- url(r'^vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/scale$', ScaleVnfView.as_view()),
- url(r'^vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/scale_to_level$', ScaleVnfToLevelView.as_view()),
- url(r'^vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/change_flavour$', ChangeVnfFlavourView.as_view()),
- url(r'^vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/change_ext_conn$', ChangeExtConnView.as_view()),
+ url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/scale$', ScaleVnfView.as_view()),
+ url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/scale_to_level$', ScaleVnfToLevelView.as_view()),
+ url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/change_flavour$', ChangeVnfFlavourView.as_view()),
+ url(r'^api/vnflcm/v1/vnf_instances/(?P<instanceid>[0-9a-zA-Z_-]+)/change_ext_conn$', ChangeExtConnView.as_view()),
url(r'^api/vnflcm/v1/vnf_lcm_op_occs$', QueryMultiVnfLcmOpOccs.as_view()),
url(r'^api/vnflcm/v1/vnf_lcm_op_occs/(?P<lcmopoccid>[0-9a-zA-Z_-]+)$', QuerySingleVnfLcmOpOcc.as_view()),
]