App subscriptions with parameters (#452)

* remove array brackets for parameters * add additional waiting time for plans * update timings
SAP-samples · Mar 7, 2023 · 90f53e8 · 90f53e8
1 parent e0a6d21
commit 90f53e8
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/libs/python/btp_cli.py b/libs/python/btp_cli.py
@@ -1716,7 +1716,7 @@ def subscribe_app_to_subaccount(btpUsecase: BTPUSECASE, app, plan, parameters):
 
     if parameters is not None:
         # For custom apps a plan can be none - this is safeguarded when checking if account is capable of usecase
-        command = command + " --parameters '[" + dictToString(parameters) + "]'"
+        command = command + " --parameters '" + dictToString(parameters) + "'"
 
     isAlreadySubscribed = checkIfAppIsSubscribed(btpUsecase, app, plan)
     if isAlreadySubscribed is False:

diff --git a/libs/python/helperEnvCF.py b/libs/python/helperEnvCF.py
@@ -281,7 +281,7 @@ def check_if_service_plan_supported_in_cloudfoundry(btpUsecase, service):
 def check_if_service_plan_in_cf_marketplace(btpUsecase, service):
     # Defines how often we should ask CF whether the plan is
     # available or not
-    MAX_TRIES = 6
+    MAX_TRIES = 12
     # Seconds after which we should try again
     SEARCH_EVERY_X_SECONDS = 10
 
@@ -302,7 +302,7 @@ def check_if_service_plan_in_cf_marketplace(btpUsecase, service):
 
     command = "cf marketplace -e " + service.name
 
-    for x in range(1, MAX_TRIES):
+    for x in range(1, MAX_TRIES + 1):
         p = runShellCommand(btpUsecase, command, "INFO", message)
         shellResult = p.stdout.decode()
         jsonResult = convertCloudFoundryCommandOutputToJson(

diff --git a/libs/python/helperEnvironments.py b/libs/python/helperEnvironments.py
@@ -11,9 +11,9 @@ def check_if_service_plan_supported_in_environment(btpUsecase, service, environm
     result = False
     # Defines how often we should ask sapbtp whether the plan is
     # available or not
-    MAX_TRIES = 2
+    MAX_TRIES = 12
     # Seconds after which we should try again
-    SEARCH_EVERY_X_SECONDS = 5
+    SEARCH_EVERY_X_SECONDS = 10
 
     command = (
         "btp --format json list services/plan"
@@ -33,7 +33,7 @@ def check_if_service_plan_supported_in_environment(btpUsecase, service, environm
         + "<"
     )
 
-    for x in range(MAX_TRIES):
+    for x in range(1, MAX_TRIES + 1):
         p = runShellCommand(btpUsecase, command, "INFO", message)
         returnMessage = p.stdout.decode()
         jsonResult = convertStringToJson(returnMessage)