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
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
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()),
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
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
+++ /dev/null
-# 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.
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')),
]