cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject [29/29] git commit: updated refs/heads/master to ec00a6f
Date Fri, 08 Nov 2013 10:34:16 GMT
CLOUSTACK-5099: Utils.py-has-wrong-reference, cleaned it. As well added Uniform naming convention
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ec00a6fb
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ec00a6fb
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ec00a6fb

Branch: refs/heads/master
Commit: ec00a6fb74042259ceea6add676de3f15e642d4a
Parents: 3342a82
Author: Santhosh Edukulla <Santhosh.Edukulla@citrix.com>
Authored: Fri Nov 8 16:02:10 2013 +0530
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Nov 8 16:02:10 2013 +0530

----------------------------------------------------------------------
 .../maint/test_egress_rules_host_maintenance.py |    2 +-
 .../component/maint/test_high_availability.py   |    2 +-
 .../maint/test_vpc_host_maintenance.py          |    2 +-
 test/integration/component/test_accounts.py     |    2 +-
 .../component/test_affinity_groups.py           |    2 +-
 test/integration/component/test_asa1000v_fw.py  |    2 +-
 test/integration/component/test_baremetal.py    |    2 +-
 .../component/test_deploy_vm_userdata_reg.py    |    2 +-
 .../component/test_egress_fw_rules.py           |    4 +-
 test/integration/component/test_egress_rules.py |    2 +-
 test/integration/component/test_eip_elb.py      |   18 +-
 .../component/test_explicit_dedication.py       |    2 +-
 test/integration/component/test_haproxy.py      |    4 +-
 .../component/test_implicit_planner.py          |    2 +-
 .../component/test_netscaler_configs.py         |   16 +-
 test/integration/component/test_netscaler_lb.py |   20 +-
 .../component/test_netscaler_lb_algo.py         |   32 +-
 .../component/test_netscaler_lb_sticky.py       |   20 +-
 .../component/test_netscaler_nw_off.py          |    2 +-
 .../component/test_network_offering.py          |    2 +-
 test/integration/component/test_portable_ip.py  |    6 +-
 .../component/test_project_configs.py           |    2 +-
 .../component/test_project_resources.py         |    2 +-
 .../integration/component/test_project_usage.py |    2 +-
 test/integration/component/test_projects.py     |    2 +-
 .../component/test_security_groups.py           |    6 +-
 .../component/test_snapshot_limits.py           |    2 +-
 test/integration/component/test_stopped_vm.py   |    2 +-
 .../component/test_storage_motion.py            |    2 +-
 test/integration/component/test_templates.py    |    2 +-
 test/integration/component/test_usage.py        |    2 +-
 .../component/test_vm_passwdenabled.py          |    2 +-
 test/integration/component/test_vpc_network.py  |    2 +-
 .../integration/component/test_vpc_offerings.py |    2 +-
 test/integration/component/test_vpc_routers.py  |    2 +-
 .../component/test_vpc_vm_life_cycle.py         |    2 +-
 .../component/test_vpc_vm_life_cycle.py.rej     |   10 +
 .../component/test_vpc_vms_deployment.py        |    2 +-
 test/integration/smoke/test_affinity_groups.py  |    2 +-
 test/integration/smoke/test_loadbalance.py      |    4 +-
 test/integration/smoke/test_network.py          |   10 +-
 test/integration/smoke/test_nic.py              |    2 +-
 test/integration/smoke/test_pvlan.py            |    2 +-
 test/integration/smoke/test_resource_detail.py  |    2 +-
 test/integration/smoke/test_routers.py          |    2 +-
 test/integration/smoke/test_ssvm.py             |    2 +-
 test/integration/smoke/test_templates.py        |    2 +-
 test/integration/smoke/test_volumes.py          |    2 +-
 .../build/lib/marvin/TestCaseExecuteEngine.py   |  102 +
 tools/marvin/build/lib/marvin/__init__.py       |   18 +
 tools/marvin/build/lib/marvin/asyncJobMgr.py    |  261 ++
 .../build/lib/marvin/cloudstackAPI/__init__.py  |   18 +
 .../lib/marvin/cloudstackAPI/activateProject.py |  141 +
 .../marvin/cloudstackAPI/addAccountToProject.py |   40 +
 .../marvin/cloudstackAPI/addBaremetalDhcp.py    |   54 +
 .../marvin/cloudstackAPI/addBaremetalHost.py    |  147 +
 .../addBaremetalPxeKickStartServer.py           |   51 +
 .../cloudstackAPI/addBaremetalPxePingServer.py  |   65 +
 .../cloudstackAPI/addBigSwitchVnsDevice.py      |   45 +
 .../lib/marvin/cloudstackAPI/addCluster.py      |  115 +
 .../build/lib/marvin/cloudstackAPI/addHost.py   |  145 +
 .../lib/marvin/cloudstackAPI/addImageStore.py   |   58 +
 .../lib/marvin/cloudstackAPI/addIpToNic.py      |   44 +
 .../cloudstackAPI/addLdapConfiguration.py       |   39 +
 .../marvin/cloudstackAPI/addNetworkDevice.py    |   35 +
 .../cloudstackAPI/addNetworkServiceProvider.py  |   53 +
 .../cloudstackAPI/addNicToVirtualMachine.py     |  374 ++
 .../marvin/cloudstackAPI/addNiciraNvpDevice.py  |   60 +
 .../build/lib/marvin/cloudstackAPI/addRegion.py |   48 +
 .../marvin/cloudstackAPI/addResourceDetail.py   |   42 +
 .../build/lib/marvin/cloudstackAPI/addS3.py     |   66 +
 .../marvin/cloudstackAPI/addSecondaryStorage.py |   52 +
 .../build/lib/marvin/cloudstackAPI/addSwift.py  |   56 +
 .../marvin/cloudstackAPI/addTrafficMonitor.py   |   49 +
 .../lib/marvin/cloudstackAPI/addTrafficType.py  |   55 +
 .../lib/marvin/cloudstackAPI/addUcsManager.py   |   51 +
 .../lib/marvin/cloudstackAPI/addVpnUser.py      |   57 +
 .../lib/marvin/cloudstackAPI/archiveAlerts.py   |   41 +
 .../lib/marvin/cloudstackAPI/archiveEvents.py   |   41 +
 .../assignToGlobalLoadBalancerRule.py           |   41 +
 .../cloudstackAPI/assignToLoadBalancerRule.py   |   39 +
 .../cloudstackAPI/assignVirtualMachine.py       |  379 ++
 .../marvin/cloudstackAPI/associateIpAddress.py  |  130 +
 .../cloudstackAPI/associateUcsProfileToBlade.py |   48 +
 .../build/lib/marvin/cloudstackAPI/attachIso.py |  372 ++
 .../lib/marvin/cloudstackAPI/attachVolume.py    |  148 +
 .../authorizeSecurityGroupEgress.py             |   71 +
 .../authorizeSecurityGroupIngress.py            |   71 +
 .../build/lib/marvin/cloudstackAPI/baseCmd.py   |   20 +
 .../lib/marvin/cloudstackAPI/baseResponse.py    |   20 +
 .../cloudstackAPI/cancelHostMaintenance.py      |  122 +
 .../cloudstackAPI/cancelStorageMaintenance.py   |   78 +
 .../cloudstackAPI/changeServiceForRouter.py     |  154 +
 .../cloudstackAPI/changeServiceForSystemVm.py   |   89 +
 .../changeServiceForVirtualMachine.py           |  372 ++
 .../marvin/cloudstackAPI/cleanVMReservations.py |   33 +
 .../marvin/cloudstackAPI/cloudstackAPIClient.py | 2513 ++++++++++++
 .../configureInternalLoadBalancerElement.py     |   41 +
 .../configureVirtualRouterElement.py            |   51 +
 .../build/lib/marvin/cloudstackAPI/copyIso.py   |  137 +
 .../lib/marvin/cloudstackAPI/copyTemplate.py    |  137 +
 .../lib/marvin/cloudstackAPI/createAccount.py   |  202 +
 .../marvin/cloudstackAPI/createAffinityGroup.py |   57 +
 .../cloudstackAPI/createAutoScalePolicy.py      |   60 +
 .../cloudstackAPI/createAutoScaleVmGroup.py     |   77 +
 .../cloudstackAPI/createAutoScaleVmProfile.py   |   70 +
 .../lib/marvin/cloudstackAPI/createCondition.py |   62 +
 .../lib/marvin/cloudstackAPI/createCounter.py   |   48 +
 .../marvin/cloudstackAPI/createDiskOffering.py  |   97 +
 .../lib/marvin/cloudstackAPI/createDomain.py    |   54 +
 .../cloudstackAPI/createEgressFirewallRule.py   |   94 +
 .../marvin/cloudstackAPI/createFirewallRule.py  |   94 +
 .../createGlobalLoadBalancerRule.py             |  161 +
 .../marvin/cloudstackAPI/createInstanceGroup.py |   54 +
 .../createInternalLoadBalancerElement.py        |   38 +
 .../cloudstackAPI/createIpForwardingRule.py     |   97 +
 .../cloudstackAPI/createLBHealthCheckPolicy.py  |   75 +
 .../cloudstackAPI/createLBStickinessPolicy.py   |   75 +
 .../marvin/cloudstackAPI/createLoadBalancer.py  |  127 +
 .../cloudstackAPI/createLoadBalancerRule.py     |  116 +
 .../lib/marvin/cloudstackAPI/createNetwork.py   |  251 ++
 .../marvin/cloudstackAPI/createNetworkACL.py    |  101 +
 .../cloudstackAPI/createNetworkACLList.py       |   45 +
 .../cloudstackAPI/createNetworkOffering.py      |  167 +
 .../cloudstackAPI/createPhysicalNetwork.py      |   67 +
 .../build/lib/marvin/cloudstackAPI/createPod.py |   91 +
 .../cloudstackAPI/createPortForwardingRule.py   |  109 +
 .../cloudstackAPI/createPortableIpRange.py      |   85 +
 .../cloudstackAPI/createPrivateGateway.py       |   86 +
 .../lib/marvin/cloudstackAPI/createProject.py   |  148 +
 .../cloudstackAPI/createRemoteAccessVpn.py      |   62 +
 .../marvin/cloudstackAPI/createSSHKeyPair.py    |   44 +
 .../createSecondaryStagingStore.py              |   58 +
 .../marvin/cloudstackAPI/createSecurityGroup.py |  131 +
 .../cloudstackAPI/createServiceOffering.py      |  151 +
 .../lib/marvin/cloudstackAPI/createSnapshot.py  |   97 +
 .../cloudstackAPI/createSnapshotPolicy.py       |   56 +
 .../marvin/cloudstackAPI/createStaticRoute.py   |   80 +
 .../createStorageNetworkIpRange.py              |   63 +
 .../marvin/cloudstackAPI/createStoragePool.py   |  104 +
 .../lib/marvin/cloudstackAPI/createTags.py      |   44 +
 .../lib/marvin/cloudstackAPI/createTemplate.py  |  161 +
 .../lib/marvin/cloudstackAPI/createUser.py      |   87 +
 .../marvin/cloudstackAPI/createVMSnapshot.py    |   72 +
 .../build/lib/marvin/cloudstackAPI/createVPC.py |  413 ++
 .../marvin/cloudstackAPI/createVPCOffering.py   |  109 +
 .../cloudstackAPI/createVirtualRouterElement.py |   50 +
 .../marvin/cloudstackAPI/createVlanIpRange.py   |  107 +
 .../lib/marvin/cloudstackAPI/createVolume.py    |  163 +
 .../marvin/cloudstackAPI/createVpnConnection.py |   75 +
 .../cloudstackAPI/createVpnCustomerGateway.py   |   90 +
 .../marvin/cloudstackAPI/createVpnGateway.py    |   50 +
 .../lib/marvin/cloudstackAPI/createZone.py      |  153 +
 .../lib/marvin/cloudstackAPI/dedicateCluster.py |   49 +
 .../cloudstackAPI/dedicateGuestVlanRange.py     |   61 +
 .../lib/marvin/cloudstackAPI/dedicateHost.py    |   49 +
 .../lib/marvin/cloudstackAPI/dedicatePod.py     |   49 +
 .../cloudstackAPI/dedicatePublicIpRange.py      |   84 +
 .../lib/marvin/cloudstackAPI/dedicateZone.py    |   49 +
 .../lib/marvin/cloudstackAPI/deleteAccount.py   |   36 +
 .../cloudstackAPI/deleteAccountFromProject.py   |   39 +
 .../marvin/cloudstackAPI/deleteAffinityGroup.py |   41 +
 .../lib/marvin/cloudstackAPI/deleteAlerts.py    |   41 +
 .../cloudstackAPI/deleteAutoScalePolicy.py      |   36 +
 .../cloudstackAPI/deleteAutoScaleVmGroup.py     |   36 +
 .../cloudstackAPI/deleteAutoScaleVmProfile.py   |   36 +
 .../cloudstackAPI/deleteBigSwitchVnsDevice.py   |   36 +
 .../lib/marvin/cloudstackAPI/deleteCluster.py   |   36 +
 .../lib/marvin/cloudstackAPI/deleteCondition.py |   36 +
 .../lib/marvin/cloudstackAPI/deleteCounter.py   |   36 +
 .../marvin/cloudstackAPI/deleteDiskOffering.py  |   36 +
 .../lib/marvin/cloudstackAPI/deleteDomain.py    |   38 +
 .../cloudstackAPI/deleteEgressFirewallRule.py   |   36 +
 .../lib/marvin/cloudstackAPI/deleteEvents.py    |   41 +
 .../marvin/cloudstackAPI/deleteFirewallRule.py  |   36 +
 .../deleteGlobalLoadBalancerRule.py             |   36 +
 .../lib/marvin/cloudstackAPI/deleteHost.py      |   40 +
 .../marvin/cloudstackAPI/deleteImageStore.py    |   36 +
 .../marvin/cloudstackAPI/deleteInstanceGroup.py |   36 +
 .../cloudstackAPI/deleteIpForwardingRule.py     |   36 +
 .../build/lib/marvin/cloudstackAPI/deleteIso.py |   38 +
 .../cloudstackAPI/deleteLBHealthCheckPolicy.py  |   36 +
 .../cloudstackAPI/deleteLBStickinessPolicy.py   |   36 +
 .../cloudstackAPI/deleteLdapConfiguration.py    |   36 +
 .../marvin/cloudstackAPI/deleteLoadBalancer.py  |   36 +
 .../cloudstackAPI/deleteLoadBalancerRule.py     |   36 +
 .../lib/marvin/cloudstackAPI/deleteNetwork.py   |   36 +
 .../marvin/cloudstackAPI/deleteNetworkACL.py    |   36 +
 .../cloudstackAPI/deleteNetworkACLList.py       |   36 +
 .../marvin/cloudstackAPI/deleteNetworkDevice.py |   36 +
 .../cloudstackAPI/deleteNetworkOffering.py      |   36 +
 .../deleteNetworkServiceProvider.py             |   36 +
 .../cloudstackAPI/deleteNiciraNvpDevice.py      |   36 +
 .../cloudstackAPI/deletePhysicalNetwork.py      |   36 +
 .../build/lib/marvin/cloudstackAPI/deletePod.py |   36 +
 .../cloudstackAPI/deletePortForwardingRule.py   |   36 +
 .../cloudstackAPI/deletePortableIpRange.py      |   36 +
 .../cloudstackAPI/deletePrivateGateway.py       |   36 +
 .../lib/marvin/cloudstackAPI/deleteProject.py   |   36 +
 .../cloudstackAPI/deleteProjectInvitation.py    |   36 +
 .../cloudstackAPI/deleteRemoteAccessVpn.py      |   36 +
 .../marvin/cloudstackAPI/deleteSSHKeyPair.py    |   42 +
 .../deleteSecondaryStagingStore.py              |   36 +
 .../marvin/cloudstackAPI/deleteSecurityGroup.py |   43 +
 .../cloudstackAPI/deleteServiceOffering.py      |   36 +
 .../lib/marvin/cloudstackAPI/deleteSnapshot.py  |   36 +
 .../cloudstackAPI/deleteSnapshotPolicies.py     |   37 +
 .../marvin/cloudstackAPI/deleteStaticRoute.py   |   36 +
 .../deleteStorageNetworkIpRange.py              |   36 +
 .../marvin/cloudstackAPI/deleteStoragePool.py   |   38 +
 .../lib/marvin/cloudstackAPI/deleteTags.py      |   41 +
 .../lib/marvin/cloudstackAPI/deleteTemplate.py  |   38 +
 .../cloudstackAPI/deleteTrafficMonitor.py       |   36 +
 .../marvin/cloudstackAPI/deleteTrafficType.py   |   36 +
 .../lib/marvin/cloudstackAPI/deleteUser.py      |   36 +
 .../marvin/cloudstackAPI/deleteVMSnapshot.py    |   36 +
 .../build/lib/marvin/cloudstackAPI/deleteVPC.py |   36 +
 .../marvin/cloudstackAPI/deleteVPCOffering.py   |   36 +
 .../marvin/cloudstackAPI/deleteVlanIpRange.py   |   36 +
 .../lib/marvin/cloudstackAPI/deleteVolume.py    |   36 +
 .../marvin/cloudstackAPI/deleteVpnConnection.py |   36 +
 .../cloudstackAPI/deleteVpnCustomerGateway.py   |   36 +
 .../marvin/cloudstackAPI/deleteVpnGateway.py    |   36 +
 .../lib/marvin/cloudstackAPI/deleteZone.py      |   36 +
 .../cloudstackAPI/deployVirtualMachine.py       |  421 ++
 .../lib/marvin/cloudstackAPI/destroyRouter.py   |  151 +
 .../lib/marvin/cloudstackAPI/destroySystemVm.py |   86 +
 .../cloudstackAPI/destroyVirtualMachine.py      |  369 ++
 .../build/lib/marvin/cloudstackAPI/detachIso.py |  369 ++
 .../lib/marvin/cloudstackAPI/detachVolume.py    |  146 +
 .../lib/marvin/cloudstackAPI/disableAccount.py  |  179 +
 .../cloudstackAPI/disableAutoScaleVmGroup.py    |   60 +
 .../marvin/cloudstackAPI/disableStaticNat.py    |   36 +
 .../lib/marvin/cloudstackAPI/disableUser.py     |   66 +
 .../cloudstackAPI/disassociateIpAddress.py      |   36 +
 .../lib/marvin/cloudstackAPI/enableAccount.py   |  176 +
 .../cloudstackAPI/enableAutoScaleVmGroup.py     |   60 +
 .../lib/marvin/cloudstackAPI/enableStaticNat.py |   43 +
 .../cloudstackAPI/enableStorageMaintenance.py   |   78 +
 .../lib/marvin/cloudstackAPI/enableUser.py      |   66 +
 .../lib/marvin/cloudstackAPI/extractIso.py      |   65 +
 .../lib/marvin/cloudstackAPI/extractTemplate.py |   65 +
 .../lib/marvin/cloudstackAPI/extractVolume.py   |   66 +
 .../cloudstackAPI/findHostsForMigration.py      |  126 +
 .../findStoragePoolsForMigration.py             |   84 +
 .../cloudstackAPI/generateUsageRecords.py       |   41 +
 .../lib/marvin/cloudstackAPI/getApiLimit.py     |   39 +
 .../marvin/cloudstackAPI/getCloudIdentifier.py  |   38 +
 .../build/lib/marvin/cloudstackAPI/getUser.py   |   66 +
 .../lib/marvin/cloudstackAPI/getVMPassword.py   |   34 +
 .../marvin/cloudstackAPI/ldapCreateAccount.py   |  190 +
 .../lib/marvin/cloudstackAPI/listAccounts.py    |  192 +
 .../cloudstackAPI/listAffinityGroupTypes.py     |   37 +
 .../marvin/cloudstackAPI/listAffinityGroups.py  |   67 +
 .../lib/marvin/cloudstackAPI/listAlerts.py      |   47 +
 .../build/lib/marvin/cloudstackAPI/listApis.py  |   75 +
 .../lib/marvin/cloudstackAPI/listAsyncJobs.py   |   69 +
 .../cloudstackAPI/listAutoScalePolicies.py      |   71 +
 .../cloudstackAPI/listAutoScaleVmGroups.py      |   83 +
 .../cloudstackAPI/listAutoScaleVmProfiles.py    |   75 +
 .../marvin/cloudstackAPI/listBaremetalDhcp.py   |   49 +
 .../cloudstackAPI/listBaremetalPxeServers.py    |   45 +
 .../cloudstackAPI/listBigSwitchVnsDevices.py    |   49 +
 .../marvin/cloudstackAPI/listCapabilities.py    |   49 +
 .../lib/marvin/cloudstackAPI/listCapacity.py    |   67 +
 .../lib/marvin/cloudstackAPI/listClusters.py    |  102 +
 .../lib/marvin/cloudstackAPI/listConditions.py  |   69 +
 .../marvin/cloudstackAPI/listConfigurations.py  |   59 +
 .../lib/marvin/cloudstackAPI/listCounters.py    |   51 +
 .../cloudstackAPI/listDedicatedClusters.py      |   55 +
 .../listDedicatedGuestVlanRanges.py             |   67 +
 .../marvin/cloudstackAPI/listDedicatedHosts.py  |   55 +
 .../marvin/cloudstackAPI/listDedicatedPods.py   |   55 +
 .../marvin/cloudstackAPI/listDedicatedZones.py  |   55 +
 .../cloudstackAPI/listDeploymentPlanners.py     |   37 +
 .../marvin/cloudstackAPI/listDiskOfferings.py   |   77 +
 .../marvin/cloudstackAPI/listDomainChildren.py  |   59 +
 .../lib/marvin/cloudstackAPI/listDomains.py     |   59 +
 .../cloudstackAPI/listEgressFirewallRules.py    |  102 +
 .../lib/marvin/cloudstackAPI/listEventTypes.py  |   31 +
 .../lib/marvin/cloudstackAPI/listEvents.py      |   85 +
 .../marvin/cloudstackAPI/listFirewallRules.py   |   98 +
 .../listGlobalLoadBalancerRules.py              |  161 +
 .../build/lib/marvin/cloudstackAPI/listHosts.py |  147 +
 .../cloudstackAPI/listHypervisorCapabilities.py |   55 +
 .../lib/marvin/cloudstackAPI/listHypervisors.py |   33 +
 .../lib/marvin/cloudstackAPI/listImageStores.py |   63 +
 .../marvin/cloudstackAPI/listInstanceGroups.py  |   65 +
 .../listInternalLoadBalancerElements.py         |   47 +
 .../listInternalLoadBalancerVMs.py              |  182 +
 .../cloudstackAPI/listIpForwardingRules.py      |  104 +
 .../marvin/cloudstackAPI/listIsoPermissions.py  |   42 +
 .../build/lib/marvin/cloudstackAPI/listIsos.py  |  162 +
 .../cloudstackAPI/listLBHealthCheckPolicies.py  |   69 +
 .../cloudstackAPI/listLBStickinessPolicies.py   |   71 +
 .../cloudstackAPI/listLdapConfigurations.py     |   43 +
 .../lib/marvin/cloudstackAPI/listLdapUsers.py   |   47 +
 .../listLoadBalancerRuleInstances.py            |  377 ++
 .../cloudstackAPI/listLoadBalancerRules.py      |  118 +
 .../marvin/cloudstackAPI/listLoadBalancers.py   |  132 +
 .../marvin/cloudstackAPI/listNetworkACLLists.py |   51 +
 .../lib/marvin/cloudstackAPI/listNetworkACLs.py |  108 +
 .../marvin/cloudstackAPI/listNetworkDevice.py   |   41 +
 .../listNetworkIsolationMethods.py              |   37 +
 .../cloudstackAPI/listNetworkOfferings.py       |  166 +
 .../listNetworkServiceProviders.py              |   55 +
 .../lib/marvin/cloudstackAPI/listNetworks.py    |  243 ++
 .../listNiciraNvpDeviceNetworks.py              |  208 +
 .../cloudstackAPI/listNiciraNvpDevices.py       |   53 +
 .../build/lib/marvin/cloudstackAPI/listNics.py  |   72 +
 .../marvin/cloudstackAPI/listOsCategories.py    |   43 +
 .../lib/marvin/cloudstackAPI/listOsTypes.py     |   47 +
 .../cloudstackAPI/listPhysicalNetworks.py       |   61 +
 .../build/lib/marvin/cloudstackAPI/listPods.py  |   88 +
 .../cloudstackAPI/listPortForwardingRules.py    |  104 +
 .../cloudstackAPI/listPortableIpRanges.py       |   78 +
 .../marvin/cloudstackAPI/listPrivateGateways.py |   89 +
 .../marvin/cloudstackAPI/listProjectAccounts.py |  151 +
 .../cloudstackAPI/listProjectInvitations.py     |   67 +
 .../lib/marvin/cloudstackAPI/listProjects.py    |  162 +
 .../cloudstackAPI/listPublicIpAddresses.py      |  156 +
 .../lib/marvin/cloudstackAPI/listRegions.py     |   49 +
 .../cloudstackAPI/listRemoteAccessVpns.py       |   70 +
 .../marvin/cloudstackAPI/listResourceDetails.py |   71 +
 .../marvin/cloudstackAPI/listResourceLimits.py  |   63 +
 .../lib/marvin/cloudstackAPI/listRouters.py     |  182 +
 .../build/lib/marvin/cloudstackAPI/listS3s.py   |   53 +
 .../lib/marvin/cloudstackAPI/listSSHKeyPairs.py |   55 +
 .../cloudstackAPI/listSecondaryStagingStores.py |   63 +
 .../marvin/cloudstackAPI/listSecurityGroups.py  |  144 +
 .../cloudstackAPI/listServiceOfferings.py       |  124 +
 .../cloudstackAPI/listSnapshotPolicies.py       |   50 +
 .../lib/marvin/cloudstackAPI/listSnapshots.py   |  118 +
 .../marvin/cloudstackAPI/listStaticRoutes.py    |   98 +
 .../cloudstackAPI/listStorageNetworkIpRange.py  |   59 +
 .../marvin/cloudstackAPI/listStoragePools.py    |   97 +
 .../cloudstackAPI/listStorageProviders.py       |   42 +
 .../listSupportedNetworkServices.py             |   71 +
 .../lib/marvin/cloudstackAPI/listSwifts.py      |   55 +
 .../lib/marvin/cloudstackAPI/listSystemVms.py   |  105 +
 .../build/lib/marvin/cloudstackAPI/listTags.py  |   75 +
 .../cloudstackAPI/listTemplatePermissions.py    |   42 +
 .../lib/marvin/cloudstackAPI/listTemplates.py   |  157 +
 .../marvin/cloudstackAPI/listTrafficMonitors.py |   48 +
 .../listTrafficTypeImplementors.py              |   41 +
 .../marvin/cloudstackAPI/listTrafficTypes.py    |   52 +
 .../lib/marvin/cloudstackAPI/listUcsBlades.py   |   48 +
 .../lib/marvin/cloudstackAPI/listUcsManagers.py |   47 +
 .../lib/marvin/cloudstackAPI/listUcsProfiles.py |   40 +
 .../marvin/cloudstackAPI/listUsageRecords.py    |  101 +
 .../lib/marvin/cloudstackAPI/listUsageTypes.py  |   33 +
 .../build/lib/marvin/cloudstackAPI/listUsers.py |   85 +
 .../lib/marvin/cloudstackAPI/listVMSnapshot.py  |   89 +
 .../marvin/cloudstackAPI/listVPCOfferings.py    |  116 +
 .../build/lib/marvin/cloudstackAPI/listVPCs.py  |  426 +++
 .../marvin/cloudstackAPI/listVirtualMachines.py |  416 ++
 .../cloudstackAPI/listVirtualRouterElements.py  |   57 +
 .../marvin/cloudstackAPI/listVlanIpRanges.py    |   99 +
 .../lib/marvin/cloudstackAPI/listVolumes.py     |  172 +
 .../marvin/cloudstackAPI/listVpnConnections.py  |   89 +
 .../cloudstackAPI/listVpnCustomerGateways.py    |   81 +
 .../lib/marvin/cloudstackAPI/listVpnGateways.py |   67 +
 .../lib/marvin/cloudstackAPI/listVpnUsers.py    |   65 +
 .../build/lib/marvin/cloudstackAPI/listZones.py |  141 +
 .../lib/marvin/cloudstackAPI/lockAccount.py     |  176 +
 .../build/lib/marvin/cloudstackAPI/lockUser.py  |   66 +
 .../build/lib/marvin/cloudstackAPI/login.py     |   63 +
 .../build/lib/marvin/cloudstackAPI/logout.py    |   31 +
 .../cloudstackAPI/markDefaultZoneForAccount.py  |  179 +
 .../lib/marvin/cloudstackAPI/migrateSystemVm.py |   89 +
 .../cloudstackAPI/migrateVirtualMachine.py      |  373 ++
 .../migrateVirtualMachineWithVolume.py          |  374 ++
 .../lib/marvin/cloudstackAPI/migrateVolume.py   |  148 +
 .../cloudstackAPI/prepareHostForMaintenance.py  |  122 +
 .../lib/marvin/cloudstackAPI/prepareTemplate.py |  134 +
 .../marvin/cloudstackAPI/queryAsyncJobResult.py |   56 +
 .../lib/marvin/cloudstackAPI/rebootRouter.py    |  151 +
 .../lib/marvin/cloudstackAPI/rebootSystemVm.py  |   86 +
 .../cloudstackAPI/rebootVirtualMachine.py       |  369 ++
 .../lib/marvin/cloudstackAPI/reconnectHost.py   |  122 +
 .../cloudstackAPI/recoverVirtualMachine.py      |  369 ++
 .../lib/marvin/cloudstackAPI/registerIso.py     |  162 +
 .../marvin/cloudstackAPI/registerSSHKeyPair.py  |   47 +
 .../marvin/cloudstackAPI/registerTemplate.py    |  179 +
 .../marvin/cloudstackAPI/registerUserKeys.py    |   36 +
 .../cloudstackAPI/releaseDedicatedCluster.py    |   36 +
 .../releaseDedicatedGuestVlanRange.py           |   36 +
 .../cloudstackAPI/releaseDedicatedHost.py       |   36 +
 .../marvin/cloudstackAPI/releaseDedicatedPod.py |   36 +
 .../cloudstackAPI/releaseDedicatedZone.py       |   36 +
 .../cloudstackAPI/releaseHostReservation.py     |   36 +
 .../cloudstackAPI/releasePublicIpRange.py       |   36 +
 .../removeFromGlobalLoadBalancerRule.py         |   39 +
 .../cloudstackAPI/removeFromLoadBalancerRule.py |   39 +
 .../lib/marvin/cloudstackAPI/removeIpFromNic.py |   36 +
 .../removeNicFromVirtualMachine.py              |  372 ++
 .../lib/marvin/cloudstackAPI/removeRegion.py    |   36 +
 .../cloudstackAPI/removeResourceDetail.py       |   41 +
 .../lib/marvin/cloudstackAPI/removeVpnUser.py   |   42 +
 .../cloudstackAPI/replaceNetworkACLList.py      |   40 +
 .../lib/marvin/cloudstackAPI/resetApiLimit.py   |   41 +
 .../resetPasswordForVirtualMachine.py           |  369 ++
 .../resetSSHKeyForVirtualMachine.py             |  378 ++
 .../marvin/cloudstackAPI/resetVpnConnection.py  |   76 +
 .../lib/marvin/cloudstackAPI/resizeVolume.py    |  148 +
 .../lib/marvin/cloudstackAPI/restartNetwork.py  |  119 +
 .../lib/marvin/cloudstackAPI/restartVPC.py      |  393 ++
 .../cloudstackAPI/restoreVirtualMachine.py      |  371 ++
 .../lib/marvin/cloudstackAPI/revertSnapshot.py  |   91 +
 .../marvin/cloudstackAPI/revertToVMSnapshot.py  |  369 ++
 .../cloudstackAPI/revokeSecurityGroupEgress.py  |   36 +
 .../cloudstackAPI/revokeSecurityGroupIngress.py |   36 +
 .../lib/marvin/cloudstackAPI/scaleSystemVm.py   |   89 +
 .../marvin/cloudstackAPI/scaleVirtualMachine.py |   39 +
 .../startInternalLoadBalancerVM.py              |  151 +
 .../lib/marvin/cloudstackAPI/startRouter.py     |  151 +
 .../lib/marvin/cloudstackAPI/startSystemVm.py   |   86 +
 .../marvin/cloudstackAPI/startVirtualMachine.py |  371 ++
 .../cloudstackAPI/stopInternalLoadBalancerVM.py |  153 +
 .../lib/marvin/cloudstackAPI/stopRouter.py      |  153 +
 .../lib/marvin/cloudstackAPI/stopSystemVm.py    |   88 +
 .../marvin/cloudstackAPI/stopVirtualMachine.py  |  371 ++
 .../lib/marvin/cloudstackAPI/suspendProject.py  |  141 +
 .../lib/marvin/cloudstackAPI/updateAccount.py   |  183 +
 .../cloudstackAPI/updateAutoScalePolicy.py      |   58 +
 .../cloudstackAPI/updateAutoScaleVmGroup.py     |   70 +
 .../cloudstackAPI/updateAutoScaleVmProfile.py   |   64 +
 .../lib/marvin/cloudstackAPI/updateCluster.py   |   91 +
 .../marvin/cloudstackAPI/updateConfiguration.py |   54 +
 .../updateDefaultNicForVirtualMachine.py        |  372 ++
 .../marvin/cloudstackAPI/updateDiskOffering.py  |   76 +
 .../lib/marvin/cloudstackAPI/updateDomain.py    |   52 +
 .../updateGlobalLoadBalancerRule.py             |  148 +
 .../lib/marvin/cloudstackAPI/updateHost.py      |  130 +
 .../marvin/cloudstackAPI/updateHostPassword.py  |   43 +
 .../updateHypervisorCapabilities.py             |   51 +
 .../marvin/cloudstackAPI/updateInstanceGroup.py |   50 +
 .../build/lib/marvin/cloudstackAPI/updateIso.py |  149 +
 .../cloudstackAPI/updateIsoPermissions.py       |   48 +
 .../cloudstackAPI/updateLoadBalancerRule.py     |   97 +
 .../lib/marvin/cloudstackAPI/updateNetwork.py   |  216 ++
 .../cloudstackAPI/updateNetworkACLItem.py       |   99 +
 .../cloudstackAPI/updateNetworkOffering.py      |  140 +
 .../updateNetworkServiceProvider.py             |   50 +
 .../cloudstackAPI/updatePhysicalNetwork.py      |   60 +
 .../build/lib/marvin/cloudstackAPI/updatePod.py |   87 +
 .../cloudstackAPI/updatePortForwardingRule.py   |   98 +
 .../lib/marvin/cloudstackAPI/updateProject.py   |  145 +
 .../cloudstackAPI/updateProjectInvitation.py    |   42 +
 .../lib/marvin/cloudstackAPI/updateRegion.py    |   46 +
 .../marvin/cloudstackAPI/updateResourceCount.py |   52 +
 .../marvin/cloudstackAPI/updateResourceLimit.py |   54 +
 .../cloudstackAPI/updateServiceOffering.py      |  113 +
 .../updateStorageNetworkIpRange.py              |   58 +
 .../marvin/cloudstackAPI/updateStoragePool.py   |   84 +
 .../lib/marvin/cloudstackAPI/updateTemplate.py  |  149 +
 .../cloudstackAPI/updateTemplatePermissions.py  |   48 +
 .../marvin/cloudstackAPI/updateTrafficType.py   |   50 +
 .../lib/marvin/cloudstackAPI/updateUser.py      |   82 +
 .../cloudstackAPI/updateVMAffinityGroup.py      |  373 ++
 .../build/lib/marvin/cloudstackAPI/updateVPC.py |  398 ++
 .../marvin/cloudstackAPI/updateVPCOffering.py   |  107 +
 .../cloudstackAPI/updateVirtualMachine.py       |  383 ++
 .../lib/marvin/cloudstackAPI/updateVolume.py    |  150 +
 .../cloudstackAPI/updateVpnCustomerGateway.py   |   93 +
 .../lib/marvin/cloudstackAPI/updateZone.py      |  154 +
 .../cloudstackAPI/uploadCustomCertificate.py    |   43 +
 .../lib/marvin/cloudstackAPI/uploadVolume.py    |  162 +
 .../build/lib/marvin/cloudstackConnection.py    |  235 ++
 .../build/lib/marvin/cloudstackException.py     |   48 +
 .../build/lib/marvin/cloudstackTestCase.py      |   40 +
 .../build/lib/marvin/cloudstackTestClient.py    |  201 +
 tools/marvin/build/lib/marvin/codegenerator.py  |  463 +++
 .../marvin/build/lib/marvin/configGenerator.py  |  870 +++++
 tools/marvin/build/lib/marvin/dbConnection.py   |   86 +
 tools/marvin/build/lib/marvin/deployAndRun.py   |   96 +
 .../marvin/build/lib/marvin/deployDataCenter.py |  625 +++
 .../build/lib/marvin/integration/__init__.py    |   18 +
 .../lib/marvin/integration/lib/__init__.py      |   16 +
 .../build/lib/marvin/integration/lib/base.py    | 3593 ++++++++++++++++++
 .../build/lib/marvin/integration/lib/common.py  |  739 ++++
 .../build/lib/marvin/integration/lib/utils.py   |  320 ++
 tools/marvin/build/lib/marvin/jsonHelper.py     |  381 ++
 tools/marvin/build/lib/marvin/marvinPlugin.py   |  144 +
 .../marvin/build/lib/marvin/remoteSSHClient.py  |  108 +
 .../marvin/build/lib/marvin/sandbox/__init__.py |   18 +
 .../lib/marvin/sandbox/advanced/__init__.py     |   18 +
 .../lib/marvin/sandbox/advanced/advanced_env.py |  167 +
 .../lib/marvin/sandbox/advancedsg/__init__.py   |   18 +
 .../marvin/sandbox/advancedsg/advancedsg_env.py |  151 +
 .../build/lib/marvin/sandbox/basic/__init__.py  |   18 +
 .../build/lib/marvin/sandbox/basic/basic_env.py |  149 +
 .../lib/marvin/sandbox/testSetupSuccess.py      |   81 +
 tools/marvin/build/lib/marvin/settings.py       |   28 +
 .../marvin/build/lib/marvin/testSetupSuccess.py |   98 +
 tools/marvin/marvin/integration/lib/utils.py    |    6 +-
 .../marvin/marvin/integration/lib/utils.py.rej  |   10 +
 tools/marvin/marvin/remoteSSHClient.py          |  182 -
 tools/marvin/marvin/sshClient.py                |  182 +
 499 files changed, 51609 insertions(+), 291 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/maint/test_egress_rules_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_egress_rules_host_maintenance.py b/test/integration/component/maint/test_egress_rules_host_maintenance.py
index 6f0f768..2b81787 100644
--- a/test/integration/component/maint/test_egress_rules_host_maintenance.py
+++ b/test/integration/component/maint/test_egress_rules_host_maintenance.py
@@ -22,7 +22,7 @@ import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/maint/test_high_availability.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_high_availability.py b/test/integration/component/maint/test_high_availability.py
index 7b0f78e..6ada659 100644
--- a/test/integration/component/maint/test_high_availability.py
+++ b/test/integration/component/maint/test_high_availability.py
@@ -26,7 +26,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/maint/test_vpc_host_maintenance.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_vpc_host_maintenance.py b/test/integration/component/maint/test_vpc_host_maintenance.py
index 0946ceb..57dfb4b 100644
--- a/test/integration/component/maint/test_vpc_host_maintenance.py
+++ b/test/integration/component/maint/test_vpc_host_maintenance.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_accounts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py
index 4c73c3a..650a595 100644
--- a/test/integration/component/test_accounts.py
+++ b/test/integration/component/test_accounts.py
@@ -22,7 +22,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 from marvin.cloudstackException import cloudstackAPIException
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_affinity_groups.py b/test/integration/component/test_affinity_groups.py
index ae53e39..7e4fabe 100644
--- a/test/integration/component/test_affinity_groups.py
+++ b/test/integration/component/test_affinity_groups.py
@@ -20,7 +20,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 
 class Services:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_asa1000v_fw.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_asa1000v_fw.py b/test/integration/component/test_asa1000v_fw.py
index 0d8cad0..c8a11ab 100644
--- a/test/integration/component/test_asa1000v_fw.py
+++ b/test/integration/component/test_asa1000v_fw.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_baremetal.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_baremetal.py b/test/integration/component/test_baremetal.py
index c6a877e..2439d0d 100644
--- a/test/integration/component/test_baremetal.py
+++ b/test/integration/component/test_baremetal.py
@@ -20,7 +20,7 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_deploy_vm_userdata_reg.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_deploy_vm_userdata_reg.py b/test/integration/component/test_deploy_vm_userdata_reg.py
index ca9179d..b282a86 100755
--- a/test/integration/component/test_deploy_vm_userdata_reg.py
+++ b/test/integration/component/test_deploy_vm_userdata_reg.py
@@ -23,7 +23,7 @@ from marvin.integration.lib.base import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.common import *
 from nose.plugins.attrib import attr
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 import unittest
 import random
 import string

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_egress_fw_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py
index 253cc46..0aed957 100644
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -39,7 +39,7 @@ from marvin.integration.lib.common import (get_domain,
 from marvin.cloudstackAPI.createEgressFirewallRule import createEgressFirewallRuleCmd
 from marvin.cloudstackAPI.deleteEgressFirewallRule import deleteEgressFirewallRuleCmd
 
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import time
 
 class Services:
@@ -270,7 +270,7 @@ class TestEgressFWRules(cloudstackTestCase):
             fd.write(expect_script)
             fd.close()
 
-            ssh = remoteSSHClient(host=sourceip,
+            ssh = SshClient(host=sourceip,
                                   port=22,
                                   user='root',
                                   passwd=self.services["host_password"])

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_egress_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py
index f8e8e79..34995ff 100644
--- a/test/integration/component/test_egress_rules.py
+++ b/test/integration/component/test_egress_rules.py
@@ -22,7 +22,7 @@ import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_eip_elb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py
index 42a5148..d639d82 100644
--- a/test/integration/component/test_eip_elb.py
+++ b/test/integration/component/test_eip_elb.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 
@@ -314,7 +314,7 @@ class TestEIP(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -458,7 +458,7 @@ class TestEIP(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -657,7 +657,7 @@ class TestEIP(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -871,7 +871,7 @@ class TestEIP(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -1138,7 +1138,7 @@ class TestELB(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -1287,7 +1287,7 @@ class TestELB(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -1366,7 +1366,7 @@ class TestELB(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -1512,7 +1512,7 @@ class TestELB(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_explicit_dedication.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_explicit_dedication.py b/test/integration/component/test_explicit_dedication.py
index bd97551..7aefc21 100644
--- a/test/integration/component/test_explicit_dedication.py
+++ b/test/integration/component/test_explicit_dedication.py
@@ -20,7 +20,7 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_haproxy.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_haproxy.py b/test/integration/component/test_haproxy.py
index 799cfa3..c734012 100644
--- a/test/integration/component/test_haproxy.py
+++ b/test/integration/component/test_haproxy.py
@@ -38,7 +38,7 @@ from marvin.integration.lib.common import (get_domain,
                                         random_gen
                                         )
 from marvin.cloudstackAPI import createLBStickinessPolicy
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 
 
 class Services:
@@ -383,7 +383,7 @@ class TestHAProxyStickyness(cloudstackTestCase):
             # If Round Robin Algorithm is chosen,
             # each ssh command should alternate between VMs
 
-            ssh_1  = remoteSSHClient(
+            ssh_1  = SshClient(
                                     ip_addr,
                                     22,
                                     self.services["natrule"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_implicit_planner.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_implicit_planner.py b/test/integration/component/test_implicit_planner.py
index f233ba9..2b656d9 100644
--- a/test/integration/component/test_implicit_planner.py
+++ b/test/integration/component/test_implicit_planner.py
@@ -20,7 +20,7 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_netscaler_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_configs.py b/test/integration/component/test_netscaler_configs.py
index c10f688..98c4748 100644
--- a/test/integration/component/test_netscaler_configs.py
+++ b/test/integration/component/test_netscaler_configs.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 
@@ -1745,7 +1745,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1891,7 +1891,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
                                     listall=True
                                     )
             nw = network_list[0]
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2051,7 +2051,7 @@ class TestGuestNetworkWithNetScaler(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2249,7 +2249,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2334,7 +2334,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
                                     listall=True
                                     )
             nw = network_list[0]
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2396,7 +2396,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
                                     listall=True
                                     )
             nw = network_list[0]
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2458,7 +2458,7 @@ class TestGuestNetworkShutDown(cloudstackTestCase):
                                     listall=True
                                     )
             nw = network_list[0]
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_netscaler_lb.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb.py b/test/integration/component/test_netscaler_lb.py
index 4b380e9..5a8d6a4 100644
--- a/test/integration/component/test_netscaler_lb.py
+++ b/test/integration/component/test_netscaler_lb.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 
@@ -1228,7 +1228,7 @@ class TestAddMultipleVmsLb(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     22,
                                     self.services["netscaler"]["username"],
@@ -2104,7 +2104,7 @@ class TestLoadBalancingRule(cloudstackTestCase):
 
         self.debug("SSH into Netscaler to verify other resources are deleted")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2430,7 +2430,7 @@ class TestVmWithLb(cloudstackTestCase):
                 )
         self.debug("SSH into Netscaler to verify other resources are deleted")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2523,7 +2523,7 @@ class TestVmWithLb(cloudstackTestCase):
                                         e))
         self.debug("SSH into Netscaler to rules still persist")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2596,7 +2596,7 @@ class TestVmWithLb(cloudstackTestCase):
                                         e))
         self.debug("SSH into Netscaler to rules still persist")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2709,7 +2709,7 @@ class TestVmWithLb(cloudstackTestCase):
                                         e))
         self.debug("SSH into Netscaler to rules still persist")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2797,7 +2797,7 @@ class TestVmWithLb(cloudstackTestCase):
                                         e))
         self.debug("SSH into Netscaler to rules still persist")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2880,7 +2880,7 @@ class TestVmWithLb(cloudstackTestCase):
         time.sleep(int(delay[0].value) + int(wait[0].value))
         self.debug("SSH into Netscaler to rules still persist")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -2936,7 +2936,7 @@ class TestVmWithLb(cloudstackTestCase):
                 )
         self.debug("SSH into Netscaler to verify other resources are deleted")
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_netscaler_lb_algo.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_algo.py b/test/integration/component/test_netscaler_lb_algo.py
index 4df7b89..a5e1fe8 100644
--- a/test/integration/component/test_netscaler_lb_algo.py
+++ b/test/integration/component/test_netscaler_lb_algo.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 
@@ -300,7 +300,7 @@ class TestLbWithRoundRobin(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -524,7 +524,7 @@ class TestLbWithLeastConn(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -739,7 +739,7 @@ class TestLbWithSourceIp(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -912,7 +912,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -945,7 +945,7 @@ class TestLbAlgoRrLc(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1115,7 +1115,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1147,7 +1147,7 @@ class TestLbAlgoLcRr(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1318,7 +1318,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1351,7 +1351,7 @@ class TestLbAlgoRrSb(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1526,7 +1526,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1560,7 +1560,7 @@ class TestLbAlgoSbRr(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1734,7 +1734,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1767,7 +1767,7 @@ class TestLbAlgoSbLc(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1939,7 +1939,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -1972,7 +1972,7 @@ class TestLbAlgoLcSb(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_netscaler_lb_sticky.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_lb_sticky.py b/test/integration/component/test_netscaler_lb_sticky.py
index 56964a9..6c27a08 100644
--- a/test/integration/component/test_netscaler_lb_sticky.py
+++ b/test/integration/component/test_netscaler_lb_sticky.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 
@@ -267,7 +267,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -356,7 +356,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -445,7 +445,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -536,7 +536,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -627,7 +627,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -718,7 +718,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -809,7 +809,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -900,7 +900,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],
@@ -991,7 +991,7 @@ class TestLbStickyPolicy(cloudstackTestCase):
         self.debug("SSH into netscaler: %s" %
                                     self.services["netscaler"]["ipaddress"])
         try:
-            ssh_client = remoteSSHClient(
+            ssh_client = SshClient(
                                     self.services["netscaler"]["ipaddress"],
                                     self.services["netscaler"]["port"],
                                     self.services["netscaler"]["username"],

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_netscaler_nw_off.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_netscaler_nw_off.py b/test/integration/component/test_netscaler_nw_off.py
index b94d47e..3372612 100644
--- a/test/integration/component/test_netscaler_nw_off.py
+++ b/test/integration/component/test_netscaler_nw_off.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_network_offering.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py
index 335f859..04777b0 100644
--- a/test/integration/component/test_network_offering.py
+++ b/test/integration/component/test_network_offering.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_portable_ip.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_portable_ip.py b/test/integration/component/test_portable_ip.py
index 917e7f2..a532b36 100644
--- a/test/integration/component/test_portable_ip.py
+++ b/test/integration/component/test_portable_ip.py
@@ -23,7 +23,7 @@ from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
 from netaddr import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 
 from nose.plugins.attrib import attr
 
@@ -808,7 +808,7 @@ class TestAssociatePublicIp(cloudstackTestCase):
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
 
-            remoteSSHClient(
+           SshClient(
                         portableip.ipaddress.ipaddress,
                         self.services['natrule']["publicport"],
                         self.virtual_machine.username,
@@ -1533,7 +1533,7 @@ class TestPortableIpTransferAcrossNetworks(cloudstackTestCase):
 
             self.debug("Trying to SSH to ip: %s" % portableip.ipaddress.ipaddress)
 
-            remoteSSHClient(
+           SshClient(
                         portableip.ipaddress.ipaddress,
                         self.services['natrule']["publicport"],
                         self.virtual_machine2.username,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_project_configs.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py
index a9654c8..be6cf1c 100644
--- a/test/integration/component/test_project_configs.py
+++ b/test/integration/component/test_project_configs.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_project_resources.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py
index 131a9e2..9b9b2e6 100644
--- a/test/integration/component/test_project_resources.py
+++ b/test/integration/component/test_project_resources.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_project_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py
index e836768..ba0a63c 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_projects.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py
index e4c2180..4b82fc2 100644
--- a/test/integration/component/test_projects.py
+++ b/test/integration/component/test_projects.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_security_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py
index 5ec3ffb..c90ccf6 100644
--- a/test/integration/component/test_security_groups.py
+++ b/test/integration/component/test_security_groups.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 
 #Import System modules
 import time
@@ -361,7 +361,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase):
         # SSH Attempt to VM should fail
         with self.assertRaises(Exception):
             self.debug("SSH into VM: %s" % self.virtual_machine.ssh_ip)
-            ssh = remoteSSHClient.remoteSSHClient(
+            ssh = SshClient(
                                     self.virtual_machine.ssh_ip,
                                     self.virtual_machine.ssh_port,
                                     self.virtual_machine.username,
@@ -656,7 +656,7 @@ class TestRevokeIngressRule(cloudstackTestCase):
         # SSH Attempt to VM should fail
         with self.assertRaises(Exception):
             self.debug("SSH into VM: %s" % self.virtual_machine.id)
-            remoteSSHClient.remoteSSHClient(
+           SshClient(
                                         self.virtual_machine.ssh_ip,
                                         self.virtual_machine.ssh_port,
                                         self.virtual_machine.username,

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_snapshot_limits.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_snapshot_limits.py b/test/integration/component/test_snapshot_limits.py
index 2af77c3..e52a893 100644
--- a/test/integration/component/test_snapshot_limits.py
+++ b/test/integration/component/test_snapshot_limits.py
@@ -21,7 +21,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import is_snapshot_on_nfs
 import os
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_stopped_vm.py b/test/integration/component/test_stopped_vm.py
index 3be9151..5a5c298 100644
--- a/test/integration/component/test_stopped_vm.py
+++ b/test/integration/component/test_stopped_vm.py
@@ -22,7 +22,7 @@ import marvin
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_storage_motion.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py
index 36376f3..bae5acf 100644
--- a/test/integration/component/test_storage_motion.py
+++ b/test/integration/component/test_storage_motion.py
@@ -20,7 +20,7 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_templates.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py
index ea4b277..af86d32 100644
--- a/test/integration/component/test_templates.py
+++ b/test/integration/component/test_templates.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import urllib
 from random import random
 #Import System modules

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_usage.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py
index 75326f7..5979a0a 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -24,7 +24,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vm_passwdenabled.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py
index a6b45ac..5cfa525 100644
--- a/test/integration/component/test_vm_passwdenabled.py
+++ b/test/integration/component/test_vm_passwdenabled.py
@@ -17,7 +17,7 @@
 import marvin
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_network.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network.py b/test/integration/component/test_vpc_network.py
index b9b4f00..9f5e6f6 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 # For more info on ddt refer to http://ddt.readthedocs.org/en/latest/api.html#module-ddt
 from ddt import ddt, data

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_offerings.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_offerings.py b/test/integration/component/test_vpc_offerings.py
index 109c8d1..4f58022 100644
--- a/test/integration/component/test_vpc_offerings.py
+++ b/test/integration/component/test_vpc_offerings.py
@@ -26,7 +26,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_routers.py b/test/integration/component/test_vpc_routers.py
index 9b772e4..8ed99ca 100644
--- a/test/integration/component/test_vpc_routers.py
+++ b/test/integration/component/test_vpc_routers.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_vm_life_cycle.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py
index 5893cc3..cc65eed 100644
--- a/test/integration/component/test_vpc_vm_life_cycle.py
+++ b/test/integration/component/test_vpc_vm_life_cycle.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.codes import PASS
 
 import time

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_vm_life_cycle.py.rej
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vm_life_cycle.py.rej b/test/integration/component/test_vpc_vm_life_cycle.py.rej
new file mode 100644
index 0000000..98d859d
--- /dev/null
+++ b/test/integration/component/test_vpc_vm_life_cycle.py.rej
@@ -0,0 +1,10 @@
+diff a/test/integration/component/test_vpc_vm_life_cycle.py b/test/integration/component/test_vpc_vm_life_cycle.py	(rejected hunks)
+@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
+ from marvin.integration.lib.utils import *
+ from marvin.integration.lib.base import *
+ from marvin.integration.lib.common import *
+-from marvin.remoteSSHClient import remoteSSHClient
++from marvin.sshClient import SshClient
+ 
+ import time
+ 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/component/test_vpc_vms_deployment.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_vms_deployment.py b/test/integration/component/test_vpc_vms_deployment.py
index b01137b..ebf3b31 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -25,7 +25,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin.remoteSSHClient import remoteSSHClient
+from marvin.sshClient import SshClient
 import datetime
 
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/smoke/test_affinity_groups.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py
index db11ada..c96a580 100644
--- a/test/integration/smoke/test_affinity_groups.py
+++ b/test/integration/smoke/test_affinity_groups.py
@@ -21,7 +21,7 @@ from marvin.cloudstackAPI import *
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 from nose.plugins.attrib import attr
 
 class Services:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ec00a6fb/test/integration/smoke/test_loadbalance.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_loadbalance.py b/test/integration/smoke/test_loadbalance.py
index 3e48158..5f80c38 100644
--- a/test/integration/smoke/test_loadbalance.py
+++ b/test/integration/smoke/test_loadbalance.py
@@ -17,7 +17,7 @@
 
 from marvin.cloudstackTestCase import *
 from marvin.cloudstackAPI import *
-from marvin import remoteSSHClient
+from marvin.sshClient import SshClient
 from marvin.integration.lib.utils import *
 from marvin.integration.lib.base import *
 from marvin.integration.lib.common import *
@@ -197,7 +197,7 @@ class TestLoadBalance(cloudstackTestCase):
            # If Round Robin Algorithm is chosen,
             # each ssh command should alternate between VMs
 
-            ssh_1  = remoteSSHClient(
+            ssh_1  = SshClient(
                 ip_addr,
                 self.services['lbrule']["publicport"],
                 self.vm_1.username,


Mime
View raw message