18 files changed, 12 insertions, 25 deletions
diff --git a/lcm/lcm/nf/vnfs/const.py b/lcm/lcm/nf/const.py
index da338f67..da338f67 100644
--- a/lcm/lcm/nf/vnfs/const.py
+++ b/lcm/lcm/nf/const.py
diff --git a/lcm/lcm/nf/vnfs/serializers.py b/lcm/lcm/nf/serializers.py
index c5984964..c5984964 100644
--- a/lcm/lcm/nf/vnfs/serializers.py
+++ b/lcm/lcm/nf/serializers.py
diff --git a/lcm/lcm/nf/vnfs/__init__.py b/lcm/lcm/nf/tests/__init__.py
index c7b6818e..c7b6818e 100644
--- a/lcm/lcm/nf/vnfs/__init__.py
+++ b/lcm/lcm/nf/tests/__init__.py
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py b/lcm/lcm/nf/tests/test_vnf_cancel.py
index c2ce7055..7e6c30f3 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/tests/test_vnf_cancel.py
@@ -20,7 +20,7 @@ import mock
 from django.test import TestCase, Client
 from rest_framework import status
 
-from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
+from lcm.nf.vnf_cancel.term_vnf import TermVnf
 from lcm.pub.database.models import NfInstModel, JobStatusModel, VmInstModel, NetworkInstModel, SubNetworkInstModel, \
     PortInstModel, FlavourInstModel, StorageInstModel, NfvoRegInfoModel
 from lcm.pub.utils import restcall
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py b/lcm/lcm/nf/tests/test_vnf_create.py
index f1592732..d1f02dce 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_create.py
+++ b/lcm/lcm/nf/tests/test_vnf_create.py
@@ -20,10 +20,10 @@ from django.test import TestCase
 from rest_framework import status
 from rest_framework.test import APIClient
 
-from lcm.nf.vnfs.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
+from lcm.nf.const import c1_data_get_tenant_id, c4_data_create_network, c2_data_create_volume, \
     c5_data_create_subnet, c3_data_get_volume, c6_data_create_port, c7_data_create_flavor, c8_data_list_image, \
     c9_data_create_vm, c10_data_get_vm, inst_req_data, vnfpackage_info
-from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
+from lcm.nf.vnf_create.inst_vnf import InstVnf
 from lcm.pub.database.models import NfInstModel, JobStatusModel
 from lcm.pub.utils import restcall
 from lcm.pub.utils.jobutil import JobUtil
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_query.py b/lcm/lcm/nf/tests/test_vnf_query.py
index 991583e7..991583e7 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_query.py
+++ b/lcm/lcm/nf/tests/test_vnf_query.py
diff --git a/lcm/lcm/nf/vnfs/urls.py b/lcm/lcm/nf/urls.py
index a8348b4c..e59286a5 100644
--- a/lcm/lcm/nf/vnfs/urls.py
+++ b/lcm/lcm/nf/urls.py
@@ -14,7 +14,7 @@
 
 from django.conf.urls import url
 
-from lcm.nf.vnfs.views import InstantiateVnf, TerminateVnf, DeleteVnfAndQueryVnf, CreateVnfAndQueryVnfs
+from lcm.nf.views import InstantiateVnf, TerminateVnf, DeleteVnfAndQueryVnf, CreateVnfAndQueryVnfs
 
 urlpatterns = [
     url(r'^api/vnflcm/v1/vnf_instances$', CreateVnfAndQueryVnfs.as_view()),
diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/views.py
index 3f12648f..94860d79 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/views.py
@@ -20,13 +20,13 @@ from rest_framework import status
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
-from lcm.nf.vnfs.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \
+from lcm.nf.serializers import CreateVnfReqSerializer, CreateVnfRespSerializer, VnfsInfoSerializer, \
     InstOrTeriVnfResponseSerializer, InstantiateVnfRequestSerializer, VnfInfoSerializer, TerminateVnfRequestSerializer
-from lcm.nf.vnfs.vnf_cancel.delete_vnf_identifier import DeleteVnf
-from lcm.nf.vnfs.vnf_cancel.term_vnf import TermVnf
-from lcm.nf.vnfs.vnf_create.create_vnf_identifier import CreateVnf
-from lcm.nf.vnfs.vnf_create.inst_vnf import InstVnf
-from lcm.nf.vnfs.vnf_query.query_vnf import QueryVnf
+from lcm.nf.vnf_cancel.delete_vnf_identifier import DeleteVnf
+from lcm.nf.vnf_cancel.term_vnf import TermVnf
+from lcm.nf.vnf_create.create_vnf_identifier import CreateVnf
+from lcm.nf.vnf_create.inst_vnf import InstVnf
+from lcm.nf.vnf_query.query_vnf import QueryVnf
 from lcm.pub.exceptions import NFLCMException
 from lcm.pub.utils.jobutil import JobUtil
 
diff --git a/lcm/lcm/nf/vnfs/tests/__init__.py b/lcm/lcm/nf/vnf_cancel/__init__.py
index c7b6818e..c7b6818e 100644
--- a/lcm/lcm/nf/vnfs/tests/__init__.py
+++ b/lcm/lcm/nf/vnf_cancel/__init__.py
diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py b/lcm/lcm/nf/vnf_cancel/delete_vnf_identifier.py
index d24cc081..d24cc081 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnf_cancel/delete_vnf_identifier.py
diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py b/lcm/lcm/nf/vnf_cancel/term_vnf.py
index 21babf51..86780309 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/term_vnf.py
+++ b/lcm/lcm/nf/vnf_cancel/term_vnf.py
@@ -17,7 +17,7 @@ import logging
 import traceback
 from threading import Thread
 
-from lcm.nf.vnfs.const import VNF_STATUS
+from lcm.nf.const import VNF_STATUS
 from lcm.pub.database.models import NfInstModel, VmInstModel, NetworkInstModel, StorageInstModel, \
     FlavourInstModel, PortInstModel, SubNetworkInstModel, VNFCInstModel, NfvoRegInfoModel
 from lcm.pub.exceptions import NFLCMException
diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/__init__.py b/lcm/lcm/nf/vnf_create/__init__.py
index c7b6818e..c7b6818e 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/__init__.py
+++ b/lcm/lcm/nf/vnf_create/__init__.py
diff --git a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py b/lcm/lcm/nf/vnf_create/create_vnf_identifier.py
index 12f540da..12f540da 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/create_vnf_identifier.py
+++ b/lcm/lcm/nf/vnf_create/create_vnf_identifier.py
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnf_create/inst_vnf.py
index 59ec9930..59ec9930 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py
+++ b/lcm/lcm/nf/vnf_create/inst_vnf.py
diff --git a/lcm/lcm/nf/vnfs/vnf_create/__init__.py b/lcm/lcm/nf/vnf_query/__init__.py
index c7b6818e..c7b6818e 100644
--- a/lcm/lcm/nf/vnfs/vnf_create/__init__.py
+++ b/lcm/lcm/nf/vnf_query/__init__.py
diff --git a/lcm/lcm/nf/vnfs/vnf_query/query_vnf.py b/lcm/lcm/nf/vnf_query/query_vnf.py
index 70727b10..70727b10 100644
--- a/lcm/lcm/nf/vnfs/vnf_query/query_vnf.py
+++ b/lcm/lcm/nf/vnf_query/query_vnf.py
diff --git a/lcm/lcm/nf/vnfs/vnf_query/__init__.py b/lcm/lcm/nf/vnfs/vnf_query/__init__.py
deleted file mode 100644
index c7b6818e..00000000
--- a/lcm/lcm/nf/vnfs/vnf_query/__init__.py
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2017 ZTE Corporation.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
diff --git a/lcm/lcm/urls.py b/lcm/lcm/urls.py
index a4ebda98..fdff688f 100644
--- a/lcm/lcm/urls.py
+++ b/lcm/lcm/urls.py
@@ -17,7 +17,7 @@ from lcm.pub.config.config import REG_TO_MSB_WHEN_START, REG_TO_MSB_REG_URL, REG
 
 urlpatterns = [
     url(r'^', include('lcm.samples.urls')),
-    url(r'^', include('lcm.nf.vnfs.urls')),
+    url(r'^', include('lcm.nf.urls')),
     url(r'^', include('lcm.jobs.urls')),
     url(r'^', include('lcm.swagger.urls')),
 ]