From d555af8d188de1a6acf6a58fca1613d39bcc025b Mon Sep 17 00:00:00 2001 From: fujinhua Date: Fri, 27 Jul 2018 08:30:12 +0800 Subject: [PATCH] Mock get_auto_id function when run unit test Change-Id: Ia8edf5439ba6f26545291ab777af92ad8f6b55e0 Issue-ID: VFC-986 Signed-off-by: fujinhua --- lcm/ns/tests/test_ns_manual_scale.py | 4 ---- lcm/packages/tests/test_nf.py | 4 ---- lcm/packages/tests/test_sdc_nf.py | 5 +---- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/lcm/ns/tests/test_ns_manual_scale.py b/lcm/ns/tests/test_ns_manual_scale.py index 37502f45..6526ffca 100644 --- a/lcm/ns/tests/test_ns_manual_scale.py +++ b/lcm/ns/tests/test_ns_manual_scale.py @@ -15,7 +15,6 @@ import uuid import os import mock -import random from django.test import Client from django.test import TestCase from rest_framework import status @@ -27,7 +26,6 @@ from lcm.pub.utils import restcall from lcm.pub.utils.jobutil import JobUtil, JOB_TYPE, JOB_MODEL_STATUS from lcm.pub.msapi import catalog from lcm.pub.utils.scaleaspect import get_json_data -from lcm.pub.utils import idutil SCALING_JSON = { @@ -115,8 +113,6 @@ class TestNsManualScale(TestCase): "NS", JOB_TYPE.MANUAL_SCALE_VNF, self.ns_inst_id) self.package_id = "7" self.client = Client() - idutil.get_auto_id = mock.Mock() - idutil.get_auto_id.return_value = random.random() NSInstModel( id=self.ns_inst_id, name="abc", diff --git a/lcm/packages/tests/test_nf.py b/lcm/packages/tests/test_nf.py index 35cc598a..6ebc98b5 100644 --- a/lcm/packages/tests/test_nf.py +++ b/lcm/packages/tests/test_nf.py @@ -15,7 +15,6 @@ import json import mock -import random from django.test import Client from django.test import TestCase from rest_framework import status @@ -27,7 +26,6 @@ from lcm.pub.database.models import NfPackageModel, VnfPackageFileModel, NfInstM from lcm.pub.nfvi.vim.vimadaptor import VimAdaptor from lcm.pub.utils import fileutil from lcm.pub.utils import restcall -from lcm.pub.utils import idutil class TestNfPackage(TestCase): @@ -38,8 +36,6 @@ class TestNfPackage(TestCase): NfInstModel.objects.filter().delete() JobModel.objects.filter().delete() JobStatusModel.objects.filter().delete() - idutil.get_auto_id = mock.Mock() - idutil.get_auto_id.return_value = random.random() self.vnfd_raw_data = { "rawData": { "instance": { diff --git a/lcm/packages/tests/test_sdc_nf.py b/lcm/packages/tests/test_sdc_nf.py index 2d9ae541..6c95b850 100644 --- a/lcm/packages/tests/test_sdc_nf.py +++ b/lcm/packages/tests/test_sdc_nf.py @@ -14,7 +14,6 @@ import json import mock -import random from django.test import Client from django.test import TestCase from rest_framework import status @@ -23,7 +22,7 @@ from lcm.packages.sdc_nf_package import SdcNfDistributeThread, SdcNfPkgDeleteThr from lcm.pub.database.models import JobStatusModel, JobModel from lcm.pub.database.models import NfPackageModel, NfInstModel from lcm.pub.msapi import sdc -from lcm.pub.utils import restcall, toscaparser, idutil +from lcm.pub.utils import restcall, toscaparser class TestNfPackage(TestCase): @@ -32,8 +31,6 @@ class TestNfPackage(TestCase): NfPackageModel.objects.filter().delete() NfInstModel.objects.filter().delete() JobModel.objects.filter().delete() - idutil.get_auto_id = mock.Mock() - idutil.get_auto_id.return_value = random.random() JobStatusModel.objects.filter().delete() self.vnfd_data = { "volume_storages": [ -- 2.16.6