The environment variable for enabling the FAAS-mode has now preferenc…

…e over the configuration file setting.

ctt-server/models/deployment.py

@@ -91,7 +91,14 @@ def deploy(self):
         time.sleep(30)
 
         envFaasScenario = os.getenv('CTT_FAAS_ENABLED')
-        if (envFaasScenario and envFaasScenario == "1") or FaasScenario:
+        faas_mode = False
+        if envFaasScenario:
+            if envFaasScenario == "1":
+                faas_mode = True
+        elif FaasScenario:
+            faas_mode = True
+
+        if faas_mode:
             # FaaS scenario
             deployed_systems = Deployment.deployment_workaround(exclude_sut=True)
             self.sut_hostname = self.__test_artifact.policy_yaml['properties']['hostname']

ctt-server/util/configuration.py

@@ -3,4 +3,4 @@
 SUTFile = 'sut_tosca.yaml'
 TIFile = 'ti_tosca.yaml'
 DropPolicies = True
-FaasScenario = True
+FaasScenario = False