Skip to content

Commit c7fe212

Browse files
Santhosh EdukullaSrikanteswaraRao Talluri
Santhosh Edukulla
authored and
SrikanteswaraRao Talluri
committed
CLOUDSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
1 parent 39c201a commit c7fe212

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+114
-114
lines changed

‎test/integration/component/maint/test_egress_rules_host_maintenance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from nose.plugins.attrib import attr
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
25-
from marvin.remoteSSHClient import remoteSSHClient
25+
from marvin.sshClient import SshClient
2626
from marvin.integration.lib.utils import *
2727
from marvin.integration.lib.base import *
2828
from marvin.integration.lib.common import *

‎test/integration/component/maint/test_high_availability.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
from marvin.integration.lib.utils import *
2727
from marvin.integration.lib.base import *
2828
from marvin.integration.lib.common import *
29-
from marvin import remoteSSHClient
29+
from marvin.sshClient import SshClient
3030
import datetime
3131

3232

‎test/integration/component/maint/test_vpc_host_maintenance.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from marvin.integration.lib.utils import *
2626
from marvin.integration.lib.base import *
2727
from marvin.integration.lib.common import *
28-
from marvin.remoteSSHClient import remoteSSHClient
28+
from marvin.sshClient import SshClient
2929
import datetime
3030

3131

‎test/integration/component/test_accounts.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from marvin.integration.lib.utils import *
2323
from marvin.integration.lib.base import *
2424
from marvin.integration.lib.common import *
25-
from marvin import remoteSSHClient
25+
from marvin.sshClient import SshClient
2626
from nose.plugins.attrib import attr
2727
from marvin.cloudstackException import cloudstackAPIException
2828

‎test/integration/component/test_affinity_groups.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
from marvin.integration.lib.utils import *
2121
from marvin.integration.lib.base import *
2222
from marvin.integration.lib.common import *
23-
from marvin import remoteSSHClient
23+
from marvin.sshClient import SshClient
2424
from nose.plugins.attrib import attr
2525

2626
class Services:

‎test/integration/component/test_asa1000v_fw.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from marvin.integration.lib.utils import *
2626
from marvin.integration.lib.base import *
2727
from marvin.integration.lib.common import *
28-
from marvin.remoteSSHClient import remoteSSHClient
28+
from marvin.sshClient import SshClient
2929
import datetime
3030

3131

‎test/integration/component/test_baremetal.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import marvin
2121
from marvin.cloudstackTestCase import *
2222
from marvin.cloudstackAPI import *
23-
from marvin import remoteSSHClient
23+
from marvin.sshClient import SshClient
2424
from marvin.integration.lib.utils import *
2525
from marvin.integration.lib.base import *
2626
from marvin.integration.lib.common import *

‎test/integration/component/test_deploy_vm_userdata_reg.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from marvin.integration.lib.utils import *
2424
from marvin.integration.lib.common import *
2525
from nose.plugins.attrib import attr
26-
from marvin import remoteSSHClient
26+
from marvin.sshClient import SshClient
2727
import unittest
2828
import random
2929
import string

‎test/integration/component/test_egress_fw_rules.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
from marvin.cloudstackAPI.createEgressFirewallRule import createEgressFirewallRuleCmd
4040
from marvin.cloudstackAPI.deleteEgressFirewallRule import deleteEgressFirewallRuleCmd
4141

42-
from marvin.remoteSSHClient import remoteSSHClient
42+
from marvin.sshClient import SshClient
4343
import time
4444

4545
class Services:
@@ -270,7 +270,7 @@ def exec_script_on_user_vm(self, script, exec_cmd_params, expected_result, negat
270270
fd.write(expect_script)
271271
fd.close()
272272

273-
ssh = remoteSSHClient(host=sourceip,
273+
ssh = SshClient(host=sourceip,
274274
port=22,
275275
user='root',
276276
passwd=self.services["host_password"])

‎test/integration/component/test_egress_rules.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
from nose.plugins.attrib import attr
2323
from marvin.cloudstackTestCase import *
2424
from marvin.cloudstackAPI import *
25-
from marvin.remoteSSHClient import remoteSSHClient
25+
from marvin.sshClient import SshClient
2626
from marvin.integration.lib.utils import *
2727
from marvin.integration.lib.base import *
2828
from marvin.integration.lib.common import *

0 commit comments

Comments
 (0)