Fixed bug in control agent

doc/MOG.yaml

+version: '3'
+
+services:
+  input:
+    container_name: InputDistributor
+    ports:
+      - "2000:2000/udp"
+    environment:
+      - inPort=2000
+      - multicastAddrIP=225.2.2.0
+      - multicastAddrPort=3000
+      - waitingTime=1000
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/inputdistributor
+
+  input2:
+    container_name: InputDistributor2
+    ports:
+      - "2002:2002/udp"
+    environment:
+      - inPort=2002
+      - multicastAddrIP=225.2.2.2
+      - multicastAddrPort=3002
+      - waitingTime=1000
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/inputdistributor
+
+  proxy:
+    container_name: ProxyTranscoder
+    ports:
+      - "8081:80"
+    environment:
+      - multicastAddrIP=225.2.2.0
+      - multicastAddrPort=3000
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    privileged: true
+
+  proxy2:
+    container_name: ProxyTranscoder2
+    ports:
+      - "8082:80"
+    environment:
+      - multicastAddrIP=225.2.2.2
+      - multicastAddrPort=3002
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    privileged: true
+
+  proxyOut:
+    container_name: ProxyTranscoderOut
+    ports:
+      - "8085:80"
+    environment:
+      - multicastAddrIP=226.2.2.2
+      - multicastAddrPort=6000
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/proxytranscoder
+    privileged: true
+
+  switcher:
+    container_name: VideoSwitcher
+    ports:
+      - "8008:8008"
+    environment:
+      # PROXY 1
+      - multicastAddrIP=225.2.2.0
+      - multicastAddrPort=3000
+      # PROXY 2
+      - multicastAddrIP2=225.2.2.2
+      - multicastAddrPort2=3002
+      # SWITCHER SETTINGS
+      - switcherOutAddrIP=226.2.2.2
+      - switcherOutAddrPort=6000
+      - switcherREST=8008
+      - waitingTime=1000
+      - videoWidth=176
+      - videoHeight=100
+    image: 145.100.133.241:5000/mogswitch/videoswitcher
+
+  output:
+    container_name: OutputTranscoder
+    ports:
+      - "4000:4000"
+    environment:
+      - multicastAddrIP=226.2.2.2
+      - multicastAddrPort=6000
+      - videoWidth=176
+      - videoHeight=100
+      - OutIP=192.168.1.194
+      - OutPort=4000
+    image: 145.100.133.241:5000/mogswitch/outputtranscoder
+    privileged: true

drip-deployer/cluster_file

+54.236.54.229 ubuntu /tmp/1 master
+54.236.54.229 ubuntu /tmp/2 slave

drip-deployer/control_agent.py

@@ -40,7 +40,7 @@ def install_agent(vm, vm_list):
         sftp.put(file_path + "/control_agent.sh", "control_agent.sh")
         stdin, stdout, stderr = ssh.exec_command("sudo sh /tmp/control_agent.sh")
         stdout.read()
-        stdin, stdout, stderr = ssh.exec_command("nohup python /root/Swarm-Agent/run.py>/dev/null 2>&1 &")
+        stdin, stdout, stderr = ssh.exec_command("nohup sudo python /root/Swarm-Agent/run.py>/dev/null 2>&1 &")
         stdout.read()
         print "%s: ========= Control Agent Installed =========" % (vm.ip)
     except Exception as e:

drip-planner/rpc_server.py

@@ -113,15 +113,17 @@ def handleDelivery(message):
         par["url"] = "null"
         par["encoding"] = "UTF-8"
         docker = json1[nodeDic1[value]].get('artifacts').get('docker_image').get('file')
+        name = str(nodeDic1[value])
+        #print("Name: %s Docker: %s" % (name, docker))
         res1["name"] = str(nodeDic1[value])
         res1["size"] = res[str(value)]
         res1["docker"] = str(docker)
-        
-        #v = str("{\\'name\\':\\'"+str(nodeDic1[value])+"\\',\\'size\\':\\'"+res[str(value)]+"\\',\\'docker\\':\\'"+docker+"\\'}")  
         par["value"] = res1
         par["attributes"] = "null"
+        print ("Parameter: %s" % par)
         outcontent["parameters"].append(par)
     
+    print ("Output message: %s" % outcontent)
     return outcontent