marvin_refactor: make the module structure more relevant and simple

Signed-off-by: Prasanna Santhanam <tsp@apache.org>

tools/marvin/marvin/base/Account.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import enableAccount
 from marvin.cloudstackAPI import lockAccount
 from marvin.cloudstackAPI import createAccount

tools/marvin/marvin/base/Alerts.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listAlerts
 from marvin.cloudstackAPI import deleteAlerts
 

tools/marvin/marvin/base/ApiLimit.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import resetApiLimit
 from marvin.cloudstackAPI import getApiLimit
 
@@ -39,4 +39,3 @@ class ApiLimit(CloudStackEntity.CloudStackEntity):
         [setattr(cmd, key, value) for key,value in kwargs.iteritems()]
         apilimit = apiclient.getApiLimit(cmd)
         return apilimit
-

tools/marvin/marvin/base/Apis.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listApis
 
 class Apis(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/AsyncJobResult.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import queryAsyncJobResult
 
 class AsyncJobResult(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/AsyncJobs.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listAsyncJobs
 
 class AsyncJobs(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/AutoScalePolicy.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createAutoScalePolicy
 from marvin.cloudstackAPI import updateAutoScalePolicy
 from marvin.cloudstackAPI import deleteAutoScalePolicy

tools/marvin/marvin/base/AutoScaleVmGroup.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import enableAutoScaleVmGroup
 from marvin.cloudstackAPI import createAutoScaleVmGroup
 from marvin.cloudstackAPI import listAutoScaleVmGroups

tools/marvin/marvin/base/AutoScaleVmProfile.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createAutoScaleVmProfile
 from marvin.cloudstackAPI import listAutoScaleVmProfiles
 from marvin.cloudstackAPI import updateAutoScaleVmProfile

tools/marvin/marvin/base/BigSwitchVnsDevice.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addBigSwitchVnsDevice
 from marvin.cloudstackAPI import listBigSwitchVnsDevices
 from marvin.cloudstackAPI import deleteBigSwitchVnsDevice

tools/marvin/marvin/base/Capabilities.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listCapabilities
 
 class Capabilities(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/Capacity.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listCapacity
 
 class Capacity(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/CloudIdentifier.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import getCloudIdentifier
 
 class CloudIdentifier(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/Cluster.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addCluster
 from marvin.cloudstackAPI import listClusters
 from marvin.cloudstackAPI import updateCluster

tools/marvin/marvin/base/Condition.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createCondition
 from marvin.cloudstackAPI import listConditions
 from marvin.cloudstackAPI import deleteCondition

tools/marvin/marvin/base/Configuration.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listConfigurations
 from marvin.cloudstackAPI import updateConfiguration
 

tools/marvin/marvin/base/Counter.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createCounter
 from marvin.cloudstackAPI import listCounters
 from marvin.cloudstackAPI import deleteCounter

tools/marvin/marvin/base/CustomCertificate.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import uploadCustomCertificate
 
 class CustomCertificate(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/DiskOffering.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createDiskOffering
 from marvin.cloudstackAPI import listDiskOfferings
 from marvin.cloudstackAPI import updateDiskOffering

tools/marvin/marvin/base/Domain.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createDomain
 from marvin.cloudstackAPI import listDomains
 from marvin.cloudstackAPI import updateDomain

tools/marvin/marvin/base/DomainChildren.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listDomainChildren
 
 class DomainChildren(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/EgressFirewallRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createEgressFirewallRule
 from marvin.cloudstackAPI import listEgressFirewallRules
 from marvin.cloudstackAPI import deleteEgressFirewallRule

tools/marvin/marvin/base/EventTypes.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listEventTypes
 
 class EventTypes(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/Events.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listEvents
 from marvin.cloudstackAPI import deleteEvents
 

tools/marvin/marvin/base/FirewallRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createFirewallRule
 from marvin.cloudstackAPI import listFirewallRules
 from marvin.cloudstackAPI import deleteFirewallRule

tools/marvin/marvin/base/GlobalLoadBalancerRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createGlobalLoadBalancerRule
 from marvin.cloudstackAPI import listGlobalLoadBalancerRules
 from marvin.cloudstackAPI import updateGlobalLoadBalancerRule

tools/marvin/marvin/base/Host.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addHost
 from marvin.cloudstackAPI import listHosts
 from marvin.cloudstackAPI import updateHost

tools/marvin/marvin/base/HypervisorCapabilities.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listHypervisorCapabilities
 from marvin.cloudstackAPI import updateHypervisorCapabilities
 

tools/marvin/marvin/base/Hypervisors.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listHypervisors
 
 class Hypervisors(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/InstanceGroup.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createInstanceGroup
 from marvin.cloudstackAPI import listInstanceGroups
 from marvin.cloudstackAPI import updateInstanceGroup

tools/marvin/marvin/base/IpAddress.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import disassociateIpAddress
 from marvin.cloudstackAPI import associateIpAddress
 from marvin.cloudstackAPI import listPublicIpAddresses

tools/marvin/marvin/base/IpForwardingRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createIpForwardingRule
 from marvin.cloudstackAPI import listIpForwardingRules
 from marvin.cloudstackAPI import deleteIpForwardingRule

tools/marvin/marvin/base/Iso.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import copyIso
 from marvin.cloudstackAPI import registerIso
 from marvin.cloudstackAPI import listIsos

tools/marvin/marvin/base/IsoPermissions.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listIsoPermissions
 from marvin.cloudstackAPI import updateIsoPermissions
 

tools/marvin/marvin/base/LBHealthCheckPolicy.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createLBHealthCheckPolicy
 from marvin.cloudstackAPI import deleteLBHealthCheckPolicy
 from marvin.cloudstackAPI import listLBHealthCheckPolicies

tools/marvin/marvin/base/LBStickinessPolicy.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createLBStickinessPolicy
 from marvin.cloudstackAPI import deleteLBStickinessPolicy
 from marvin.cloudstackAPI import listLBStickinessPolicies

tools/marvin/marvin/base/Ldap.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import ldapRemove
 from marvin.cloudstackAPI import ldapConfig
 

tools/marvin/marvin/base/LoadBalancerRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createLoadBalancerRule
 from marvin.cloudstackAPI import listLoadBalancerRules
 from marvin.cloudstackAPI import updateLoadBalancerRule

tools/marvin/marvin/base/Network.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createNetwork
 from marvin.cloudstackAPI import listNetworks
 from marvin.cloudstackAPI import updateNetwork

tools/marvin/marvin/base/NetworkACL.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createNetworkACL
 from marvin.cloudstackAPI import listNetworkACLs
 from marvin.cloudstackAPI import deleteNetworkACL

tools/marvin/marvin/base/NetworkDevice.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addNetworkDevice
 from marvin.cloudstackAPI import listNetworkDevice
 from marvin.cloudstackAPI import deleteNetworkDevice

tools/marvin/marvin/base/NetworkOffering.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createNetworkOffering
 from marvin.cloudstackAPI import listNetworkOfferings
 from marvin.cloudstackAPI import updateNetworkOffering

tools/marvin/marvin/base/NetworkServiceProvider.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addNetworkServiceProvider
 from marvin.cloudstackAPI import listNetworkServiceProviders
 from marvin.cloudstackAPI import updateNetworkServiceProvider

tools/marvin/marvin/base/Nic.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listNics
 from marvin.cloudstackAPI import addIpToNic
 from marvin.cloudstackAPI import removeIpFromNic

tools/marvin/marvin/base/NiciraNvpDevice.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addNiciraNvpDevice
 from marvin.cloudstackAPI import listNiciraNvpDevices
 from marvin.cloudstackAPI import deleteNiciraNvpDevice

tools/marvin/marvin/base/OsCategories.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listOsCategories
 
 class OsCategories(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/OsTypes.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listOsTypes
 
 class OsTypes(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/PhysicalNetwork.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createPhysicalNetwork
 from marvin.cloudstackAPI import listPhysicalNetworks
 from marvin.cloudstackAPI import updatePhysicalNetwork

tools/marvin/marvin/base/Pod.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createPod
 from marvin.cloudstackAPI import listPods
 from marvin.cloudstackAPI import updatePod

tools/marvin/marvin/base/PortForwardingRule.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createPortForwardingRule
 from marvin.cloudstackAPI import listPortForwardingRules
 from marvin.cloudstackAPI import updatePortForwardingRule

tools/marvin/marvin/base/PrivateGateway.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createPrivateGateway
 from marvin.cloudstackAPI import listPrivateGateways
 from marvin.cloudstackAPI import deletePrivateGateway

tools/marvin/marvin/base/Project.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import suspendProject
 from marvin.cloudstackAPI import createProject
 from marvin.cloudstackAPI import listProjects

tools/marvin/marvin/base/ProjectInvitation.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listProjectInvitations
 from marvin.cloudstackAPI import updateProjectInvitation
 from marvin.cloudstackAPI import deleteProjectInvitation

tools/marvin/marvin/base/Region.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addRegion
 from marvin.cloudstackAPI import listRegions
 from marvin.cloudstackAPI import updateRegion

tools/marvin/marvin/base/RemoteAccessVpn.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createRemoteAccessVpn
 from marvin.cloudstackAPI import listRemoteAccessVpns
 from marvin.cloudstackAPI import deleteRemoteAccessVpn

tools/marvin/marvin/base/ResourceCount.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import updateResourceCount
 
 class ResourceCount(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/ResourceLimit.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listResourceLimits
 from marvin.cloudstackAPI import updateResourceLimit
 

tools/marvin/marvin/base/Router.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import destroyRouter
 from marvin.cloudstackAPI import listRouters
 from marvin.cloudstackAPI import stopRouter

tools/marvin/marvin/base/S3.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addS3
 from marvin.cloudstackAPI import listS3s
 

tools/marvin/marvin/base/SSHKeyPair.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createSSHKeyPair
 from marvin.cloudstackAPI import registerSSHKeyPair
 from marvin.cloudstackAPI import listSSHKeyPairs

tools/marvin/marvin/base/SecondaryStorage.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addSecondaryStorage
 
 class SecondaryStorage(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/SecurityGroup.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createSecurityGroup
 from marvin.cloudstackAPI import listSecurityGroups
 from marvin.cloudstackAPI import deleteSecurityGroup

tools/marvin/marvin/base/ServiceForRouter.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForRouter
 
 class ServiceForRouter(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/ServiceForSystemVm.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForSystemVm
 
 class ServiceForSystemVm(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/ServiceForVirtualMachine.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import changeServiceForVirtualMachine
 
 class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/ServiceOffering.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createServiceOffering
 from marvin.cloudstackAPI import listServiceOfferings
 from marvin.cloudstackAPI import updateServiceOffering

tools/marvin/marvin/base/Simulator.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import configureSimulator
 
 class Simulator(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/Snapshot.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createSnapshot
 from marvin.cloudstackAPI import listSnapshots
 from marvin.cloudstackAPI import deleteSnapshot

tools/marvin/marvin/base/SnapshotPolicy.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createSnapshotPolicy
 from marvin.cloudstackAPI import listSnapshotPolicies
 from marvin.cloudstackAPI import deleteSnapshotPolicies

tools/marvin/marvin/base/StaticNat.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import enableStaticNat
 from marvin.cloudstackAPI import disableStaticNat
 

tools/marvin/marvin/base/StaticRoute.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createStaticRoute
 from marvin.cloudstackAPI import listStaticRoutes
 from marvin.cloudstackAPI import deleteStaticRoute

tools/marvin/marvin/base/StorageNetworkIpRange.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createStorageNetworkIpRange
 from marvin.cloudstackAPI import listStorageNetworkIpRange
 from marvin.cloudstackAPI import updateStorageNetworkIpRange

tools/marvin/marvin/base/StoragePool.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createStoragePool
 from marvin.cloudstackAPI import listStoragePools
 from marvin.cloudstackAPI import updateStoragePool

tools/marvin/marvin/base/StorageProviders.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listStorageProviders
 
 class StorageProviders(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/SupportedNetworkServices.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listSupportedNetworkServices
 
 class SupportedNetworkServices(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/Swift.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addSwift
 from marvin.cloudstackAPI import listSwifts
 

tools/marvin/marvin/base/SystemVm.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import migrateSystemVm
 from marvin.cloudstackAPI import stopSystemVm
 from marvin.cloudstackAPI import listSystemVms

tools/marvin/marvin/base/Tags.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createTags
 from marvin.cloudstackAPI import listTags
 from marvin.cloudstackAPI import deleteTags

tools/marvin/marvin/base/Template.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import prepareTemplate
 from marvin.cloudstackAPI import createTemplate
 from marvin.cloudstackAPI import registerTemplate

tools/marvin/marvin/base/TemplatePermissions.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listTemplatePermissions
 from marvin.cloudstackAPI import updateTemplatePermissions
 

tools/marvin/marvin/base/TrafficMonitor.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addTrafficMonitor
 from marvin.cloudstackAPI import listTrafficMonitors
 from marvin.cloudstackAPI import deleteTrafficMonitor

tools/marvin/marvin/base/TrafficType.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addTrafficType
 from marvin.cloudstackAPI import listTrafficTypes
 from marvin.cloudstackAPI import updateTrafficType

tools/marvin/marvin/base/TrafficTypeImplementors.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listTrafficTypeImplementors
 
 class TrafficTypeImplementors(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/UsageRecords.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listUsageRecords
 from marvin.cloudstackAPI import generateUsageRecords
 

tools/marvin/marvin/base/UsageTypes.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import listUsageTypes
 
 class UsageTypes(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/User.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import enableUser
 from marvin.cloudstackAPI import getUser
 from marvin.cloudstackAPI import lockUser

tools/marvin/marvin/base/VMPassword.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import getVMPassword
 
 class VMPassword(CloudStackEntity.CloudStackEntity):

tools/marvin/marvin/base/VMSnapshot.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVMSnapshot
 from marvin.cloudstackAPI import listVMSnapshot
 from marvin.cloudstackAPI import deleteVMSnapshot

tools/marvin/marvin/base/VPC.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVPC
 from marvin.cloudstackAPI import listVPCs
 from marvin.cloudstackAPI import updateVPC

tools/marvin/marvin/base/VPCOffering.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVPCOffering
 from marvin.cloudstackAPI import listVPCOfferings
 from marvin.cloudstackAPI import updateVPCOffering

tools/marvin/marvin/base/VirtualMachine.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import restoreVirtualMachine
 from marvin.cloudstackAPI import scaleVirtualMachine
 from marvin.cloudstackAPI import deployVirtualMachine

tools/marvin/marvin/base/VirtualRouterElement.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVirtualRouterElement
 from marvin.cloudstackAPI import listVirtualRouterElements
 from marvin.cloudstackAPI import configureVirtualRouterElement

tools/marvin/marvin/base/VlanIpRange.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVlanIpRange
 from marvin.cloudstackAPI import listVlanIpRanges
 from marvin.cloudstackAPI import deleteVlanIpRange

tools/marvin/marvin/base/Volume.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import migrateVolume
 from marvin.cloudstackAPI import createVolume
 from marvin.cloudstackAPI import listVolumes

tools/marvin/marvin/base/VpnConnection.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import resetVpnConnection
 from marvin.cloudstackAPI import createVpnConnection
 from marvin.cloudstackAPI import listVpnConnections

tools/marvin/marvin/base/VpnCustomerGateway.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVpnCustomerGateway
 from marvin.cloudstackAPI import listVpnCustomerGateways
 from marvin.cloudstackAPI import updateVpnCustomerGateway

tools/marvin/marvin/base/VpnGateway.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createVpnGateway
 from marvin.cloudstackAPI import listVpnGateways
 from marvin.cloudstackAPI import deleteVpnGateway

tools/marvin/marvin/base/VpnUser.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import addVpnUser
 from marvin.cloudstackAPI import listVpnUsers
 from marvin.cloudstackAPI import removeVpnUser

tools/marvin/marvin/base/Zone.py

@@ -14,7 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
-from marvin.integration.lib.base import CloudStackEntity
+from marvin.base import CloudStackEntity
 from marvin.cloudstackAPI import createZone
 from marvin.cloudstackAPI import listZones
 from marvin.cloudstackAPI import updateZone