From be8eee466a5d17a4cf556ad42871b2437540f6d2 Mon Sep 17 00:00:00 2001 From: Miroslav Los Date: Wed, 20 Nov 2019 16:01:08 +0100 Subject: Fix relative imports and invalid exception handling Make proper relative or absolute imports within miss_htbt_service. Use proper except Class as variable syntax. Avoid multiple parameters to print() for potential python2 usage. Add missing original AT&T license text to test modules. Add attribution to commiter's employer to modified files. Trailing whitespace fixes. Signed-off-by: Miroslav Los Issue-ID: DCAEGEN2-1939 Change-Id: Ibfc4bea3e33a512d06a41050ba5e591121eb9454 --- tests/test_trapd_vnf_table.py | 33 ++++++++++++++++++++------------- 1 file changed, 20 insertions(+), 13 deletions(-) (limited to 'tests/test_trapd_vnf_table.py') diff --git a/tests/test_trapd_vnf_table.py b/tests/test_trapd_vnf_table.py index 9e11ce9..f38d4af 100644 --- a/tests/test_trapd_vnf_table.py +++ b/tests/test_trapd_vnf_table.py @@ -2,6 +2,7 @@ # org.onap.dcae # ================================================================================ # Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019 Pantheon.tech. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -27,11 +28,17 @@ import unittest import sys import pytest import logging -import misshtbtd as db -import htbtworker as pm -import db_monitoring as dbmon -import get_logger -from trapd_vnf_table import verify_DB_creation_1,verify_DB_creation_2,verify_DB_creation_hb_common,verify_cbsPolling_required,hb_properties,verify_cbspolling,verify_sendControlLoop_VNF_ONSET, verify_sendControlLoop_VM_ONSET, verify_sendControlLoop_VNF_ABATED, verify_sendControlLoop_VM_ABATED, verify_fetch_json_file, verify_misshtbtdmain, verify_dbmonitoring, verify_dbmon_startup +from miss_htbt_service import misshtbtd as db +from miss_htbt_service import htbtworker as pm +from miss_htbt_service import db_monitoring as dbmon +from miss_htbt_service import get_logger +from miss_htbt_service.mod.trapd_vnf_table import ( + verify_DB_creation_1, verify_DB_creation_2, verify_DB_creation_hb_common, + verify_cbsPolling_required, hb_properties, verify_cbspolling, + verify_sendControlLoop_VNF_ONSET, verify_sendControlLoop_VM_ONSET, + verify_sendControlLoop_VNF_ABATED, verify_sendControlLoop_VM_ABATED, + verify_fetch_json_file, verify_misshtbtdmain, verify_dbmonitoring, + verify_dbmon_startup) _logger = get_logger.get_logger(__name__) @@ -45,20 +52,20 @@ class test_vnf_tables(unittest.TestCase): def test_validate_vnf_table_1(self): result =verify_DB_creation_1(user_name,password,ip_address,port_num,db_name) self.assertEqual(result, True) - + def test_validate_vnf_table_2(self): result =verify_DB_creation_2(user_name,password,ip_address,port_num,db_name) self.assertEqual(result, True) - + def test_validate_hb_common(self): result =verify_DB_creation_hb_common(user_name,password,ip_address,port_num,db_name) self.assertEqual(result, True) - + def test_validate_cbspolling_required(self): result = verify_cbsPolling_required() self.assertEqual(result, True) - + def test_cbspolling(self): result= verify_cbspolling() _logger.info(result) @@ -87,22 +94,22 @@ class test_vnf_tables(unittest.TestCase): def test_sendControlLoop_VNF_ONSET(self): result= verify_sendControlLoop_VNF_ONSET() _logger.info(result) - self.assertEqual(result, True) + self.assertEqual(result, True) def test_sendControlLoop_VM_ONSET(self): result= verify_sendControlLoop_VM_ONSET() _logger.info(result) - self.assertEqual(result, True) + self.assertEqual(result, True) def test_sendControlLoop_VNF_ABATED(self): result= verify_sendControlLoop_VNF_ABATED() _logger.info(result) - self.assertEqual(result, True) + self.assertEqual(result, True) def test_sendControlLoop_VM_ABATED(self): result= verify_sendControlLoop_VM_ABATED() _logger.info(result) - self.assertEqual(result, True) + self.assertEqual(result, True) #if __name__ == '__main__': # unittest.main() -- cgit 1.2.3-korg