cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From t..@apache.org
Subject [30/42] fixing the imports
Date Fri, 01 Mar 2013 10:06:30 GMT
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/UserKeys.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/UserKeys.py b/tools/marvin/marvin/integration/lib/base/UserKeys.py
index 6c22d82..d4980ad 100644
--- a/tools/marvin/marvin/integration/lib/base/UserKeys.py
+++ b/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):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VMPassword.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VMPassword.py b/tools/marvin/marvin/integration/lib/base/VMPassword.py
index 1baef0e..acf6e65 100644
--- a/tools/marvin/marvin/integration/lib/base/VMPassword.py
+++ b/tools/marvin/marvin/integration/lib/base/VMPassword.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 VMPassword(CloudStackEntity):
 
     def get(self, apiclient, id, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VPC.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VPC.py b/tools/marvin/marvin/integration/lib/base/VPC.py
index a6c865d..2661fbf 100644
--- a/tools/marvin/marvin/integration/lib/base/VPC.py
+++ b/tools/marvin/marvin/integration/lib/base/VPC.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 VPC(CloudStackEntity):
 
     def create(self, apiclient, VPCFactory, cidr, zoneid, displaytext, name, vpcofferingid,
**kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VPCOffering.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VPCOffering.py b/tools/marvin/marvin/integration/lib/base/VPCOffering.py
index ce76077..bdfd40c 100644
--- a/tools/marvin/marvin/integration/lib/base/VPCOffering.py
+++ b/tools/marvin/marvin/integration/lib/base/VPCOffering.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 VPCOffering(CloudStackEntity):
 
     def create(self, apiclient, VPCOfferingFactory, displaytext, name, supportedservices,
**kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py b/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
index 46abe08..a8fab46 100644
--- a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py
+++ b/tools/marvin/marvin/integration/lib/base/VirtualMachine.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 VirtualMachine(CloudStackEntity):
 
     def restore(self, apiclient, virtualmachineid, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
index 43ea1be..74ba5a5 100644
--- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py
+++ b/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.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 VirtualRouterElement(CloudStackEntity):
 
     def create(self, apiclient, VirtualRouterElementFactory, nspid, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py b/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
index 66591fe..79f4bcd 100644
--- a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py
+++ b/tools/marvin/marvin/integration/lib/base/VlanIpRange.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 VlanIpRange(CloudStackEntity):
 
     def create(self, apiclient, VlanIpRangeFactory, startip, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Volume.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Volume.py b/tools/marvin/marvin/integration/lib/base/Volume.py
index 296b2bd..fa3c271 100644
--- a/tools/marvin/marvin/integration/lib/base/Volume.py
+++ b/tools/marvin/marvin/integration/lib/base/Volume.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 Volume(CloudStackEntity):
 
     def migrate(self, apiclient, storageid, volumeid, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VpnConnection.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnConnection.py b/tools/marvin/marvin/integration/lib/base/VpnConnection.py
index ebc78cf..95eba9c 100644
--- a/tools/marvin/marvin/integration/lib/base/VpnConnection.py
+++ b/tools/marvin/marvin/integration/lib/base/VpnConnection.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 VpnConnection(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/VpnCustomerGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py
index 36e51c3..40c661e 100644
--- a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py
+++ b/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.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 VpnCustomerGateway(CloudStackEntity):
 
     def create(self, apiclient, VpnCustomerGatewayFactory, ipsecpsk, cidrlist, esppolicy,
ikepolicy, gateway, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VpnGateway.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnGateway.py b/tools/marvin/marvin/integration/lib/base/VpnGateway.py
index bc16935..2ba149f 100644
--- a/tools/marvin/marvin/integration/lib/base/VpnGateway.py
+++ b/tools/marvin/marvin/integration/lib/base/VpnGateway.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 VpnGateway(CloudStackEntity):
 
     def create(self, apiclient, VpnGatewayFactory, vpcid, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/VpnUser.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/VpnUser.py b/tools/marvin/marvin/integration/lib/base/VpnUser.py
index d4bf6cf..7f8a260 100644
--- a/tools/marvin/marvin/integration/lib/base/VpnUser.py
+++ b/tools/marvin/marvin/integration/lib/base/VpnUser.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 VpnUser(CloudStackEntity):
 
     def add(self, apiclient, username, password, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/base/Zone.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/base/Zone.py b/tools/marvin/marvin/integration/lib/base/Zone.py
index 11f7428..d663eec 100644
--- a/tools/marvin/marvin/integration/lib/base/Zone.py
+++ b/tools/marvin/marvin/integration/lib/base/Zone.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 Zone(CloudStackEntity):
 
     def create(self, apiclient, ZoneFactory, networktype, dns1, internaldns1, name, **kwargs):

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
index 124d3e0..f32979b 100644
--- a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/AccountFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Account
+from marvin.integration.lib.base import Account
 class AccountFactory(factory.Factory):
 
     FACTORY_FOR = Account

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
index a652968..20a73f3 100644
--- a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import AutoScalePolicy
+from marvin.integration.lib.base import AutoScalePolicy
 class AutoScalePolicyFactory(factory.Factory):
 
     FACTORY_FOR = AutoScalePolicy

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
index 3ebe3de..4b1f8ae 100644
--- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import AutoScaleVmGroup
+from marvin.integration.lib.base import AutoScaleVmGroup
 class AutoScaleVmGroupFactory(factory.Factory):
 
     FACTORY_FOR = AutoScaleVmGroup

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
index 5215419..a0daf30 100644
--- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import AutoScaleVmProfile
+from marvin.integration.lib.base import AutoScaleVmProfile
 class AutoScaleVmProfileFactory(factory.Factory):
 
     FACTORY_FOR = AutoScaleVmProfile

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py b/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
index c796e7d..fccfddf 100644
--- a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Condition
+from marvin.integration.lib.base import Condition
 class ConditionFactory(factory.Factory):
 
     FACTORY_FOR = Condition

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py b/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
index 5fc34a4..046d43a 100644
--- a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/CounterFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Counter
+from marvin.integration.lib.base import Counter
 class CounterFactory(factory.Factory):
 
     FACTORY_FOR = Counter

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
index c1b36ac..df3ef3e 100644
--- a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import DiskOffering
+from marvin.integration.lib.base import DiskOffering
 class DiskOfferingFactory(factory.Factory):
 
     FACTORY_FOR = DiskOffering

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py b/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
index cf46d1e..9f5158e 100644
--- a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/DomainFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Domain
+from marvin.integration.lib.base import Domain
 class DomainFactory(factory.Factory):
 
     FACTORY_FOR = Domain

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
index 81c3366..a0d17ec 100644
--- a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import FirewallRule
+from marvin.integration.lib.base import FirewallRule
 class FirewallRuleFactory(factory.Factory):
 
     FACTORY_FOR = FirewallRule

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
index b3b81f8..022a79a 100644
--- a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import InstanceGroup
+from marvin.integration.lib.base import InstanceGroup
 class InstanceGroupFactory(factory.Factory):
 
     FACTORY_FOR = InstanceGroup

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
index 57399af..f8c6894 100644
--- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import IpAddress
+from marvin.integration.lib.base import IpAddress
 class IpAddressFactory(factory.Factory):
 
     FACTORY_FOR = IpAddress

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
index 35847cc..c9bc447 100644
--- a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import IpForwardingRule
+from marvin.integration.lib.base import IpForwardingRule
 class IpForwardingRuleFactory(factory.Factory):
 
     FACTORY_FOR = IpForwardingRule

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
index 534be28..086c7e5 100644
--- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/IsoFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Iso
+from marvin.integration.lib.base import Iso
 class IsoFactory(factory.Factory):
 
     FACTORY_FOR = Iso

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
index a23c533..380ab66 100644
--- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import LBStickinessPolicy
+from marvin.integration.lib.base import LBStickinessPolicy
 class LBStickinessPolicyFactory(factory.Factory):
 
     FACTORY_FOR = LBStickinessPolicy

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
index 5b911c6..82d38a6 100644
--- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import LoadBalancerRule
+from marvin.integration.lib.base import LoadBalancerRule
 class LoadBalancerRuleFactory(factory.Factory):
 
     FACTORY_FOR = LoadBalancerRule

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
index 7923cb2..1969725 100644
--- a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import NetworkACL
+from marvin.integration.lib.base import NetworkACL
 class NetworkACLFactory(factory.Factory):
 
     FACTORY_FOR = NetworkACL

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
index 239df4d..ed8f1ab 100644
--- a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Network
+from marvin.integration.lib.base import Network
 class NetworkFactory(factory.Factory):
 
     FACTORY_FOR = Network

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
index b1acff9..7736281 100644
--- a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import NetworkOffering
+from marvin.integration.lib.base import NetworkOffering
 class NetworkOfferingFactory(factory.Factory):
 
     FACTORY_FOR = NetworkOffering

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py b/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
index 8a93fe2..6438846 100644
--- a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import PhysicalNetwork
+from marvin.integration.lib.base import PhysicalNetwork
 class PhysicalNetworkFactory(factory.Factory):
 
     FACTORY_FOR = PhysicalNetwork

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/PodFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PodFactory.py b/tools/marvin/marvin/integration/lib/factory/PodFactory.py
index 65740ba..0cff95d 100644
--- a/tools/marvin/marvin/integration/lib/factory/PodFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/PodFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Pod
+from marvin.integration.lib.base import Pod
 class PodFactory(factory.Factory):
 
     FACTORY_FOR = Pod

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py b/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
index 681dc68..179d1e0 100644
--- a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import PortForwardingRule
+from marvin.integration.lib.base import PortForwardingRule
 class PortForwardingRuleFactory(factory.Factory):
 
     FACTORY_FOR = PortForwardingRule

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
index 929f2dd..cdc2bb6 100644
--- a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import PrivateGateway
+from marvin.integration.lib.base import PrivateGateway
 class PrivateGatewayFactory(factory.Factory):
 
     FACTORY_FOR = PrivateGateway

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py b/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
index 01ba771..6edeff2 100644
--- a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Project
+from marvin.integration.lib.base import Project
 class ProjectFactory(factory.Factory):
 
     FACTORY_FOR = Project

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py b/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
index c34b824..6c52d60 100644
--- a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import RemoteAccessVpn
+from marvin.integration.lib.base import RemoteAccessVpn
 class RemoteAccessVpnFactory(factory.Factory):
 
     FACTORY_FOR = RemoteAccessVpn

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py b/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
index 784e8d8..0838f30 100644
--- a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import SSHKeyPair
+from marvin.integration.lib.base import SSHKeyPair
 class SSHKeyPairFactory(factory.Factory):
 
     FACTORY_FOR = SSHKeyPair

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py b/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
index fd15db3..8cb85e1 100644
--- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import SecurityGroup
+from marvin.integration.lib.base import SecurityGroup
 class SecurityGroupFactory(factory.Factory):
 
     FACTORY_FOR = SecurityGroup

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
index c9710e4..fb85187 100644
--- a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import ServiceOffering
+from marvin.integration.lib.base import ServiceOffering
 class ServiceOfferingFactory(factory.Factory):
 
     FACTORY_FOR = ServiceOffering

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
index ae08414..336fa8a 100644
--- a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Snapshot
+from marvin.integration.lib.base import Snapshot
 class SnapshotFactory(factory.Factory):
 
     FACTORY_FOR = Snapshot

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py b/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
index 6be23a5..6851fca 100644
--- a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import SnapshotPolicy
+from marvin.integration.lib.base import SnapshotPolicy
 class SnapshotPolicyFactory(factory.Factory):
 
     FACTORY_FOR = SnapshotPolicy

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py b/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
index 1b7c948..d427547 100644
--- a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import StaticRoute
+from marvin.integration.lib.base import StaticRoute
 class StaticRouteFactory(factory.Factory):
 
     FACTORY_FOR = StaticRoute

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py b/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
index 1a8cc56..8fe6ecf 100644
--- a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import StorageNetworkIpRange
+from marvin.integration.lib.base import StorageNetworkIpRange
 class StorageNetworkIpRangeFactory(factory.Factory):
 
     FACTORY_FOR = StorageNetworkIpRange

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
index 74092ff..3803bfc 100644
--- a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import StoragePool
+from marvin.integration.lib.base import StoragePool
 class StoragePoolFactory(factory.Factory):
 
     FACTORY_FOR = StoragePool

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py b/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
index 55a23fa..28e859d 100644
--- a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/TagsFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Tags
+from marvin.integration.lib.base import Tags
 class TagsFactory(factory.Factory):
 
     FACTORY_FOR = Tags

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py b/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
index fc142e1..175a6e9 100644
--- a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Template
+from marvin.integration.lib.base import Template
 class TemplateFactory(factory.Factory):
 
     FACTORY_FOR = Template

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/UserFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/UserFactory.py b/tools/marvin/marvin/integration/lib/factory/UserFactory.py
index 0fc97b0..a249478 100644
--- a/tools/marvin/marvin/integration/lib/factory/UserFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/UserFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import User
+from marvin.integration.lib.base import User
 class UserFactory(factory.Factory):
 
     FACTORY_FOR = User

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py b/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py
index 7594ac4..c905c1c 100644
--- a/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/UserKeysFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import UserKeys
+from marvin.integration.lib.base import UserKeys
 class UserKeysFactory(factory.Factory):
 
     FACTORY_FOR = UserKeys

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VPCFactory.py b/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
index 7d7f55e..bef42f6 100644
--- a/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VPCFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VPC
+from marvin.integration.lib.base import VPC
 class VPCFactory(factory.Factory):
 
     FACTORY_FOR = VPC

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py b/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
index b73f47f..ad45093 100644
--- a/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VPCOffering
+from marvin.integration.lib.base import VPCOffering
 class VPCOfferingFactory(factory.Factory):
 
     FACTORY_FOR = VPCOffering

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
index 28300fd..a9dc6c0 100644
--- a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VirtualMachine
+from marvin.integration.lib.base import VirtualMachine
 class VirtualMachineFactory(factory.Factory):
 
     FACTORY_FOR = VirtualMachine

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py b/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
index e21489d..a1f85da 100644
--- a/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VirtualRouterElement
+from marvin.integration.lib.base import VirtualRouterElement
 class VirtualRouterElementFactory(factory.Factory):
 
     FACTORY_FOR = VirtualRouterElement

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py b/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
index 45120f7..6ae1e35 100644
--- a/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VlanIpRange
+from marvin.integration.lib.base import VlanIpRange
 class VlanIpRangeFactory(factory.Factory):
 
     FACTORY_FOR = VlanIpRange

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py b/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
index cde08c1..e1f5cdb 100644
--- a/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Volume
+from marvin.integration.lib.base import Volume
 class VolumeFactory(factory.Factory):
 
     FACTORY_FOR = Volume

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
index d969ab2..7ba45dd 100644
--- a/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VpnConnection
+from marvin.integration.lib.base import VpnConnection
 class VpnConnectionFactory(factory.Factory):
 
     FACTORY_FOR = VpnConnection

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
index 87d0b75..ca85dbe 100644
--- a/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VpnCustomerGateway
+from marvin.integration.lib.base import VpnCustomerGateway
 class VpnCustomerGatewayFactory(factory.Factory):
 
     FACTORY_FOR = VpnCustomerGateway

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py b/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
index 8685740..76d9596 100644
--- a/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import VpnGateway
+from marvin.integration.lib.base import VpnGateway
 class VpnGatewayFactory(factory.Factory):
 
     FACTORY_FOR = VpnGateway

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py b/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
index 90989e6..c1aa0f0 100644
--- a/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
+++ b/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py
@@ -15,7 +15,7 @@
 # specific language governing permissions and limitations
 # under the License.
 import factory
-from marvin.integration.lib.newbase import Zone
+from marvin.integration.lib.base import Zone
 class ZoneFactory(factory.Factory):
 
     FACTORY_FOR = Zone

http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/13d94c14/tools/marvin/marvin/integration/lib/generateBase.py
----------------------------------------------------------------------
diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/integration/lib/generateBase.py
index 7524414..3e3dc79 100644
--- a/tools/marvin/marvin/integration/lib/generateBase.py
+++ b/tools/marvin/marvin/integration/lib/generateBase.py
@@ -108,7 +108,7 @@ def write_entity_classes(entities):
     entitydict = {}
     #TODO: Add license header for ASLv2
     for entity, actions in entities.iteritems():
-        code = ''
+        code = 'from . import CloudStackEntity\n'
         code += 'class %s(CloudStackEntity):'%entity
         for action, args in actions.iteritems():
             code += '\n\n'
@@ -160,7 +160,7 @@ def write_entity_factory(entity, actions):
             writer.write(code)
     else:
         code += 'import factory\n'
-        code += 'from marvin.integration.lib.newbase import %s\n'%entity
+        code += 'from marvin.integration.lib.base import %s\n'%entity
         code += 'class %sFactory(factory.Factory):'%entity
         code += '\n\n'
         code += tabspace + 'FACTORY_FOR = %s\n\n'%entity


Mime
View raw message