incubator-cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [47/50] [abbrv] git commit: fixing the imports
Date Sat, 26 Jan 2013 16:21:38 GMT
fixing the imports

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


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

Branch: refs/heads/marvin-refactor-phase1
Commit: 13d94c14989a340fcc669a2337d5070e592b0d26
Parents: 6595dee
Author: Prasanna Santhanam <tsp@apache.org>
Authored: Sat Jan 26 19:25:30 2013 +0530
Committer: Prasanna Santhanam <tsp@apache.org>
Committed: Sat Jan 26 19:25:30 2013 +0530

----------------------------------------------------------------------
 .../marvin/marvin/integration/lib/base/Account.py  |    1 +
 .../integration/lib/base/AccountFromProject.py     |    1 +
 .../integration/lib/base/AccountToProject.py       |    1 +
 tools/marvin/marvin/integration/lib/base/Alerts.py |    1 +
 .../marvin/marvin/integration/lib/base/ApiLimit.py |    1 +
 tools/marvin/marvin/integration/lib/base/Apis.py   |    1 +
 .../marvin/integration/lib/base/AsyncJobResult.py  |    1 +
 .../marvin/integration/lib/base/AsyncJobs.py       |    1 +
 .../integration/lib/base/AutoScalePolicies.py      |    1 +
 .../marvin/integration/lib/base/AutoScalePolicy.py |    1 +
 .../integration/lib/base/AutoScaleVmGroup.py       |    1 +
 .../integration/lib/base/AutoScaleVmProfile.py     |    1 +
 .../marvin/integration/lib/base/Capabilities.py    |    1 +
 .../marvin/marvin/integration/lib/base/Capacity.py |    1 +
 .../marvin/integration/lib/base/CloudIdentifier.py |    1 +
 .../integration/lib/base/CloudStackEntity.py       |   25 +++++++++++++++
 .../marvin/marvin/integration/lib/base/Cluster.py  |    1 +
 .../marvin/integration/lib/base/Condition.py       |    1 +
 tools/marvin/marvin/integration/lib/base/Config.py |    1 +
 .../marvin/integration/lib/base/Configuration.py   |    1 +
 .../marvin/marvin/integration/lib/base/Counter.py  |    1 +
 .../integration/lib/base/CustomCertificate.py      |    1 +
 .../integration/lib/base/DefaultZoneForAccount.py  |    1 +
 .../marvin/integration/lib/base/DiskOffering.py    |    1 +
 tools/marvin/marvin/integration/lib/base/Domain.py |    1 +
 .../marvin/integration/lib/base/DomainChildren.py  |    1 +
 .../marvin/integration/lib/base/EventTypes.py      |    1 +
 tools/marvin/marvin/integration/lib/base/Events.py |    1 +
 .../marvin/integration/lib/base/FirewallRule.py    |    1 +
 .../integration/lib/base/FromLoadBalancerRule.py   |    1 +
 tools/marvin/marvin/integration/lib/base/Host.py   |    1 +
 .../integration/lib/base/HostForMaintenance.py     |    1 +
 .../marvin/integration/lib/base/HostMaintenance.py |    1 +
 .../marvin/integration/lib/base/HostPassword.py    |    1 +
 .../integration/lib/base/HypervisorCapabilities.py |    1 +
 .../marvin/integration/lib/base/Hypervisors.py     |    1 +
 .../marvin/integration/lib/base/InstanceGroup.py   |    1 +
 .../marvin/integration/lib/base/IpAddress.py       |    1 +
 .../integration/lib/base/IpForwardingRule.py       |    1 +
 tools/marvin/marvin/integration/lib/base/Iso.py    |    1 +
 .../marvin/integration/lib/base/IsoPermissions.py  |    1 +
 .../integration/lib/base/LBStickinessPolicies.py   |    1 +
 .../integration/lib/base/LBStickinessPolicy.py     |    1 +
 .../integration/lib/base/LoadBalancerRule.py       |    1 +
 .../lib/base/LoadBalancerRuleInstances.py          |    1 +
 .../marvin/marvin/integration/lib/base/Network.py  |    1 +
 .../marvin/integration/lib/base/NetworkACL.py      |    1 +
 .../marvin/integration/lib/base/NetworkDevice.py   |    1 +
 .../marvin/integration/lib/base/NetworkOffering.py |    1 +
 .../integration/lib/base/NetworkServiceProvider.py |    1 +
 .../marvin/integration/lib/base/NiciraNvpDevice.py |    1 +
 .../lib/base/NiciraNvpDeviceNetworks.py            |    1 +
 .../marvin/integration/lib/base/OsCategories.py    |    1 +
 .../marvin/marvin/integration/lib/base/OsTypes.py  |    1 +
 .../lib/base/PasswordForVirtualMachine.py          |    1 +
 .../marvin/integration/lib/base/PhysicalNetwork.py |    1 +
 tools/marvin/marvin/integration/lib/base/Pod.py    |    1 +
 .../integration/lib/base/PortForwardingRule.py     |    1 +
 .../marvin/integration/lib/base/PrivateGateway.py  |    1 +
 .../marvin/marvin/integration/lib/base/Project.py  |    1 +
 .../marvin/integration/lib/base/ProjectAccounts.py |    1 +
 .../integration/lib/base/ProjectInvitation.py      |    1 +
 .../integration/lib/base/PublicIpAddresses.py      |    1 +
 .../marvin/integration/lib/base/RemoteAccessVpn.py |    1 +
 tools/marvin/marvin/integration/lib/base/Remove.py |    1 +
 .../marvin/integration/lib/base/ResourceCount.py   |    1 +
 .../marvin/integration/lib/base/ResourceLimit.py   |    1 +
 tools/marvin/marvin/integration/lib/base/Router.py |    1 +
 tools/marvin/marvin/integration/lib/base/S3.py     |    1 +
 .../marvin/integration/lib/base/SSHKeyPair.py      |    1 +
 .../integration/lib/base/SecondaryStorage.py       |    1 +
 .../marvin/integration/lib/base/SecurityGroup.py   |    1 +
 .../integration/lib/base/SecurityGroupEgress.py    |    1 +
 .../integration/lib/base/SecurityGroupIngress.py   |    1 +
 .../integration/lib/base/ServiceForRouter.py       |    1 +
 .../integration/lib/base/ServiceForSystemVm.py     |    1 +
 .../lib/base/ServiceForVirtualMachine.py           |    1 +
 .../marvin/integration/lib/base/ServiceOffering.py |    1 +
 .../marvin/marvin/integration/lib/base/Snapshot.py |    1 +
 .../integration/lib/base/SnapshotPolicies.py       |    1 +
 .../marvin/integration/lib/base/SnapshotPolicy.py  |    1 +
 .../marvin/integration/lib/base/StaticNat.py       |    1 +
 .../marvin/integration/lib/base/StaticRoute.py     |    1 +
 .../integration/lib/base/StorageMaintenance.py     |    1 +
 .../integration/lib/base/StorageNetworkIpRange.py  |    1 +
 .../marvin/integration/lib/base/StoragePool.py     |    1 +
 .../lib/base/SupportedNetworkServices.py           |    1 +
 tools/marvin/marvin/integration/lib/base/Swift.py  |    1 +
 .../marvin/marvin/integration/lib/base/SystemVm.py |    1 +
 tools/marvin/marvin/integration/lib/base/Tags.py   |    1 +
 .../marvin/marvin/integration/lib/base/Template.py |    1 +
 .../integration/lib/base/TemplatePermissions.py    |    1 +
 .../integration/lib/base/ToLoadBalancerRule.py     |    1 +
 .../marvin/integration/lib/base/TrafficMonitor.py  |    1 +
 .../marvin/integration/lib/base/TrafficType.py     |    1 +
 .../lib/base/TrafficTypeImplementors.py            |    1 +
 .../marvin/integration/lib/base/UsageRecords.py    |    1 +
 .../marvin/integration/lib/base/UsageTypes.py      |    1 +
 tools/marvin/marvin/integration/lib/base/User.py   |    1 +
 .../marvin/marvin/integration/lib/base/UserKeys.py |    1 +
 .../marvin/integration/lib/base/VMPassword.py      |    1 +
 tools/marvin/marvin/integration/lib/base/VPC.py    |    1 +
 .../marvin/integration/lib/base/VPCOffering.py     |    1 +
 .../marvin/integration/lib/base/VirtualMachine.py  |    1 +
 .../integration/lib/base/VirtualRouterElement.py   |    1 +
 .../marvin/integration/lib/base/VlanIpRange.py     |    1 +
 tools/marvin/marvin/integration/lib/base/Volume.py |    1 +
 .../marvin/integration/lib/base/VpnConnection.py   |    1 +
 .../integration/lib/base/VpnCustomerGateway.py     |    1 +
 .../marvin/integration/lib/base/VpnGateway.py      |    1 +
 .../marvin/marvin/integration/lib/base/VpnUser.py  |    1 +
 tools/marvin/marvin/integration/lib/base/Zone.py   |    1 +
 .../integration/lib/factory/AccountFactory.py      |    2 +-
 .../lib/factory/AutoScalePolicyFactory.py          |    2 +-
 .../lib/factory/AutoScaleVmGroupFactory.py         |    2 +-
 .../lib/factory/AutoScaleVmProfileFactory.py       |    2 +-
 .../integration/lib/factory/ConditionFactory.py    |    2 +-
 .../integration/lib/factory/CounterFactory.py      |    2 +-
 .../integration/lib/factory/DiskOfferingFactory.py |    2 +-
 .../integration/lib/factory/DomainFactory.py       |    2 +-
 .../integration/lib/factory/FirewallRuleFactory.py |    2 +-
 .../lib/factory/InstanceGroupFactory.py            |    2 +-
 .../integration/lib/factory/IpAddressFactory.py    |    2 +-
 .../lib/factory/IpForwardingRuleFactory.py         |    2 +-
 .../marvin/integration/lib/factory/IsoFactory.py   |    2 +-
 .../lib/factory/LBStickinessPolicyFactory.py       |    2 +-
 .../lib/factory/LoadBalancerRuleFactory.py         |    2 +-
 .../integration/lib/factory/NetworkACLFactory.py   |    2 +-
 .../integration/lib/factory/NetworkFactory.py      |    2 +-
 .../lib/factory/NetworkOfferingFactory.py          |    2 +-
 .../lib/factory/PhysicalNetworkFactory.py          |    2 +-
 .../marvin/integration/lib/factory/PodFactory.py   |    2 +-
 .../lib/factory/PortForwardingRuleFactory.py       |    2 +-
 .../lib/factory/PrivateGatewayFactory.py           |    2 +-
 .../integration/lib/factory/ProjectFactory.py      |    2 +-
 .../lib/factory/RemoteAccessVpnFactory.py          |    2 +-
 .../integration/lib/factory/SSHKeyPairFactory.py   |    2 +-
 .../lib/factory/SecurityGroupFactory.py            |    2 +-
 .../lib/factory/ServiceOfferingFactory.py          |    2 +-
 .../integration/lib/factory/SnapshotFactory.py     |    2 +-
 .../lib/factory/SnapshotPolicyFactory.py           |    2 +-
 .../integration/lib/factory/StaticRouteFactory.py  |    2 +-
 .../lib/factory/StorageNetworkIpRangeFactory.py    |    2 +-
 .../integration/lib/factory/StoragePoolFactory.py  |    2 +-
 .../marvin/integration/lib/factory/TagsFactory.py  |    2 +-
 .../integration/lib/factory/TemplateFactory.py     |    2 +-
 .../marvin/integration/lib/factory/UserFactory.py  |    2 +-
 .../integration/lib/factory/UserKeysFactory.py     |    2 +-
 .../marvin/integration/lib/factory/VPCFactory.py   |    2 +-
 .../integration/lib/factory/VPCOfferingFactory.py  |    2 +-
 .../lib/factory/VirtualMachineFactory.py           |    2 +-
 .../lib/factory/VirtualRouterElementFactory.py     |    2 +-
 .../integration/lib/factory/VlanIpRangeFactory.py  |    2 +-
 .../integration/lib/factory/VolumeFactory.py       |    2 +-
 .../lib/factory/VpnConnectionFactory.py            |    2 +-
 .../lib/factory/VpnCustomerGatewayFactory.py       |    2 +-
 .../integration/lib/factory/VpnGatewayFactory.py   |    2 +-
 .../marvin/integration/lib/factory/ZoneFactory.py  |    2 +-
 .../marvin/marvin/integration/lib/generateBase.py  |    4 +-
 159 files changed, 184 insertions(+), 48 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Account.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Account.py b/tools/marvin/marvin/integration/lib/base/Account.py
index 172a0f9..fcdd092 100644
--- a/tools/marvin/marvin/integration/lib/base/Account.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AccountFromProject.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py b/tools/marvin/marvin/integration/lib/base/AccountFromProject.py
index fb5dc3a..a17eab2 100644
--- a/tools/marvin/marvin/integration/lib/base/AccountFromProject.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AccountToProject.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AccountToProject.py b/tools/marvin/marvin/integration/lib/base/AccountToProject.py
index 2cc6c5e..8ef70a8 100644
--- a/tools/marvin/marvin/integration/lib/base/AccountToProject.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Alerts.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Alerts.py b/tools/marvin/marvin/integration/lib/base/Alerts.py
index 4b29d6b..3440daf 100644
--- a/tools/marvin/marvin/integration/lib/base/Alerts.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ApiLimit.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ApiLimit.py b/tools/marvin/marvin/integration/lib/base/ApiLimit.py
index 3663002..c8ea5c6 100644
--- a/tools/marvin/marvin/integration/lib/base/ApiLimit.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Apis.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Apis.py b/tools/marvin/marvin/integration/lib/base/Apis.py
index f9189b8..37828aa 100644
--- a/tools/marvin/marvin/integration/lib/base/Apis.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py b/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
index eb35ede..4762e29 100644
--- a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AsyncJobs.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py b/tools/marvin/marvin/integration/lib/base/AsyncJobs.py
index 83264fa..78194c9 100644
--- a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
index 4bf1345..4a86771 100644
--- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicies.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py b/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
index e72481c..d4f12a7 100644
--- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
index 17a5e9e..2cb9fa5 100644
--- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py b/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
index e13dc82..0035f61 100644
--- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Capabilities.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Capabilities.py b/tools/marvin/marvin/integration/lib/base/Capabilities.py
index 0cc7229..9e2b6e6 100644
--- a/tools/marvin/marvin/integration/lib/base/Capabilities.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Capacity.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Capacity.py b/tools/marvin/marvin/integration/lib/base/Capacity.py
index 162760d..b4e4ce5 100644
--- a/tools/marvin/marvin/integration/lib/base/Capacity.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py b/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
index 15b3430..6ed84c8 100644
--- a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/CloudStackEntity.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/CloudStackEntity.py b/tools/marvin/marvin/integration/lib/base/CloudStackEntity.py
new file mode 100644
index 0000000..cd82ec9
--- /dev/null
+++ b/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__
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Cluster.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Cluster.py b/tools/marvin/marvin/integration/lib/base/Cluster.py
index dff76f4..62d8df0 100644
--- a/tools/marvin/marvin/integration/lib/base/Cluster.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Condition.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Condition.py b/tools/marvin/marvin/integration/lib/base/Condition.py
index 7219215..48f81ab 100644
--- a/tools/marvin/marvin/integration/lib/base/Condition.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Config.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Config.py b/tools/marvin/marvin/integration/lib/base/Config.py
index 2c6111d..b035a5b 100644
--- a/tools/marvin/marvin/integration/lib/base/Config.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Configuration.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Configuration.py b/tools/marvin/marvin/integration/lib/base/Configuration.py
index 6c1f260..328561c 100644
--- a/tools/marvin/marvin/integration/lib/base/Configuration.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Counter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Counter.py b/tools/marvin/marvin/integration/lib/base/Counter.py
index 384c8c4..ba59d69 100644
--- a/tools/marvin/marvin/integration/lib/base/Counter.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/CustomCertificate.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py b/tools/marvin/marvin/integration/lib/base/CustomCertificate.py
index ec2070a..05e9cbd 100644
--- a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py b/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
index df0ba58..f94a27f 100644
--- a/tools/marvin/marvin/integration/lib/base/DefaultZoneForAccount.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/DiskOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DiskOffering.py b/tools/marvin/marvin/integration/lib/base/DiskOffering.py
index 52a2f78..b6b6f40 100644
--- a/tools/marvin/marvin/integration/lib/base/DiskOffering.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Domain.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Domain.py b/tools/marvin/marvin/integration/lib/base/Domain.py
index 4bb9011..2c54fc4 100644
--- a/tools/marvin/marvin/integration/lib/base/Domain.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/DomainChildren.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/DomainChildren.py b/tools/marvin/marvin/integration/lib/base/DomainChildren.py
index 657eddc..cfb546b 100644
--- a/tools/marvin/marvin/integration/lib/base/DomainChildren.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/EventTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/EventTypes.py b/tools/marvin/marvin/integration/lib/base/EventTypes.py
index 21715dc..029b3ea 100644
--- a/tools/marvin/marvin/integration/lib/base/EventTypes.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Events.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Events.py b/tools/marvin/marvin/integration/lib/base/Events.py
index 9101fee..8958f65 100644
--- a/tools/marvin/marvin/integration/lib/base/Events.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/FirewallRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/FirewallRule.py b/tools/marvin/marvin/integration/lib/base/FirewallRule.py
index f2df313..f54f7a0 100644
--- a/tools/marvin/marvin/integration/lib/base/FirewallRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
index 1a08978..6e9744c 100644
--- a/tools/marvin/marvin/integration/lib/base/FromLoadBalancerRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Host.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Host.py b/tools/marvin/marvin/integration/lib/base/Host.py
index 8401234..42fcd17 100644
--- a/tools/marvin/marvin/integration/lib/base/Host.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
index f1ee369..722cf6f 100644
--- a/tools/marvin/marvin/integration/lib/base/HostForMaintenance.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/HostMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py b/tools/marvin/marvin/integration/lib/base/HostMaintenance.py
index 35fdffc..ea30621 100644
--- a/tools/marvin/marvin/integration/lib/base/HostMaintenance.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/HostPassword.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HostPassword.py b/tools/marvin/marvin/integration/lib/base/HostPassword.py
index ec41336..f4f8d3d 100644
--- a/tools/marvin/marvin/integration/lib/base/HostPassword.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py b/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
index e5afe1e..c033552 100644
--- a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Hypervisors.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Hypervisors.py b/tools/marvin/marvin/integration/lib/base/Hypervisors.py
index 2a473fd..b7fa3b2 100644
--- a/tools/marvin/marvin/integration/lib/base/Hypervisors.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/InstanceGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py b/tools/marvin/marvin/integration/lib/base/InstanceGroup.py
index 613c39b..64ff49a 100644
--- a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/IpAddress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/integration/lib/base/IpAddress.py
index 723e0df..386f413 100644
--- a/tools/marvin/marvin/integration/lib/base/IpAddress.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py b/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
index 8ea81af..1985354 100644
--- a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Iso.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Iso.py b/tools/marvin/marvin/integration/lib/base/Iso.py
index f558060..951da8b 100644
--- a/tools/marvin/marvin/integration/lib/base/Iso.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/IsoPermissions.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py b/tools/marvin/marvin/integration/lib/base/IsoPermissions.py
index bb17ac7..d328036 100644
--- a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
index 17f3d55..0c85593 100644
--- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicies.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py b/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
index a2fb7c6..eba2bfb 100644
--- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
index 0e8b3b4..814a1f5 100644
--- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py b/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
index aa5fe2d..112f843 100644
--- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRuleInstances.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Network.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Network.py b/tools/marvin/marvin/integration/lib/base/Network.py
index c408c71..4bd6cfd 100644
--- a/tools/marvin/marvin/integration/lib/base/Network.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NetworkACL.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkACL.py b/tools/marvin/marvin/integration/lib/base/NetworkACL.py
index dba3432..cb45e44 100644
--- a/tools/marvin/marvin/integration/lib/base/NetworkACL.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NetworkDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py b/tools/marvin/marvin/integration/lib/base/NetworkDevice.py
index 5681203..e45a98e 100644
--- a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NetworkOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py b/tools/marvin/marvin/integration/lib/base/NetworkOffering.py
index afdfc68..a588da5 100644
--- a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py b/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
index 9d1e233..1b8a422 100644
--- a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
index b199cee..c9ac9fc 100644
--- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py b/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
index af74997..f3ad2c3 100644
--- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDeviceNetworks.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/OsCategories.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/OsCategories.py b/tools/marvin/marvin/integration/lib/base/OsCategories.py
index d3dbae5..edcd4c4 100644
--- a/tools/marvin/marvin/integration/lib/base/OsCategories.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/OsTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/OsTypes.py b/tools/marvin/marvin/integration/lib/base/OsTypes.py
index b9a0d92..ff7f1fd 100644
--- a/tools/marvin/marvin/integration/lib/base/OsTypes.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
index 37ab622..e7120de 100644
--- a/tools/marvin/marvin/integration/lib/base/PasswordForVirtualMachine.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py b/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
index 1f40aca..6d1b595 100644
--- a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Pod.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Pod.py b/tools/marvin/marvin/integration/lib/base/Pod.py
index 0d5cf28..0f6f448 100644
--- a/tools/marvin/marvin/integration/lib/base/Pod.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py b/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
index 8ad8df1..9222f2a 100644
--- a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/PrivateGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py b/tools/marvin/marvin/integration/lib/base/PrivateGateway.py
index d4a7bff..cdfd417 100644
--- a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Project.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Project.py b/tools/marvin/marvin/integration/lib/base/Project.py
index 7b1badd..f4611da 100644
--- a/tools/marvin/marvin/integration/lib/base/Project.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py b/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
index 0f773b1..1053218 100644
--- a/tools/marvin/marvin/integration/lib/base/ProjectAccounts.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
index d29ae1c..64bea4e 100644
--- a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py b/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
index 2a5b0b0..3affa57 100644
--- a/tools/marvin/marvin/integration/lib/base/PublicIpAddresses.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py b/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
index c2d4b8e..eb52cc9 100644
--- a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Remove.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Remove.py b/tools/marvin/marvin/integration/lib/base/Remove.py
index 3fc7ae6..d63c08a 100644
--- a/tools/marvin/marvin/integration/lib/base/Remove.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ResourceCount.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ResourceCount.py b/tools/marvin/marvin/integration/lib/base/ResourceCount.py
index ba72d91..118adfe 100644
--- a/tools/marvin/marvin/integration/lib/base/ResourceCount.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ResourceLimit.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py b/tools/marvin/marvin/integration/lib/base/ResourceLimit.py
index 9384f06..e20ef11 100644
--- a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Router.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Router.py b/tools/marvin/marvin/integration/lib/base/Router.py
index c7e8041..8b01859 100644
--- a/tools/marvin/marvin/integration/lib/base/Router.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/S3.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/S3.py b/tools/marvin/marvin/integration/lib/base/S3.py
index 58982a6..9eda83f 100644
--- a/tools/marvin/marvin/integration/lib/base/S3.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py b/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
index 75f6c1f..23234ae 100644
--- a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py b/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
index 99ce3e7..34ba7d2 100644
--- a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SecurityGroup.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py b/tools/marvin/marvin/integration/lib/base/SecurityGroup.py
index d180396..dae8de7 100644
--- a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
index c3d8b92..400df85 100644
--- a/tools/marvin/marvin/integration/lib/base/SecurityGroupEgress.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py b/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
index c7a8708..b6ce744 100644
--- a/tools/marvin/marvin/integration/lib/base/SecurityGroupIngress.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py b/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
index 996680e..7040d2d 100644
--- a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py b/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
index 630bd45..e3292c2 100644
--- a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py b/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py
index 10b69de..fc45f98 100644
--- a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ServiceOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py b/tools/marvin/marvin/integration/lib/base/ServiceOffering.py
index 2d7369b..ef4d274 100644
--- a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Snapshot.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Snapshot.py b/tools/marvin/marvin/integration/lib/base/Snapshot.py
index dab546f..aa708fb 100644
--- a/tools/marvin/marvin/integration/lib/base/Snapshot.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py
index 9305a94..1582199 100644
--- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicies.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py b/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py
index 575e3a3..7c69db5 100644
--- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/StaticNat.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/StaticNat.py b/tools/marvin/marvin/integration/lib/base/StaticNat.py
index 526fb1f..25be454 100644
--- a/tools/marvin/marvin/integration/lib/base/StaticNat.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/StaticRoute.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/StaticRoute.py b/tools/marvin/marvin/integration/lib/base/StaticRoute.py
index cbebd64..0c97ed3 100644
--- a/tools/marvin/marvin/integration/lib/base/StaticRoute.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py b/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py
index 96f690e..01c0d1f 100644
--- a/tools/marvin/marvin/integration/lib/base/StorageMaintenance.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py b/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py
index 091eacf..ecf122b 100644
--- a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/StoragePool.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/StoragePool.py b/tools/marvin/marvin/integration/lib/base/StoragePool.py
index 3c54c8b..48802f3 100644
--- a/tools/marvin/marvin/integration/lib/base/StoragePool.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py b/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py
index 38da628..d9f02b8 100644
--- a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Swift.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Swift.py b/tools/marvin/marvin/integration/lib/base/Swift.py
index 346834d..9cb8660 100644
--- a/tools/marvin/marvin/integration/lib/base/Swift.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/SystemVm.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/SystemVm.py b/tools/marvin/marvin/integration/lib/base/SystemVm.py
index ba399dd..207ad38 100644
--- a/tools/marvin/marvin/integration/lib/base/SystemVm.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Tags.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Tags.py b/tools/marvin/marvin/integration/lib/base/Tags.py
index 3b717a2..ebb538a 100644
--- a/tools/marvin/marvin/integration/lib/base/Tags.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Template.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Template.py b/tools/marvin/marvin/integration/lib/base/Template.py
index cd784c7..25501d7 100644
--- a/tools/marvin/marvin/integration/lib/base/Template.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py b/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
index ab9f395..fa51420 100644
--- a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py b/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py
index 958e29f..7173bbf 100644
--- a/tools/marvin/marvin/integration/lib/base/ToLoadBalancerRule.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py b/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
index 61b2467..4d6f06d 100644
--- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/TrafficType.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficType.py b/tools/marvin/marvin/integration/lib/base/TrafficType.py
index 13a9140..facc145 100644
--- a/tools/marvin/marvin/integration/lib/base/TrafficType.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py b/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py
index 37bd2a8..28b1b27 100644
--- a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/UsageRecords.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/UsageRecords.py b/tools/marvin/marvin/integration/lib/base/UsageRecords.py
index 7a34615..1892519 100644
--- a/tools/marvin/marvin/integration/lib/base/UsageRecords.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/UsageTypes.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/UsageTypes.py b/tools/marvin/marvin/integration/lib/base/UsageTypes.py
index 2e65f5e..49dd950 100644
--- a/tools/marvin/marvin/integration/lib/base/UsageTypes.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/User.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/integration/lib/base/User.py
index 6437fb7..f494e2a 100644
--- a/tools/marvin/marvin/integration/lib/base/User.py
+++ b/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):


Mime
View raw message