Fix running of workload generator in run_uc py

Run uc py still used statefullSet instead of deployment

execution/run_uc.py

@@ -147,6 +147,7 @@ def start_workload_generator(wg_yaml):
         the yaml object.
     """
     print('Start workload generator')
+
     num_sensors = args.dim_value
     wl_max_records = 150000
     # TODO: How is this calculation done?
@@ -157,20 +158,20 @@ def start_workload_generator(wg_yaml):
     # TODO: acces over name of container
     wg_containter = wg_yaml['spec']['template']['spec']['containers'][0]
     wg_containter['image'] = 'theodolite/theodolite-uc' + args.uc_id + \
-        + '-workload-generator:latest'
+        '-workload-generator:latest'
     # TODO: acces over name of attribute
     wg_containter['env'][1]['value'] = str(num_sensors)
     wg_containter['env'][2]['value'] = str(wl_instances)
 
     try:
-        wg_ss = appsApi.create_namespaced_stateful_set(
+        wg_ss = appsApi.create_namespaced_deployment(
             namespace="default",
             body=wg_yaml
         )
-        print("StatefulSet '%s' created." % wg_ss.metadata.name)
+        print("Deployment '%s' created." % wg_ss.metadata.name)
         return wg_ss
     except client.rest.ApiException as e:
-        print("StatefulSet creation error: %s" % e.reason)
+        print("Deployment creation error: %s" % e.reason)
         return wg_yaml
 
 
@@ -277,7 +278,7 @@ def delete_resource(obj, del_func):
             del_func(obj['metadata']['name'], 'default')
         except Exception as e:
             print("Error deleting resource")
-            log.error(e)
+            logging.error(e)
             return
     print('Resource deleted')
 
@@ -293,7 +294,7 @@ def stop_applications(wg, app_svc, app_svc_monitor, app_jmx, app_deploy):
     print('Stop use case application and workload generator')
 
     print('Delete workload generator')
-    delete_resource(wg, appsApi.delete_namespaced_stateful_set)
+    delete_resource(wg, appsApi.delete_namespaced_deployment)
 
     print('Delete app service')
     delete_resource(app_svc, coreApi.delete_namespaced_service)
@@ -392,6 +393,11 @@ def stop_lag_exporter():
     print(output)
     return
 
+# def start():
+#
+#
+# def stop():
+#
 
 def main():
     load_variables()
@@ -400,6 +406,7 @@ def main():
     print('---------------------')
     topics = [('input', args.partitions),
               ('output', args.partitions),
+              ('aggregation-feedback', args.partitions),
               ('configuration', 1)]
     create_topics(topics)
     print('---------------------')

execution/run_uc1.sh

@@ -31,7 +31,7 @@ WL_INSTANCES=$(((NUM_SENSORS + (WL_MAX_RECORDS -1 ))/ WL_MAX_RECORDS))
 
 cat <<EOF >uc-workload-generator/overlay/uc1-workload-generator/set_paramters.yaml
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/run_uc2.sh

@@ -32,7 +32,7 @@ WL_INSTANCES=$(((APPROX_NUM_SENSORS + (WL_MAX_RECORDS -1 ))/ WL_MAX_RECORDS))
 
 cat <<EOF >uc-workload-generator/overlay/uc2-workload-generator/set_paramters.yaml
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/run_uc3.sh

@@ -31,7 +31,7 @@ WL_INSTANCES=$(((NUM_SENSORS + (WL_MAX_RECORDS -1 ))/ WL_MAX_RECORDS))
 
 cat <<EOF >uc-workload-generator/overlay/uc3-workload-generator/set_paramters.yaml
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/run_uc4.sh

@@ -31,7 +31,7 @@ WL_INSTANCES=$(((NUM_SENSORS + (WL_MAX_RECORDS -1 ))/ WL_MAX_RECORDS))
 
 cat <<EOF >uuc-workload-generator/overlay/uc4-workload-generator/set_paramters.yaml
 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/uc-workload-generator/base/workloadGenerator.yaml

@@ -6,7 +6,6 @@ spec:
   selector:
     matchLabels:
       app: titan-ccp-load-generator
-  serviceName: titan-ccp-load-generator
   replicas: 1
   template:
     metadata:
@@ -16,8 +15,15 @@ spec:
       terminationGracePeriodSeconds: 0
       containers:
       - name: workload-generator
-        image: uc-workload-generator:latest
+        image: workload-generator:latest
         env:
+        # Order need to be preserved for run_uc.py
+        - name: NUM_SENSORS
+          value: "25000"
+        - name: INSTANCES
+          value: "1"
+        - name: NUM_NESTED_GROUPS
+          value: "5"
         - name: ZK_HOST
           value: "my-confluent-cp-zookeeper"
         - name: ZK_PORT
@@ -26,10 +32,6 @@ spec:
           value: "my-confluent-cp-kafka:9092"
         - name: SCHEMA_REGISTRY_URL
           value: "http://my-confluent-cp-schema-registry:8081"
-        - name: NUM_SENSORS
-          value: "25000"
-        - name: INSTANCES
-          value: "1"
         - name: POD_NAME
           valueFrom:
             fieldRef:

execution/uc-workload-generator/overlay/uc1-workload-generator/set_paramters.yaml

 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/uc-workload-generator/overlay/uc2-workload-generator/set_paramters.yaml

 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/uc-workload-generator/overlay/uc3-workload-generator/set_paramters.yaml

 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec:

execution/uc-workload-generator/overlay/uc4-workload-generator/set_paramters.yaml

 apiVersion: apps/v1
-kind: StatefulSet
+kind: Deployment
 metadata:
   name: titan-ccp-load-generator
 spec: