diff options
| -rw-r--r-- | catalog/packages/ns_package.py | 1 | ||||
| -rw-r--r-- | catalog/packages/tests/test_nf.py | 15 | ||||
| -rw-r--r-- | catalog/packages/tests/test_ns.py | 16 |
3 files changed, 9 insertions, 23 deletions
diff --git a/catalog/packages/ns_package.py b/catalog/packages/ns_package.py index 2ff2b13e..b8ca44e2 100644 --- a/catalog/packages/ns_package.py +++ b/catalog/packages/ns_package.py @@ -25,7 +25,6 @@ from catalog.pub.exceptions import CatalogException from catalog.pub.msapi import sdc from catalog.pub.utils import fileutil from catalog.pub.utils import toscaparser -from rest_framework import status logger = logging.getLogger(__name__) diff --git a/catalog/packages/tests/test_nf.py b/catalog/packages/tests/test_nf.py index 0e82d3e7..131104cd 100644 --- a/catalog/packages/tests/test_nf.py +++ b/catalog/packages/tests/test_nf.py @@ -11,19 +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 mock -from rest_framework import status -from django.test import TestCase from django.test import Client +from django.test import TestCase +from rest_framework import status -from catalog.pub.utils import restcall, toscaparser -from catalog.pub.utils import fileutil -from catalog.pub.database.models import VnfPackageModel -from catalog.pub.database.models import JobStatusModel, JobModel from catalog.packages.nf_package import NfDistributeThread, NfPkgDeleteThread -from catalog.packages import nf_package +from catalog.pub.database.models import JobStatusModel, JobModel +from catalog.pub.database.models import VnfPackageModel from catalog.pub.msapi import sdc +from catalog.pub.utils import restcall, toscaparser + class TestNfPackage(TestCase): def setUp(self): diff --git a/catalog/packages/tests/test_ns.py b/catalog/packages/tests/test_ns.py index 34e23149..c5214b6b 100644 --- a/catalog/packages/tests/test_ns.py +++ b/catalog/packages/tests/test_ns.py @@ -11,6 +11,7 @@ # 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 mock from rest_framework import status @@ -498,18 +499,3 @@ class TestNsPackage(TestCase): {"csarId": "1", "inputs": []}, format='json') self.assertEqual(resp.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR) self.assertEqual(resp.data, {"error": "NS CSAR(1) does not exist."}) - - - - - - - - - - - - - - - |