diff options
Diffstat (limited to 'lcm/ns/tests/test_sol_ns_terminate_api.py')
| -rw-r--r-- | lcm/ns/tests/test_sol_ns_terminate_api.py | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/lcm/ns/tests/test_sol_ns_terminate_api.py b/lcm/ns/tests/test_sol_ns_terminate_api.py index 5aec52e9..7380aa68 100644 --- a/lcm/ns/tests/test_sol_ns_terminate_api.py +++ b/lcm/ns/tests/test_sol_ns_terminate_api.py @@ -11,21 +11,20 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +import json import uuid - import mock from django.test import TestCase, Client from rest_framework import status - from lcm.ns.biz.ns_terminate import TerminateNsService from lcm.pub.database.models import NfInstModel, NSInstModel +from lcm.ns.tests import VNFD_MODEL_DICT class TestTerminateNsApi(TestCase): def setUp(self): self.client = Client() self.url = "/api/nslcm/v1/ns_instances/%s/terminate" - # self.ns_inst_id = '1' self.ns_inst_id = str(uuid.uuid4()) self.nf_inst_id = '1' self.vnffg_id = str(uuid.uuid4()) @@ -33,24 +32,25 @@ class TestTerminateNsApi(TestCase): self.job_id = str(uuid.uuid4()) self.nf_uuid = '1-1-1' self.tenant = "tenantname" - model = {"metadata": { - "vnfdId": "1", - "vnfdName": "PGW001", - "vnfProvider": "zte", - "vnfdVersion": "V00001", - "vnfVersion": "V5.10.20", - "productType": "CN", - "vnfType": "PGW", - "description": "PGW VNFD description", - "isShared": True, - "vnfExtendType": "driver" - }} - NSInstModel(id=self.ns_inst_id, name="ns_name", status='null').save() - NfInstModel.objects.create(nfinstid=self.nf_inst_id, nf_name='name_1', vnf_id='1', - vnfm_inst_id='1', ns_inst_id='1-1-1,2-2-2', - max_cpu='14', max_ram='12296', max_hd='101', max_shd="20", max_net=10, - status='null', mnfinstid=self.nf_uuid, package_id='pkg1', - vnfd_model=str(model)) + NSInstModel( + id=self.ns_inst_id, + name="ns_name", + status='null').save() + NfInstModel.objects.create( + nfinstid=self.nf_inst_id, + nf_name='name_1', + vnf_id='1', + vnfm_inst_id='1', + ns_inst_id='1-1-1,2-2-2', + max_cpu='14', + max_ram='12296', + max_hd='101', + max_shd="20", + max_net=10, + status='null', + mnfinstid=self.nf_uuid, + package_id='pkg1', + vnfd_model=json.dumps(VNFD_MODEL_DICT)) def tearDown(self): NSInstModel.objects.all().delete() |