Adding traceroute command to Marvin tests

shapeblue · dhlaluku · May 15, 2018 · May 17, 2018 · May 21, 2018 · May 24, 2018
commit 05483de0bcd7fafe26f947fc880c5a38682d1c26
diff --git a/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java b/core/src/main/java/com/cloud/agent/resource/virtualnetwork/VRScripts.java
@@ -69,8 +69,6 @@ public class VRScripts {
 
     public static final String VR_CFG = "vr_cfg.sh";
 
-    // New script for use by remoteDiagnosis API
-    public static final String EXECUTE_ICMP_TOOL_REMOTELY = "execute_icmp_tool_remotely.sh";
+    // New script for use with Remote DIagnostics API
     public static final String DIAGNOSE_SYSTEM_VM = "diagnose_system_vm.py";
-
 }
diff --git a/systemvm/debian/opt/cloud/bin/diagnose_system_vm.py b/systemvm/debian/opt/cloud/bin/diagnose_system_vm.py
@@ -16,7 +16,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-
 import subprocess
 import shlex
 import sys
@@ -27,8 +26,7 @@ class Result(object):
 # Execute shell command
 def run_cmd(command):
     result = Result()
-    final_cmd = shlex.split(command)
-    p = subprocess.Popen(final_cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    p = subprocess.Popen(shlex.split(command), stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     (stdout, stderr) = p.communicate()
 
     result.exit_code = p.returncode
@@ -39,7 +37,7 @@ def run_cmd(command):
     if p.returncode != 0 and result.stderr is not "":
         print('Error executing command [%s]' % command)
         print('stderr: [%s]' % stderr)
-        sys.exit(1)
+        sys.exit(result.exit_code)
 
     print('stdout: [%s]' % result.stdout)
     print('return code: %s' % result.exit_code)

diff --git a/systemvm/debian/opt/cloud/bin/execute_icmp_tool_remotely.sh b/systemvm/debian/opt/cloud/bin/execute_icmp_tool_remotely.sh
diff --git a/test/integration/smoke/test_systemvm_diagnostics.py b/test/integration/smoke/test_systemvm_diagnostics.py
@@ -17,6 +17,7 @@
 """ BVT tests for remote diagnostics of system VMs
 """
 # Import Local Modules
+from marvin.codes import FAILED
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.cloudstackAPI import remoteDiganostics
 from marvin.lib.utils import (cleanup_resources)
@@ -102,8 +103,11 @@ def setUp(self):
 
     def tearDown(self):
         pass
+
     @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
     def test_01_ping_in_system_vm(self):
+
+        # Test with VR
         list_router_response = list_routers(
             self.apiclient
         )
@@ -117,16 +121,64 @@ def test_01_ping_in_system_vm(self):
 
         cmd = remoteDiganostics.remoteDiganosticsCmd()
         cmd.id = router.id
-        cmd.ipaddress = "dkdlglglsmndhjfgke;"
+        cmd.ipaddress = "8.8.8.8;"
         cmd.type = "ping"
         cmd_response = self.apiclient.remoteDiganostics(cmd);
 
         self.assertEqual(True,
                          cmd_response.success,
-                         msg="Ping command not executed successfully")
+                         msg="Failed to exeute remote Ping command in VR"
+                         )
+
+        # Test with SSVM
+        list_ssvm_response = list_ssvms(
+            self.apiclient,
+            systemvmtype='secondarystoragevm',
+            state='Running',
+        )
+
+        self.assertEqual(
+            isinstance(list_ssvm_response, list),
+            True,
+            "Check list response returns a valid list"
+        )
+        ssvm = list_ssvm_response[0]
+
+        self.debug("Setting up SSVM with ID %s" %ssvm.id)
+        cmd.id = ssvm.id
+        ssvm_response = self.apiclient.remoteDiganostics(cmd)
+
+        self.assertEqual(True,
+                         ssvm_response.success,
+                         msg="Failed to execute remote Ping in SSVM"
+                         )
+
+        # Test with CPVM
+        list_cpvm_response = list_ssvms(
+            self.apiclient,
+            systemvmtype='consoleproxy',
+            state='Running',
+        )
+        self.assertEqual(
+            isinstance(list_cpvm_response, list),
+                        True,
+                        "Check list response returns a valid list"
+                        )
+        cpvm = list_cpvm_response[0]
+
+        self.debug("Setting up CPVM with ID %s" %cpvm.id)
+        cmd.id = cpvm.id
+        cpvm_response = self.apiclient.remoteDiganostics(cmd)
+
+        self.assertEqual(True,
+                     cpvm_response.success,
+                     msg="Failed to execute remote Ping in CPVM"
+                         )
 
     @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
     def test_02_traceroute_in_system_vm(self):
+
+        # Test with VR
         list_router_response = list_routers(
             self.apiclient
         )
@@ -140,34 +192,56 @@ def test_02_traceroute_in_system_vm(self):
 
         cmd = remoteDiganostics.remoteDiganosticsCmd()
         cmd.id = router.id
-        cmd.ipaddress = "dkdlglglsmndhjfgke;"
-        cmd.type = "ping"
+        cmd.ipaddress = "8.8.8.8;"
+        cmd.type = "traceroute"
         cmd_response = self.apiclient.remoteDiganostics(cmd);
 
         self.assertEqual(True,
                          cmd_response.success,
-                         msg="Ping command not executed successfully")
-
-    @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="true")
-    def test_03_arping_in_system_vm(self):
-        list_router_response = list_routers(
-            self.apiclient
+                         msg="Failed to exeute remote Traceroute command in VR"
+                         )
+
+        # Test with SSVM
+        list_ssvm_response = list_ssvms(
+            self.apiclient,
+            systemvmtype='secondarystoragevm',
+            state='Running',
         )
+
         self.assertEqual(
-            isinstance(list_router_response, list),
+            isinstance(list_ssvm_response, list),
             True,
             "Check list response returns a valid list"
         )
-        router = list_router_response[0]
-        self.debug("Starting the router with ID: %s" %router.id)
+        ssvm = list_ssvm_response[0]
 
-        cmd = remoteDiganostics.remoteDiganosticsCmd()
-        cmd.id = router.id
-        cmd.ipaddress = "dkdlglglsmndhjfgke;"
-        cmd.type = "ping"
-        cmd_response = self.apiclient.remoteDiganostics(cmd);
+        self.debug("Setting up SSVM with ID %s" %ssvm.id)
+        cmd.id = ssvm.id
+        ssvm_response = self.apiclient.remoteDiganostics(cmd)
 
         self.assertEqual(True,
-                         cmd_response.success,
-                         msg="Ping command not executed successfully")
+                         ssvm_response.success,
+                         msg="Failed to execute remote Traceroute in SSVM"
+                         )
+
+        # Test with CPVM
+        list_cpvm_response = list_ssvms(
+            self.apiclient,
+            systemvmtype='consoleproxy',
+            state='Running',
+        )
+        self.assertEqual(
+            isinstance(list_cpvm_response, list),
+            True,
+            "Check list response returns a valid list"
+        )
+        cpvm = list_cpvm_response[0]
 
+        self.debug("Setting up CPVM with ID %s" %cpvm.id)
+        cmd.id = cpvm.id
+        cpvm_response = self.apiclient.remoteDiganostics(cmd)
+
+        self.assertEqual(True,
+                         cpvm_response.success,
+                         msg="Failed to execute remote Traceroute in CPVM"
+                         )