there is no error_message method on onapsdk exception
as a consequence we may raise a new excpetion when catching sdk
exception leading to the non generation of the report
Issue-ID: TEST-332
Signed-off-by: morganrol <morgan.richomme@orange.com>
Change-Id: I42d1413ef142e29eeafdfe701f136ae45b097de4
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
- except (OnapTestException, SDKException, APIError) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except (SDKException, APIError):
+ self.result = 0
+ self.__logger.error("SDK exception")
finally:
self.stop_time = time.time()
def clean(self):
finally:
self.stop_time = time.time()
def clean(self):
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
self.test.execute()
self.__logger.info("VNF basic_vm successfully onboarded")
self.result = 100
self.test.execute()
self.__logger.info("VNF basic_vm successfully onboarded")
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
else:
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
self.test.execute()
self.test.cleanup()
self.result = 100
self.test.execute()
self.test.cleanup()
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
try:
self.test.execute()
self.result = 100
try:
self.test.execute()
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
- self.stop_time = time.time()
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
+ finally:
+ self.stop_time = time.time()
def clean(self):
"""Clean Additional resources if needed."""
def clean(self):
"""Clean Additional resources if needed."""
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
self.stop_time = time.time()
self.__logger.info("No cleanup requested. Test completed.")
self.result = 100
self.stop_time = time.time()
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()
self.test.execute()
self.test.cleanup()
self.result = 100
self.test.execute()
self.test.cleanup()
self.result = 100
- except (OnapTestException, SDKException) as exc:
+ except OnapTestException as exc:
self.result = 0
self.__logger.error(exc.error_message)
self.result = 0
self.__logger.error(exc.error_message)
+ except SDKException:
+ self.result = 0
+ self.__logger.error("SDK Exception")
finally:
self.stop_time = time.time()
finally:
self.stop_time = time.time()