diff --git a/test-integration/IntegrationTests/IntegrationTestAsyncAPIGeneralNotificationCallbacks.py b/test-integration/IntegrationTests/IntegrationTestAsyncAPIGeneralNotificationCallbacks.py index b69fdcd..152c48a 100644 --- a/test-integration/IntegrationTests/IntegrationTestAsyncAPIGeneralNotificationCallbacks.py +++ b/test-integration/IntegrationTests/IntegrationTestAsyncAPIGeneralNotificationCallbacks.py @@ -32,7 +32,6 @@ TOPIC = "topic/test/async_cb/" MESSAGE_PREFIX = "MagicMessage-" NUMBER_OF_PUBLISHES = 3 -HOST = "ajje7lpljulm4-ats.iot.us-east-1.amazonaws.com" ROOT_CA = "./test-integration/Credentials/rootCA.crt" CERT = "./test-integration/Credentials/certificate.pem.crt" KEY = "./test-integration/Credentials/privateKey.pem.key" @@ -102,9 +101,10 @@ def get_random_string(length): ############################################################################ # Main # # Check inputs -my_check_in_manager = checkInManager(1) +my_check_in_manager = checkInManager(2) my_check_in_manager.verify(sys.argv) mode = my_check_in_manager.mode +HOST = my_check_in_manager.host skip_when_match(ModeIsALPN(mode).And( Python2VersionLowerThan((2, 7, 10)).Or(Python3VersionLowerThan((3, 5, 0))) diff --git a/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py b/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py index 2faaa02..7115138 100644 --- a/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py +++ b/test-integration/IntegrationTests/TestToolLibrary/checkInManager.py @@ -7,6 +7,7 @@ class checkInManager: def __init__(self, numberOfInputParameters): self._numberOfInputParameters = numberOfInputParameters self.mode = None + self.host = None self.customParameter = None def verify(self, args): @@ -14,5 +15,6 @@ def verify(self, args): if len(args) != self._numberOfInputParameters + 1: exit(4) self.mode = str(args[1]) + self.host = str(args[2]) if self._numberOfInputParameters + 1 > 2: - self.customParameter = int(args[2]) + self.customParameter = int(args[3]) diff --git a/test-integration/run/run.sh b/test-integration/run/run.sh index c241711..28b9008 100755 --- a/test-integration/run/run.sh +++ b/test-integration/run/run.sh @@ -33,6 +33,8 @@ # Define const USAGE="usage: run.sh " +AWSHost="arn:aws:secretsmanager:us-east-1:180635532705:secret:unit-test/endpoint-HSpeEu" + AWSMutualAuth_TodWorker_private_key="arn:aws:secretsmanager:us-east-1:180635532705:secret:ci/mqtt5/us/Mqtt5Prod/key-kqgyvf" AWSMutualAuth_TodWorker_certificate="arn:aws:secretsmanager:us-east-1:180635532705:secret:ci/mqtt5/us/Mqtt5Prod/cert-VDI1Gd" @@ -49,6 +51,7 @@ CREDENTIAL_DIR="./test-integration/Credentials/" TEST_DIR="./test-integration/IntegrationTests/" CA_CERT_URL="https://www.amazontrust.com/repository/AmazonRootCA1.pem" CA_CERT_PATH=${CREDENTIAL_DIR}rootCA.crt +Host=$(python ${RetrieveAWSKeys} ${AWSHost}) @@ -142,7 +145,7 @@ else "IntegrationTestJobsClient.py") Scale="" esac - python ${TEST_DIR}${file} ${TestMode} ${Scale} + python ${TEST_DIR}${file} ${TestMode} ${Host} ${Scale} currentTestStatus=$? echo "[SUB] Test: ${file} completed. Exiting with status: ${currentTestStatus}" if [ ${currentTestStatus} -ne 0 ]; then