Change emulator example to exploit env file

Author: aletundo

Diff for: dfaasagent.env

@@ -22,7 +22,7 @@ AGENT_HAPROXY_CONFIG_FILE="/etc/haproxy/haproxy.cfg"
 AGENT_HAPROXY_CONFIG_UPDATE_COMMAND="/usr/bin/systemctl restart haproxy.service"
 AGENT_HAPROXY_HOST=127.0.0.1
 AGENT_HAPROXY_PORT=80
-AGENT_HA_SOCK_PATH="unix:///run/haproxy/admin.sock"
+AGENT_HAPROXY_SOCK_PATH="unix:///run/haproxy/admin.sock"
 
 AGENT_OPENFAAS_HOST=127.0.0.1
 AGENT_OPENFAAS_PORT=8080

Diff for: dfaasagent/agent/config/config.go

@@ -35,7 +35,7 @@ type Configuration struct {
 	HAProxyConfigUpdateCommand string `mapstructure:"AGENT_HAPROXY_CONFIG_UPDATE_COMMAND"`
 	HAProxyHost                string `mapstructure:"AGENT_HAPROXY_HOST"`
 	HAProxyPort                uint   `mapstructure:"AGENT_HAPROXY_PORT"`
-	HAProxySockPath            string `mapstructure:"AGENT_HA_SOCK_PATH"`
+	HAProxySockPath            string `mapstructure:"AGENT_HAPROXY_SOCK_PATH"`
 
 	OpenFaaSHost string `mapstructure:"AGENT_OPENFAAS_HOST"`
 	OpenFaaSPort uint   `mapstructure:"AGENT_OPENFAAS_PORT"`
@@ -60,8 +60,6 @@ func LoadConfig(path string) (config Configuration, err error) {
 		return
 	}
 
-	viper.Debug()
-
 	err = viper.Unmarshal(&config)
 	return
 }

Diff for: emulator/example.py

@@ -4,18 +4,32 @@
 from mininet.net import Containernet
 from mininet.node import Controller
 from mininet.cli import CLI
-from mininet.link import TCLink
 from mininet.log import info, setLogLevel
+from dotenv import dotenv_values
+import copy
+
+
+def prepare_env(env, ip):
+    _env = copy.deepcopy(env)
+    _env['AGENT_LISTEN'] = '/ip4/{}/tcp/6000'.format(ip)
+    _env['AGENT_HAPROXY_HOST'] = ip
+    return _env
+
+
+agent_env = dotenv_values('../dfaasagent.env')
 
 setLogLevel('info')
 
 net = Containernet(controller=Controller)
 net.addController('c0')
 
 info('*** Adding container\n')
-n1 = net.addDocker('n1', ip='10.0.0.1', dcmd='/sbin/init --log-level=err', dimage="dfaas-node:latest", runtime='sysbox-runc', environment={"AGENT_IPV4": "10.0.0.1"})
-n2 = net.addDocker('n2', ip='10.0.0.2', dcmd='/sbin/init --log-level=err', dimage="dfaas-node:latest", runtime='sysbox-runc', environment={"AGENT_IPV4": "10.0.0.2"})
-n3 = net.addDocker('n3', ip='10.0.0.3', dcmd='/sbin/init --log-level=err', dimage="dfaas-node:latest", runtime='sysbox-runc', environment={"AGENT_IPV4": "10.0.0.3"})
+n1 = net.addDocker('n1', ip='10.0.0.1', dcmd='./entrypoint.sh', dimage="dfaas-node:latest", runtime='sysbox-runc',
+                   environment=prepare_env(agent_env, '10.0.0.1'))
+n2 = net.addDocker('n2', ip='10.0.0.2', dcmd='./entrypoint.sh', dimage="dfaas-node:latest", runtime='sysbox-runc',
+                   environment=prepare_env(agent_env, '10.0.0.2'))
+n3 = net.addDocker('n3', ip='10.0.0.3', dcmd='./entrypoint.sh', dimage="dfaas-node:latest", runtime='sysbox-runc',
+                   environment=prepare_env(agent_env, '10.0.0.3'))
 
 info('*** Setup network\n')
 s1 = net.addSwitch('s1')
@@ -28,4 +42,4 @@
 
 CLI(net)
 
-net.stop()
+net.stop()

Diff for: emulator/requirements.txt

@@ -0,0 +1 @@
+dotenv==0.20.*