Merge pull request #984 from grycap/devel

Devel
grycap · Feb 12, 2020 · 79bac8b · 79bac8b
2 parents 1ac551f + 403bdfe
commit 79bac8b
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/IM/REST.py b/IM/REST.py
@@ -626,18 +626,22 @@ def RESTGetVMProperty(infid=None, vmid=None, prop=None):
                 command = ('curl --insecure -s -H "Authorization: type = InfrastructureManager; %s" '
                            '-H "Accept: text/plain" %s' % (imauth, url))
 
+                ps_command = "ps aux | grep -v grep | grep 'ssh -N -R'"
                 info = """
                 res="wait"
                 while [ "$res" == "wait" ]
                 do
                   res=`%s`
                   if [ "$res" != "wait" ]
                   then
-                    eval "$res"
+                    echo "$res" > /var/tmp/reverse_ssh.sh
+                    chmod a+x /var/tmp/reverse_ssh.sh
+                    echo "*/1 * * * * root %s || /var/tmp/reverse_ssh.sh" > /etc/cron.d/reverse_ssh
+                    /var/tmp/reverse_ssh.sh
                   else
                     sleep 20
                   fi
-                done""" % command
+                done""" % (command, ps_command)
                 logger.debug("Step 1 command: %s" % info)
             elif step == 2:
                 sel_vm = None

diff --git a/changelog b/changelog
@@ -569,3 +569,10 @@ IM 1.9.1:
     * Fix intermittent errors in SSH connections.
     * Fix ssh_connect_errors count must be reset when a ssh connection is ok.
     * Fix check_ctxt_process thread dies and contextalization never ends.
+    * Fix error not setting network_type in TOSCA network.
+    * Enable to mount nvme disks in EC2.
+    * Fix error merging TOSCA documents.
+    * Fix error getting VM errors in the cont msg in case of all VMs has failed.
+    * Fix Error creating OpenStack Network.
+    * Fix error updating VM info in OpenStack conn.
+
diff --git a/test/unit/REST.py b/test/unit/REST.py
@@ -893,18 +893,22 @@ def test_commands(self, bottle_request, check_auth_data, get_infrastructure, SSH
         res = RESTGetVMProperty("1", "1", "command")
         auth_str = "Authorization: type = InfrastructureManager; username = user; password = pass"
         url = "http://imserver.com/infrastructures/1/vms/1/command?step=2"
+        ps_command = "ps aux | grep -v grep | grep 'ssh -N -R'"
         expected_res = """
                 res="wait"
                 while [ "$res" == "wait" ]
                 do
                   res=`curl --insecure -s -H "%s" -H "Accept: text/plain" %s`
                   if [ "$res" != "wait" ]
                   then
-                    eval "$res"
+                    echo "$res" > /var/tmp/reverse_ssh.sh
+                    chmod a+x /var/tmp/reverse_ssh.sh
+                    echo "*/1 * * * * root %s || /var/tmp/reverse_ssh.sh" > /etc/cron.d/reverse_ssh
+                    /var/tmp/reverse_ssh.sh
                   else
                     sleep 20
                   fi
-                done""" % (auth_str, url)
+                done""" % (auth_str, url, ps_command)
         self.assertEqual(res, expected_res)
 
         inf.auth = Authentication([{'type': 'InfrastructureManager', 'token': 'token'}])
@@ -918,11 +922,14 @@ def test_commands(self, bottle_request, check_auth_data, get_infrastructure, SSH
                   res=`curl --insecure -s -H "%s" -H "Accept: text/plain" %s`
                   if [ "$res" != "wait" ]
                   then
-                    eval "$res"
+                    echo "$res" > /var/tmp/reverse_ssh.sh
+                    chmod a+x /var/tmp/reverse_ssh.sh
+                    echo "*/1 * * * * root %s || /var/tmp/reverse_ssh.sh" > /etc/cron.d/reverse_ssh
+                    /var/tmp/reverse_ssh.sh
                   else
                     sleep 20
                   fi
-                done""" % (auth_str, url)
+                done""" % (auth_str, url, ps_command)
         self.assertEqual(res, expected_res)
 
         radl_master = parse_radl("""