marvin_refactor: fixing the imports

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

tools/marvin/marvin/integration/lib/base/Account.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Account(CloudStackEntity):
 
     def enable(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/AccountFromProject.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AccountFromProject(CloudStackEntity):
 
     def delete(self, apiclient, projectid, account, **kwargs):

tools/marvin/marvin/integration/lib/base/AccountToProject.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AccountToProject(CloudStackEntity):
 
     def add(self, apiclient, projectid, **kwargs):

tools/marvin/marvin/integration/lib/base/Alerts.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Alerts(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/ApiLimit.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ApiLimit(CloudStackEntity):
 
     def reset(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Apis.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Apis(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/AsyncJobResult.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AsyncJobResult(CloudStackEntity):
 
     def query(self, apiclient, jobid, **kwargs):

tools/marvin/marvin/integration/lib/base/AsyncJobs.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AsyncJobs(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AutoScalePolicies(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AutoScalePolicy(CloudStackEntity):
 
     def create(self, apiclient, AutoScalePolicyFactory, action, duration, conditionids, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AutoScaleVmGroup(CloudStackEntity):
 
     def enable(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class AutoScaleVmProfile(CloudStackEntity):
 
     def create(self, apiclient, AutoScaleVmProfileFactory, zoneid, serviceofferingid, templateid, **kwargs):

tools/marvin/marvin/integration/lib/base/Capabilities.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Capabilities(CloudStackEntity):
 
     def list(self, apiclient):

tools/marvin/marvin/integration/lib/base/Capacity.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Capacity(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/CloudIdentifier.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class CloudIdentifier(CloudStackEntity):
 
     def get(self, apiclient, userid, **kwargs):

tools/marvin/marvin/integration/lib/base/CloudStackEntity.py

@@ -0,0 +1,25 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+cloudstack_version = "4.1.0"
+
+class CloudStackEntity(object):
+
+    __version__ = cloudstack_version
+
+    def getVersion(self):
+        return self.__version__

tools/marvin/marvin/integration/lib/base/Cluster.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Cluster(CloudStackEntity):
 
     def add(self, apiclient, clustername, hypervisor, zoneid, clustertype, podid, **kwargs):

tools/marvin/marvin/integration/lib/base/Condition.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Condition(CloudStackEntity):
 
     def create(self, apiclient, ConditionFactory, threshold, relationaloperator, counterid, **kwargs):

tools/marvin/marvin/integration/lib/base/Config.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Config(CloudStackEntity):
 
     def ldap(self, apiclient, queryfilter, hostname, searchbase, **kwargs):

tools/marvin/marvin/integration/lib/base/Configuration.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Configuration(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Counter.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Counter(CloudStackEntity):
 
     def create(self, apiclient, CounterFactory, source, name, value, **kwargs):

tools/marvin/marvin/integration/lib/base/CustomCertificate.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class CustomCertificate(CloudStackEntity):
 
     def upload(self, apiclient, domainsuffix, certificate, **kwargs):

tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class DefaultZoneForAccount(CloudStackEntity):
 
     def mark(self, apiclient, account, domainid, zoneid, **kwargs):

tools/marvin/marvin/integration/lib/base/DiskOffering.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class DiskOffering(CloudStackEntity):
 
     def create(self, apiclient, DiskOfferingFactory, displaytext, name, **kwargs):

tools/marvin/marvin/integration/lib/base/Domain.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Domain(CloudStackEntity):
 
     def create(self, apiclient, DomainFactory, name, **kwargs):

tools/marvin/marvin/integration/lib/base/DomainChildren.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class DomainChildren(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/EventTypes.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class EventTypes(CloudStackEntity):
 
     def list(self, apiclient):

tools/marvin/marvin/integration/lib/base/Events.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Events(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/FirewallRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class FirewallRule(CloudStackEntity):
 
     def create(self, apiclient, FirewallRuleFactory, protocol, ipaddressid, **kwargs):

tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class FromLoadBalancerRule(CloudStackEntity):
 
     def remove(self, apiclient, id, virtualmachineids, **kwargs):

tools/marvin/marvin/integration/lib/base/Host.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Host(CloudStackEntity):
 
     def add(self, apiclient, username, podid, url, hypervisor, zoneid, password, **kwargs):

tools/marvin/marvin/integration/lib/base/HostForMaintenance.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class HostForMaintenance(CloudStackEntity):
 
     def prepare(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/HostMaintenance.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class HostMaintenance(CloudStackEntity):
 
     def cancel(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/HostPassword.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class HostPassword(CloudStackEntity):
 
     def update(self, apiclient, username, password, **kwargs):

tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class HypervisorCapabilities(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Hypervisors.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Hypervisors(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/InstanceGroup.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class InstanceGroup(CloudStackEntity):
 
     def create(self, apiclient, InstanceGroupFactory, name, **kwargs):

tools/marvin/marvin/integration/lib/base/IpAddress.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class IpAddress(CloudStackEntity):
 
     def disassociate(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/IpForwardingRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class IpForwardingRule(CloudStackEntity):
 
     def create(self, apiclient, IpForwardingRuleFactory, startport, protocol, ipaddressid, **kwargs):

tools/marvin/marvin/integration/lib/base/Iso.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Iso(CloudStackEntity):
 
     def copy(self, apiclient, sourcezoneid, id, destzoneid, **kwargs):

tools/marvin/marvin/integration/lib/base/IsoPermissions.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class IsoPermissions(CloudStackEntity):
 
     def list(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class LBStickinessPolicies(CloudStackEntity):
 
     def list(self, apiclient, lbruleid, **kwargs):

tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class LBStickinessPolicy(CloudStackEntity):
 
     def create(self, apiclient, LBStickinessPolicyFactory, lbruleid, methodname, name, **kwargs):

tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class LoadBalancerRule(CloudStackEntity):
 
     def create(self, apiclient, LoadBalancerRuleFactory, publicport, name, algorithm, privateport, **kwargs):

tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class LoadBalancerRuleInstances(CloudStackEntity):
 
     def list(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/Network.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Network(CloudStackEntity):
 
     def create(self, apiclient, NetworkFactory, displaytext, name, networkofferingid, zoneid, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkACL.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NetworkACL(CloudStackEntity):
 
     def create(self, apiclient, NetworkACLFactory, networkid, protocol, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkDevice.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NetworkDevice(CloudStackEntity):
 
     def add(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkOffering.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NetworkOffering(CloudStackEntity):
 
     def create(self, apiclient, NetworkOfferingFactory, guestiptype, traffictype, displaytext, name, supportedservices, **kwargs):

tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NetworkServiceProvider(CloudStackEntity):
 
     def add(self, apiclient, physicalnetworkid, name, **kwargs):

tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NiciraNvpDevice(CloudStackEntity):
 
     def add(self, apiclient, username, physicalnetworkid, password, hostname, transportzoneuuid, **kwargs):

tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class NiciraNvpDeviceNetworks(CloudStackEntity):
 
     def list(self, apiclient, nvpdeviceid, **kwargs):

tools/marvin/marvin/integration/lib/base/OsCategories.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class OsCategories(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/OsTypes.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class OsTypes(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class PasswordForVirtualMachine(CloudStackEntity):
 
     def reset(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class PhysicalNetwork(CloudStackEntity):
 
     def create(self, apiclient, PhysicalNetworkFactory, name, zoneid, **kwargs):

tools/marvin/marvin/integration/lib/base/Pod.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Pod(CloudStackEntity):
 
     def create(self, apiclient, PodFactory, startip, netmask, zoneid, gateway, name, **kwargs):

tools/marvin/marvin/integration/lib/base/PortForwardingRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class PortForwardingRule(CloudStackEntity):
 
     def create(self, apiclient, PortForwardingRuleFactory, publicport, virtualmachineid, protocol, ipaddressid, privateport, **kwargs):

tools/marvin/marvin/integration/lib/base/PrivateGateway.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class PrivateGateway(CloudStackEntity):
 
     def create(self, apiclient, PrivateGatewayFactory, netmask, vlan, ipaddress, gateway, vpcid, **kwargs):

tools/marvin/marvin/integration/lib/base/Project.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Project(CloudStackEntity):
 
     def suspend(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/ProjectAccounts.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ProjectAccounts(CloudStackEntity):
 
     def list(self, apiclient, projectid, **kwargs):

tools/marvin/marvin/integration/lib/base/ProjectInvitation.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ProjectInvitation(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class PublicIpAddresses(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class RemoteAccessVpn(CloudStackEntity):
 
     def create(self, apiclient, RemoteAccessVpnFactory, publicipid, **kwargs):

tools/marvin/marvin/integration/lib/base/Remove.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Remove(CloudStackEntity):
 
     def ldap(self, apiclient):

tools/marvin/marvin/integration/lib/base/ResourceCount.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ResourceCount(CloudStackEntity):
 
     def update(self, apiclient, domainid, **kwargs):

tools/marvin/marvin/integration/lib/base/ResourceLimit.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ResourceLimit(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Router.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Router(CloudStackEntity):
 
     def destroy(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/S3.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class S3(CloudStackEntity):
 
     def add(self, apiclient, secretkey, accesskey, bucket, **kwargs):

tools/marvin/marvin/integration/lib/base/SSHKeyPair.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SSHKeyPair(CloudStackEntity):
 
     def create(self, apiclient, SSHKeyPairFactory, name, **kwargs):

tools/marvin/marvin/integration/lib/base/SecondaryStorage.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SecondaryStorage(CloudStackEntity):
 
     def add(self, apiclient, url, **kwargs):

tools/marvin/marvin/integration/lib/base/SecurityGroup.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SecurityGroup(CloudStackEntity):
 
     def create(self, apiclient, SecurityGroupFactory, name, **kwargs):

tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SecurityGroupEgress(CloudStackEntity):
 
     def authorize(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SecurityGroupIngress(CloudStackEntity):
 
     def authorize(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/ServiceForRouter.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ServiceForRouter(CloudStackEntity):
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ServiceForSystemVm(CloudStackEntity):
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ServiceForVirtualMachine(CloudStackEntity):
 
     def change(self, apiclient, id, serviceofferingid, **kwargs):

tools/marvin/marvin/integration/lib/base/ServiceOffering.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ServiceOffering(CloudStackEntity):
 
     def create(self, apiclient, ServiceOfferingFactory, displaytext, memory, cpunumber, name, cpuspeed, **kwargs):

tools/marvin/marvin/integration/lib/base/Snapshot.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Snapshot(CloudStackEntity):
 
     def create(self, apiclient, SnapshotFactory, volumeid, **kwargs):

tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SnapshotPolicies(CloudStackEntity):
 
     def list(self, apiclient, volumeid, **kwargs):

tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SnapshotPolicy(CloudStackEntity):
 
     def create(self, apiclient, SnapshotPolicyFactory, timezone, maxsnaps, schedule, volumeid, intervaltype, **kwargs):

tools/marvin/marvin/integration/lib/base/StaticNat.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class StaticNat(CloudStackEntity):
 
     def enable(self, apiclient, ipaddressid, virtualmachineid, **kwargs):

tools/marvin/marvin/integration/lib/base/StaticRoute.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class StaticRoute(CloudStackEntity):
 
     def create(self, apiclient, StaticRouteFactory, gatewayid, cidr, **kwargs):

tools/marvin/marvin/integration/lib/base/StorageMaintenance.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class StorageMaintenance(CloudStackEntity):
 
     def cancel(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class StorageNetworkIpRange(CloudStackEntity):
 
     def create(self, apiclient, StorageNetworkIpRangeFactory, startip, netmask, gateway, podid, **kwargs):

tools/marvin/marvin/integration/lib/base/StoragePool.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class StoragePool(CloudStackEntity):
 
     def create(self, apiclient, StoragePoolFactory, url, zoneid, clusterid, name, podid, **kwargs):

tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SupportedNetworkServices(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/Swift.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Swift(CloudStackEntity):
 
     def add(self, apiclient, url, **kwargs):

tools/marvin/marvin/integration/lib/base/SystemVm.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class SystemVm(CloudStackEntity):
 
     def migrate(self, apiclient, hostid, virtualmachineid, **kwargs):

tools/marvin/marvin/integration/lib/base/Tags.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Tags(CloudStackEntity):
 
     def create(self, apiclient, TagsFactory, resourcetype, resourceids, tags, **kwargs):

tools/marvin/marvin/integration/lib/base/Template.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class Template(CloudStackEntity):
 
     def prepare(self, apiclient, zoneid, templateid, **kwargs):

tools/marvin/marvin/integration/lib/base/TemplatePermissions.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class TemplatePermissions(CloudStackEntity):
 
     def list(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class ToLoadBalancerRule(CloudStackEntity):
 
     def assign(self, apiclient, id, virtualmachineids, **kwargs):

tools/marvin/marvin/integration/lib/base/TrafficMonitor.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class TrafficMonitor(CloudStackEntity):
 
     def add(self, apiclient, url, zoneid, **kwargs):

tools/marvin/marvin/integration/lib/base/TrafficType.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class TrafficType(CloudStackEntity):
 
     def add(self, apiclient, traffictype, physicalnetworkid, **kwargs):

tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class TrafficTypeImplementors(CloudStackEntity):
 
     def list(self, apiclient, **kwargs):

tools/marvin/marvin/integration/lib/base/UsageRecords.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class UsageRecords(CloudStackEntity):
 
     def list(self, apiclient, startdate, enddate, **kwargs):

tools/marvin/marvin/integration/lib/base/UsageTypes.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class UsageTypes(CloudStackEntity):
 
     def list(self, apiclient):

tools/marvin/marvin/integration/lib/base/User.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class User(CloudStackEntity):
 
     def enable(self, apiclient, id, **kwargs):

tools/marvin/marvin/integration/lib/base/UserKeys.py

@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+from . import CloudStackEntity
 class UserKeys(CloudStackEntity):
 
     def register(self, apiclient, id, **kwargs):