X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=lcm%2Fns%2Ftests%2Ftest_ns_instant.py;h=6e50cb6a35f6d9ca4082373efbd063aa279d96d5;hb=8183effdd2d2d855aa8a7b6c7a58d436783ef818;hp=ed20c05217ef9ac05a0634808bd21353e4aa6d9b;hpb=bcf49a37cdf5da54fba35e65bdffb9d95babfc4c;p=vfc%2Fnfvo%2Flcm.git

diff --git a/lcm/ns/tests/test_ns_instant.py b/lcm/ns/tests/test_ns_instant.py
index ed20c052..6e50cb6a 100644
--- a/lcm/ns/tests/test_ns_instant.py
+++ b/lcm/ns/tests/test_ns_instant.py
@@ -11,14 +11,12 @@
 # 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 mock
-from rest_framework import status
+
+# from rest_framework import status
 from django.test import TestCase
 from django.test import Client
 
 from lcm.pub.database.models import NSInstModel
-from lcm.pub.utils import restcall
-from lcm.pub.utils import toscautil
 
 
 class TestNsInstant(TestCase):
@@ -37,13 +35,13 @@ class TestNsInstant(TestCase):
     def test_ns_instant_ok(self, mock_convert_nsd_model, mock_call_req):
         mock_convert_nsd_model.return_value = self.context
         mock_vals = {
-            "/openoapi/catalog/v1/csars/7/files?relativePath=abc.yaml":
+            "/api/catalog/v1/csars/7/files?relativePath=abc.yaml":
                 [0, '{"downloadUri":"http://test.yaml", "localPath":"./test.yaml"}', '200'],
-            "/openoapi/tosca/v1/indirect/plan":
+            "/api/tosca/v1/indirect/plan":
                 [0, '{"description":"", "metadata":{}, "nodes":[]}', '200'],
-            "/openoapi/catalog/v1/servicetemplates/2/operations":
+            "/api/catalog/v1/servicetemplates/2/operations":
                 [0, '[{"name":"LCM", "processId":"{http://www.open-o.org/tosca/nfv/2015/12}init-16"}]', '200'],
-            "/openoapi/wso2bpel/v1/process/instance":
+            "/api/wso2bpel/v1/process/instance":
                 [0, '{"status": 1}', '200']}
 
         def side_effect(*args):
@@ -56,10 +54,11 @@ class TestNsInstant(TestCase):
                 'nsInstanceId': "123", 'instanceId': "234", 'resourceUrl': "", 'callbackId': "",
                 'additionalParamForVnf': "[{\"b\":1},{\"c\":{\"d\":\"2\"}}]",
                 'additionalParamForNs': "[{\"a\":3},{\"e\":{\"f\":\"4\"}}]", 'flavorParams': ""}
-        resp = self.client.post("/openoapi/nslcm/v1/ns/123/instantiate", data, format='json')
+        resp = self.client.post("/api/nslcm/v1/ns/123/instantiate", data, format='json')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
-    """
-    
+
+
     def test_swagger_ok(self):
-        resp = self.client.get("/openoapi/nslcm/v1/swagger.json", format='json')
+        resp = self.client.get("/api/nslcm/v1/swagger.json", format='json')
         self.assertEqual(resp.status_code, status.HTTP_200_OK)
+    """