summaryrefslogtreecommitdiffstats
path: root/lcm
diff options
context:
space:
mode:
authorying.yunlong <ying.yunlong@zte.com.cn>2017-02-15 10:45:43 +0800
committerying.yunlong <ying.yunlong@zte.com.cn>2017-02-15 10:45:43 +0800
commit4b5a517fcf4fc8f47247959b94ef35e00e769d43 (patch)
tree0cb92430dccc70b524a51457f47845cffbf38fd2 /lcm
parentd44a2566e752318707e00bdd719ac041b63046e6 (diff)
Modify testcase of delete vnf instance
Change-Id: I8d8b1dd9e966c35fbfa183d51696e98ac216e9a2 Issue-Id: GVNFM-13 Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
Diffstat (limited to 'lcm')
-rw-r--r--lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py1
-rw-r--r--lcm/lcm/nf/vnfs/views.py2
-rw-r--r--lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py12
3 files changed, 10 insertions, 5 deletions
diff --git a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
index 9c73bb6d..cc23d301 100644
--- a/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
+++ b/lcm/lcm/nf/vnfs/tests/test_vnf_cancel.py
@@ -34,6 +34,7 @@ class TestNFTerminate(TestCase):
localizationLanguage='EN_US', create_time=now_time())
response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
self.failUnlessEqual(status.HTTP_204_NO_CONTENT, response.status_code)
+ self.assertEqual(None, response.data)
def test_delete_vnf_identifier_when_vnf_not_exist(self):
response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
diff --git a/lcm/lcm/nf/vnfs/views.py b/lcm/lcm/nf/vnfs/views.py
index e1248e7d..f17ced43 100644
--- a/lcm/lcm/nf/vnfs/views.py
+++ b/lcm/lcm/nf/vnfs/views.py
@@ -65,7 +65,7 @@ class DeleteVnfIdentifier(APIView):
except Exception:
logger.error(traceback.format_exc())
return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
- return Response(data={}, status=status.HTTP_204_NO_CONTENT)
+ return Response(data=None, status=status.HTTP_204_NO_CONTENT)
class TerminateVnf(APIView):
diff --git a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
index 5cf36599..b7b352ff 100644
--- a/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
+++ b/lcm/lcm/nf/vnfs/vnf_cancel/delete_vnf_identifier.py
@@ -11,9 +11,13 @@
# 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 logging
+
from lcm.pub.database.models import NfInstModel
from lcm.pub.exceptions import NFLCMException
+logger = logging.getLogger(__name__)
+
class DeleteVnf:
def __init__(self, data, instanceid):
@@ -21,10 +25,10 @@ class DeleteVnf:
self.nf_inst_id = instanceid
def do_biz(self):
- sel_vnfs = NfInstModel.objects.filter(pk=self.nf_inst_id)
- if not sel_vnfs.exists():
+ vnf_insts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
+ if not vnf_insts.exists():
raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
- sel_vnf = sel_vnfs[0]
+ sel_vnf = vnf_insts[0]
if sel_vnf.instantiationState != 'VNF_INSTANTIATED':
raise NFLCMException("No instantiated vnf")
- pass
+ NfInstModel.objects.filter(nfinstid=self.nf_inst_id).delete()