Change-Id: I8d8b1dd9e966c35fbfa183d51696e98ac216e9a2
Issue-Id: GVNFM-13
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
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)
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")
def test_delete_vnf_identifier_when_vnf_not_exist(self):
response = self.client.delete("/openoapi/vnflcm/v1/vnf_instances/1111")
except Exception:
logger.error(traceback.format_exc())
return Response(data={'error': 'unexpected exception'}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
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):
class TerminateVnf(APIView):
# 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.
# 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.
from lcm.pub.database.models import NfInstModel
from lcm.pub.exceptions import NFLCMException
from lcm.pub.database.models import NfInstModel
from lcm.pub.exceptions import NFLCMException
+logger = logging.getLogger(__name__)
+
class DeleteVnf:
def __init__(self, data, instanceid):
class DeleteVnf:
def __init__(self, data, instanceid):
self.nf_inst_id = instanceid
def do_biz(self):
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)
raise NFLCMException('VnfInst(%s) does not exist' % self.nf_inst_id)
if sel_vnf.instantiationState != 'VNF_INSTANTIATED':
raise NFLCMException("No instantiated vnf")
if sel_vnf.instantiationState != 'VNF_INSTANTIATED':
raise NFLCMException("No instantiated vnf")
+ NfInstModel.objects.filter(nfinstid=self.nf_inst_id).delete()