diff --git a/tools/marvin/marvin/integration/lib/base/Account.py b/tools/marvin/marvin/base/Account.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Account.py rename to tools/marvin/marvin/base/Account.py index 8a160c31281..aaf72ed1576 100644 --- a/tools/marvin/marvin/integration/lib/base/Account.py +++ b/tools/marvin/marvin/base/Account.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import enableAccount from marvin.cloudstackAPI import lockAccount from marvin.cloudstackAPI import createAccount diff --git a/tools/marvin/marvin/integration/lib/base/Alerts.py b/tools/marvin/marvin/base/Alerts.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/Alerts.py rename to tools/marvin/marvin/base/Alerts.py index 67dd66fd930..34aae97dfdd 100644 --- a/tools/marvin/marvin/integration/lib/base/Alerts.py +++ b/tools/marvin/marvin/base/Alerts.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listAlerts from marvin.cloudstackAPI import deleteAlerts diff --git a/tools/marvin/marvin/integration/lib/base/ApiLimit.py b/tools/marvin/marvin/base/ApiLimit.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/ApiLimit.py rename to tools/marvin/marvin/base/ApiLimit.py index 2e895c1efd4..34885b6e753 100644 --- a/tools/marvin/marvin/integration/lib/base/ApiLimit.py +++ b/tools/marvin/marvin/base/ApiLimit.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import resetApiLimit from marvin.cloudstackAPI import getApiLimit @@ -39,4 +39,3 @@ class ApiLimit(CloudStackEntity.CloudStackEntity): [setattr(cmd, key, value) for key,value in kwargs.iteritems()] apilimit = apiclient.getApiLimit(cmd) return apilimit - diff --git a/tools/marvin/marvin/integration/lib/base/Apis.py b/tools/marvin/marvin/base/Apis.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/Apis.py rename to tools/marvin/marvin/base/Apis.py index 20b93cd294a..0b56a5039cc 100644 --- a/tools/marvin/marvin/integration/lib/base/Apis.py +++ b/tools/marvin/marvin/base/Apis.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listApis class Apis(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py b/tools/marvin/marvin/base/AsyncJobResult.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/AsyncJobResult.py rename to tools/marvin/marvin/base/AsyncJobResult.py index 8eb810bcdd5..70a89cb6668 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobResult.py +++ b/tools/marvin/marvin/base/AsyncJobResult.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import queryAsyncJobResult class AsyncJobResult(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py b/tools/marvin/marvin/base/AsyncJobs.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/AsyncJobs.py rename to tools/marvin/marvin/base/AsyncJobs.py index e67a5ce3190..db39c4abc0c 100644 --- a/tools/marvin/marvin/integration/lib/base/AsyncJobs.py +++ b/tools/marvin/marvin/base/AsyncJobs.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listAsyncJobs class AsyncJobs(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py b/tools/marvin/marvin/base/AutoScalePolicy.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py rename to tools/marvin/marvin/base/AutoScalePolicy.py index e3ab828e9d3..03d073f3b87 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScalePolicy.py +++ b/tools/marvin/marvin/base/AutoScalePolicy.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createAutoScalePolicy from marvin.cloudstackAPI import updateAutoScalePolicy from marvin.cloudstackAPI import deleteAutoScalePolicy diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py b/tools/marvin/marvin/base/AutoScaleVmGroup.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py rename to tools/marvin/marvin/base/AutoScaleVmGroup.py index b4da65cb733..99fbd8c594d 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmGroup.py +++ b/tools/marvin/marvin/base/AutoScaleVmGroup.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import enableAutoScaleVmGroup from marvin.cloudstackAPI import createAutoScaleVmGroup from marvin.cloudstackAPI import listAutoScaleVmGroups diff --git a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py b/tools/marvin/marvin/base/AutoScaleVmProfile.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py rename to tools/marvin/marvin/base/AutoScaleVmProfile.py index 54ee17e57c8..e631f76f2ee 100644 --- a/tools/marvin/marvin/integration/lib/base/AutoScaleVmProfile.py +++ b/tools/marvin/marvin/base/AutoScaleVmProfile.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createAutoScaleVmProfile from marvin.cloudstackAPI import listAutoScaleVmProfiles from marvin.cloudstackAPI import updateAutoScaleVmProfile diff --git a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py b/tools/marvin/marvin/base/BigSwitchVnsDevice.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py rename to tools/marvin/marvin/base/BigSwitchVnsDevice.py index c88b18f2ab6..0f544d42265 100644 --- a/tools/marvin/marvin/integration/lib/base/BigSwitchVnsDevice.py +++ b/tools/marvin/marvin/base/BigSwitchVnsDevice.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addBigSwitchVnsDevice from marvin.cloudstackAPI import listBigSwitchVnsDevices from marvin.cloudstackAPI import deleteBigSwitchVnsDevice diff --git a/tools/marvin/marvin/integration/lib/base/Capabilities.py b/tools/marvin/marvin/base/Capabilities.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/Capabilities.py rename to tools/marvin/marvin/base/Capabilities.py index c488bb55822..6cd4fd95401 100644 --- a/tools/marvin/marvin/integration/lib/base/Capabilities.py +++ b/tools/marvin/marvin/base/Capabilities.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listCapabilities class Capabilities(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/Capacity.py b/tools/marvin/marvin/base/Capacity.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/Capacity.py rename to tools/marvin/marvin/base/Capacity.py index 0a39eda17c4..ae65468ad75 100644 --- a/tools/marvin/marvin/integration/lib/base/Capacity.py +++ b/tools/marvin/marvin/base/Capacity.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listCapacity class Capacity(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py b/tools/marvin/marvin/base/CloudIdentifier.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/CloudIdentifier.py rename to tools/marvin/marvin/base/CloudIdentifier.py index d8608c8de1d..4f055f9578f 100644 --- a/tools/marvin/marvin/integration/lib/base/CloudIdentifier.py +++ b/tools/marvin/marvin/base/CloudIdentifier.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import getCloudIdentifier class CloudIdentifier(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/CloudStackEntity.py b/tools/marvin/marvin/base/CloudStackEntity.py similarity index 100% rename from tools/marvin/marvin/integration/lib/base/CloudStackEntity.py rename to tools/marvin/marvin/base/CloudStackEntity.py diff --git a/tools/marvin/marvin/integration/lib/base/Cluster.py b/tools/marvin/marvin/base/Cluster.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Cluster.py rename to tools/marvin/marvin/base/Cluster.py index 5997b726682..80ac7eee4f1 100644 --- a/tools/marvin/marvin/integration/lib/base/Cluster.py +++ b/tools/marvin/marvin/base/Cluster.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addCluster from marvin.cloudstackAPI import listClusters from marvin.cloudstackAPI import updateCluster diff --git a/tools/marvin/marvin/integration/lib/base/Condition.py b/tools/marvin/marvin/base/Condition.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Condition.py rename to tools/marvin/marvin/base/Condition.py index 362edd74068..e20c2ef08b6 100644 --- a/tools/marvin/marvin/integration/lib/base/Condition.py +++ b/tools/marvin/marvin/base/Condition.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createCondition from marvin.cloudstackAPI import listConditions from marvin.cloudstackAPI import deleteCondition diff --git a/tools/marvin/marvin/integration/lib/base/Configuration.py b/tools/marvin/marvin/base/Configuration.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/Configuration.py rename to tools/marvin/marvin/base/Configuration.py index 0e02bd36ddc..caf63ea1cb2 100644 --- a/tools/marvin/marvin/integration/lib/base/Configuration.py +++ b/tools/marvin/marvin/base/Configuration.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listConfigurations from marvin.cloudstackAPI import updateConfiguration diff --git a/tools/marvin/marvin/integration/lib/base/Counter.py b/tools/marvin/marvin/base/Counter.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Counter.py rename to tools/marvin/marvin/base/Counter.py index 0412a6356a7..ca0e9aaf0ca 100644 --- a/tools/marvin/marvin/integration/lib/base/Counter.py +++ b/tools/marvin/marvin/base/Counter.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createCounter from marvin.cloudstackAPI import listCounters from marvin.cloudstackAPI import deleteCounter diff --git a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py b/tools/marvin/marvin/base/CustomCertificate.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/CustomCertificate.py rename to tools/marvin/marvin/base/CustomCertificate.py index 847b1ecc5f5..6df35161c16 100644 --- a/tools/marvin/marvin/integration/lib/base/CustomCertificate.py +++ b/tools/marvin/marvin/base/CustomCertificate.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import uploadCustomCertificate class CustomCertificate(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/DiskOffering.py b/tools/marvin/marvin/base/DiskOffering.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/DiskOffering.py rename to tools/marvin/marvin/base/DiskOffering.py index 7be788017c2..bdab728bbf0 100644 --- a/tools/marvin/marvin/integration/lib/base/DiskOffering.py +++ b/tools/marvin/marvin/base/DiskOffering.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createDiskOffering from marvin.cloudstackAPI import listDiskOfferings from marvin.cloudstackAPI import updateDiskOffering diff --git a/tools/marvin/marvin/integration/lib/base/Domain.py b/tools/marvin/marvin/base/Domain.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Domain.py rename to tools/marvin/marvin/base/Domain.py index dc885d71dbb..9fd87d2fc09 100644 --- a/tools/marvin/marvin/integration/lib/base/Domain.py +++ b/tools/marvin/marvin/base/Domain.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createDomain from marvin.cloudstackAPI import listDomains from marvin.cloudstackAPI import updateDomain diff --git a/tools/marvin/marvin/integration/lib/base/DomainChildren.py b/tools/marvin/marvin/base/DomainChildren.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/DomainChildren.py rename to tools/marvin/marvin/base/DomainChildren.py index 093be11962e..860348d0211 100644 --- a/tools/marvin/marvin/integration/lib/base/DomainChildren.py +++ b/tools/marvin/marvin/base/DomainChildren.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listDomainChildren class DomainChildren(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py b/tools/marvin/marvin/base/EgressFirewallRule.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py rename to tools/marvin/marvin/base/EgressFirewallRule.py index 5c246021436..fb14a39b947 100644 --- a/tools/marvin/marvin/integration/lib/base/EgressFirewallRule.py +++ b/tools/marvin/marvin/base/EgressFirewallRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createEgressFirewallRule from marvin.cloudstackAPI import listEgressFirewallRules from marvin.cloudstackAPI import deleteEgressFirewallRule diff --git a/tools/marvin/marvin/integration/lib/base/EventTypes.py b/tools/marvin/marvin/base/EventTypes.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/EventTypes.py rename to tools/marvin/marvin/base/EventTypes.py index f83b415b120..5b6ce099894 100644 --- a/tools/marvin/marvin/integration/lib/base/EventTypes.py +++ b/tools/marvin/marvin/base/EventTypes.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listEventTypes class EventTypes(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/Events.py b/tools/marvin/marvin/base/Events.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/Events.py rename to tools/marvin/marvin/base/Events.py index 048dce6da5b..ba39f5425e3 100644 --- a/tools/marvin/marvin/integration/lib/base/Events.py +++ b/tools/marvin/marvin/base/Events.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listEvents from marvin.cloudstackAPI import deleteEvents diff --git a/tools/marvin/marvin/integration/lib/base/FirewallRule.py b/tools/marvin/marvin/base/FirewallRule.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/FirewallRule.py rename to tools/marvin/marvin/base/FirewallRule.py index 475925febe8..f54c3714997 100644 --- a/tools/marvin/marvin/integration/lib/base/FirewallRule.py +++ b/tools/marvin/marvin/base/FirewallRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createFirewallRule from marvin.cloudstackAPI import listFirewallRules from marvin.cloudstackAPI import deleteFirewallRule diff --git a/tools/marvin/marvin/integration/lib/base/GlobalLoadBalancerRule.py b/tools/marvin/marvin/base/GlobalLoadBalancerRule.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/GlobalLoadBalancerRule.py rename to tools/marvin/marvin/base/GlobalLoadBalancerRule.py index e2ffbf85b32..0ade923318f 100644 --- a/tools/marvin/marvin/integration/lib/base/GlobalLoadBalancerRule.py +++ b/tools/marvin/marvin/base/GlobalLoadBalancerRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createGlobalLoadBalancerRule from marvin.cloudstackAPI import listGlobalLoadBalancerRules from marvin.cloudstackAPI import updateGlobalLoadBalancerRule diff --git a/tools/marvin/marvin/integration/lib/base/Host.py b/tools/marvin/marvin/base/Host.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Host.py rename to tools/marvin/marvin/base/Host.py index 48925313e78..9127a22de84 100644 --- a/tools/marvin/marvin/integration/lib/base/Host.py +++ b/tools/marvin/marvin/base/Host.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addHost from marvin.cloudstackAPI import listHosts from marvin.cloudstackAPI import updateHost diff --git a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py b/tools/marvin/marvin/base/HypervisorCapabilities.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py rename to tools/marvin/marvin/base/HypervisorCapabilities.py index 569c0c0ea12..879ff70915e 100644 --- a/tools/marvin/marvin/integration/lib/base/HypervisorCapabilities.py +++ b/tools/marvin/marvin/base/HypervisorCapabilities.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listHypervisorCapabilities from marvin.cloudstackAPI import updateHypervisorCapabilities diff --git a/tools/marvin/marvin/integration/lib/base/Hypervisors.py b/tools/marvin/marvin/base/Hypervisors.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/Hypervisors.py rename to tools/marvin/marvin/base/Hypervisors.py index 6b61fed23d3..ba9a89e4574 100644 --- a/tools/marvin/marvin/integration/lib/base/Hypervisors.py +++ b/tools/marvin/marvin/base/Hypervisors.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listHypervisors class Hypervisors(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py b/tools/marvin/marvin/base/InstanceGroup.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/InstanceGroup.py rename to tools/marvin/marvin/base/InstanceGroup.py index f3015e83712..64019f85681 100644 --- a/tools/marvin/marvin/integration/lib/base/InstanceGroup.py +++ b/tools/marvin/marvin/base/InstanceGroup.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createInstanceGroup from marvin.cloudstackAPI import listInstanceGroups from marvin.cloudstackAPI import updateInstanceGroup diff --git a/tools/marvin/marvin/integration/lib/base/IpAddress.py b/tools/marvin/marvin/base/IpAddress.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/IpAddress.py rename to tools/marvin/marvin/base/IpAddress.py index ed4a8c0ffd9..6fdfe1e573d 100644 --- a/tools/marvin/marvin/integration/lib/base/IpAddress.py +++ b/tools/marvin/marvin/base/IpAddress.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import disassociateIpAddress from marvin.cloudstackAPI import associateIpAddress from marvin.cloudstackAPI import listPublicIpAddresses diff --git a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py b/tools/marvin/marvin/base/IpForwardingRule.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/IpForwardingRule.py rename to tools/marvin/marvin/base/IpForwardingRule.py index 2de73e4cb5d..479e5b38d8a 100644 --- a/tools/marvin/marvin/integration/lib/base/IpForwardingRule.py +++ b/tools/marvin/marvin/base/IpForwardingRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createIpForwardingRule from marvin.cloudstackAPI import listIpForwardingRules from marvin.cloudstackAPI import deleteIpForwardingRule diff --git a/tools/marvin/marvin/integration/lib/base/Iso.py b/tools/marvin/marvin/base/Iso.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Iso.py rename to tools/marvin/marvin/base/Iso.py index b6e3e221467..52070e243bb 100644 --- a/tools/marvin/marvin/integration/lib/base/Iso.py +++ b/tools/marvin/marvin/base/Iso.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import copyIso from marvin.cloudstackAPI import registerIso from marvin.cloudstackAPI import listIsos diff --git a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py b/tools/marvin/marvin/base/IsoPermissions.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/IsoPermissions.py rename to tools/marvin/marvin/base/IsoPermissions.py index f94fee90f21..8893cecb001 100644 --- a/tools/marvin/marvin/integration/lib/base/IsoPermissions.py +++ b/tools/marvin/marvin/base/IsoPermissions.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listIsoPermissions from marvin.cloudstackAPI import updateIsoPermissions diff --git a/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py b/tools/marvin/marvin/base/LBHealthCheckPolicy.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py rename to tools/marvin/marvin/base/LBHealthCheckPolicy.py index b2eb69293db..61843700d91 100644 --- a/tools/marvin/marvin/integration/lib/base/LBHealthCheckPolicy.py +++ b/tools/marvin/marvin/base/LBHealthCheckPolicy.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createLBHealthCheckPolicy from marvin.cloudstackAPI import deleteLBHealthCheckPolicy from marvin.cloudstackAPI import listLBHealthCheckPolicies diff --git a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py b/tools/marvin/marvin/base/LBStickinessPolicy.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py rename to tools/marvin/marvin/base/LBStickinessPolicy.py index 1599a915b5b..9d251196c3b 100644 --- a/tools/marvin/marvin/integration/lib/base/LBStickinessPolicy.py +++ b/tools/marvin/marvin/base/LBStickinessPolicy.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createLBStickinessPolicy from marvin.cloudstackAPI import deleteLBStickinessPolicy from marvin.cloudstackAPI import listLBStickinessPolicies diff --git a/tools/marvin/marvin/integration/lib/base/Ldap.py b/tools/marvin/marvin/base/Ldap.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/Ldap.py rename to tools/marvin/marvin/base/Ldap.py index 3cd0561a0ee..19de47d03d4 100644 --- a/tools/marvin/marvin/integration/lib/base/Ldap.py +++ b/tools/marvin/marvin/base/Ldap.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import ldapRemove from marvin.cloudstackAPI import ldapConfig diff --git a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py b/tools/marvin/marvin/base/LoadBalancerRule.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py rename to tools/marvin/marvin/base/LoadBalancerRule.py index c67f499d968..3d9f999493c 100644 --- a/tools/marvin/marvin/integration/lib/base/LoadBalancerRule.py +++ b/tools/marvin/marvin/base/LoadBalancerRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createLoadBalancerRule from marvin.cloudstackAPI import listLoadBalancerRules from marvin.cloudstackAPI import updateLoadBalancerRule diff --git a/tools/marvin/marvin/integration/lib/base/Network.py b/tools/marvin/marvin/base/Network.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Network.py rename to tools/marvin/marvin/base/Network.py index 9a108560388..46232dc3bb9 100644 --- a/tools/marvin/marvin/integration/lib/base/Network.py +++ b/tools/marvin/marvin/base/Network.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createNetwork from marvin.cloudstackAPI import listNetworks from marvin.cloudstackAPI import updateNetwork diff --git a/tools/marvin/marvin/integration/lib/base/NetworkACL.py b/tools/marvin/marvin/base/NetworkACL.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/NetworkACL.py rename to tools/marvin/marvin/base/NetworkACL.py index fd23b111b1f..7c81cd182cc 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkACL.py +++ b/tools/marvin/marvin/base/NetworkACL.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createNetworkACL from marvin.cloudstackAPI import listNetworkACLs from marvin.cloudstackAPI import deleteNetworkACL diff --git a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py b/tools/marvin/marvin/base/NetworkDevice.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/NetworkDevice.py rename to tools/marvin/marvin/base/NetworkDevice.py index 9c15ebd30a9..61c249ddb1e 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkDevice.py +++ b/tools/marvin/marvin/base/NetworkDevice.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addNetworkDevice from marvin.cloudstackAPI import listNetworkDevice from marvin.cloudstackAPI import deleteNetworkDevice diff --git a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py b/tools/marvin/marvin/base/NetworkOffering.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/NetworkOffering.py rename to tools/marvin/marvin/base/NetworkOffering.py index 56eeba45d2e..30fb37244de 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkOffering.py +++ b/tools/marvin/marvin/base/NetworkOffering.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createNetworkOffering from marvin.cloudstackAPI import listNetworkOfferings from marvin.cloudstackAPI import updateNetworkOffering diff --git a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py b/tools/marvin/marvin/base/NetworkServiceProvider.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py rename to tools/marvin/marvin/base/NetworkServiceProvider.py index 094e1cc8831..39e9a422c88 100644 --- a/tools/marvin/marvin/integration/lib/base/NetworkServiceProvider.py +++ b/tools/marvin/marvin/base/NetworkServiceProvider.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addNetworkServiceProvider from marvin.cloudstackAPI import listNetworkServiceProviders from marvin.cloudstackAPI import updateNetworkServiceProvider diff --git a/tools/marvin/marvin/integration/lib/base/Nic.py b/tools/marvin/marvin/base/Nic.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Nic.py rename to tools/marvin/marvin/base/Nic.py index fda4499a29a..d1dcaa531c1 100644 --- a/tools/marvin/marvin/integration/lib/base/Nic.py +++ b/tools/marvin/marvin/base/Nic.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listNics from marvin.cloudstackAPI import addIpToNic from marvin.cloudstackAPI import removeIpFromNic diff --git a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py b/tools/marvin/marvin/base/NiciraNvpDevice.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py rename to tools/marvin/marvin/base/NiciraNvpDevice.py index 24a756d65ad..11eaa53bd09 100644 --- a/tools/marvin/marvin/integration/lib/base/NiciraNvpDevice.py +++ b/tools/marvin/marvin/base/NiciraNvpDevice.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addNiciraNvpDevice from marvin.cloudstackAPI import listNiciraNvpDevices from marvin.cloudstackAPI import deleteNiciraNvpDevice diff --git a/tools/marvin/marvin/integration/lib/base/OsCategories.py b/tools/marvin/marvin/base/OsCategories.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/OsCategories.py rename to tools/marvin/marvin/base/OsCategories.py index 54d9a720867..53799f541ad 100644 --- a/tools/marvin/marvin/integration/lib/base/OsCategories.py +++ b/tools/marvin/marvin/base/OsCategories.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listOsCategories class OsCategories(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/OsTypes.py b/tools/marvin/marvin/base/OsTypes.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/OsTypes.py rename to tools/marvin/marvin/base/OsTypes.py index 384eb527382..269bce7fbed 100644 --- a/tools/marvin/marvin/integration/lib/base/OsTypes.py +++ b/tools/marvin/marvin/base/OsTypes.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listOsTypes class OsTypes(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py b/tools/marvin/marvin/base/PhysicalNetwork.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py rename to tools/marvin/marvin/base/PhysicalNetwork.py index db9dffe3eb1..d802fd11fbf 100644 --- a/tools/marvin/marvin/integration/lib/base/PhysicalNetwork.py +++ b/tools/marvin/marvin/base/PhysicalNetwork.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createPhysicalNetwork from marvin.cloudstackAPI import listPhysicalNetworks from marvin.cloudstackAPI import updatePhysicalNetwork diff --git a/tools/marvin/marvin/integration/lib/base/Pod.py b/tools/marvin/marvin/base/Pod.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Pod.py rename to tools/marvin/marvin/base/Pod.py index ab7801e46b4..17935bd53c9 100644 --- a/tools/marvin/marvin/integration/lib/base/Pod.py +++ b/tools/marvin/marvin/base/Pod.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createPod from marvin.cloudstackAPI import listPods from marvin.cloudstackAPI import updatePod diff --git a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py b/tools/marvin/marvin/base/PortForwardingRule.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/PortForwardingRule.py rename to tools/marvin/marvin/base/PortForwardingRule.py index 822845b1e9d..42448fdefe5 100644 --- a/tools/marvin/marvin/integration/lib/base/PortForwardingRule.py +++ b/tools/marvin/marvin/base/PortForwardingRule.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createPortForwardingRule from marvin.cloudstackAPI import listPortForwardingRules from marvin.cloudstackAPI import updatePortForwardingRule diff --git a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py b/tools/marvin/marvin/base/PrivateGateway.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/PrivateGateway.py rename to tools/marvin/marvin/base/PrivateGateway.py index 751a9e7107b..d4d58d3a3dc 100644 --- a/tools/marvin/marvin/integration/lib/base/PrivateGateway.py +++ b/tools/marvin/marvin/base/PrivateGateway.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createPrivateGateway from marvin.cloudstackAPI import listPrivateGateways from marvin.cloudstackAPI import deletePrivateGateway diff --git a/tools/marvin/marvin/integration/lib/base/Project.py b/tools/marvin/marvin/base/Project.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Project.py rename to tools/marvin/marvin/base/Project.py index 1fc5b53f05f..9c13ece6464 100644 --- a/tools/marvin/marvin/integration/lib/base/Project.py +++ b/tools/marvin/marvin/base/Project.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import suspendProject from marvin.cloudstackAPI import createProject from marvin.cloudstackAPI import listProjects diff --git a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py b/tools/marvin/marvin/base/ProjectInvitation.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/ProjectInvitation.py rename to tools/marvin/marvin/base/ProjectInvitation.py index 7306bc21653..7eddce758e2 100644 --- a/tools/marvin/marvin/integration/lib/base/ProjectInvitation.py +++ b/tools/marvin/marvin/base/ProjectInvitation.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listProjectInvitations from marvin.cloudstackAPI import updateProjectInvitation from marvin.cloudstackAPI import deleteProjectInvitation diff --git a/tools/marvin/marvin/integration/lib/base/Region.py b/tools/marvin/marvin/base/Region.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Region.py rename to tools/marvin/marvin/base/Region.py index 0b47b3d88dd..e5201963410 100644 --- a/tools/marvin/marvin/integration/lib/base/Region.py +++ b/tools/marvin/marvin/base/Region.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addRegion from marvin.cloudstackAPI import listRegions from marvin.cloudstackAPI import updateRegion diff --git a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py b/tools/marvin/marvin/base/RemoteAccessVpn.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py rename to tools/marvin/marvin/base/RemoteAccessVpn.py index 21cba57e512..5a0bc9a3960 100644 --- a/tools/marvin/marvin/integration/lib/base/RemoteAccessVpn.py +++ b/tools/marvin/marvin/base/RemoteAccessVpn.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createRemoteAccessVpn from marvin.cloudstackAPI import listRemoteAccessVpns from marvin.cloudstackAPI import deleteRemoteAccessVpn diff --git a/tools/marvin/marvin/integration/lib/base/ResourceCount.py b/tools/marvin/marvin/base/ResourceCount.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/ResourceCount.py rename to tools/marvin/marvin/base/ResourceCount.py index fd701681385..06a1dce0ae4 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceCount.py +++ b/tools/marvin/marvin/base/ResourceCount.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import updateResourceCount class ResourceCount(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py b/tools/marvin/marvin/base/ResourceLimit.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/ResourceLimit.py rename to tools/marvin/marvin/base/ResourceLimit.py index 66dab4c0bd3..78c9c910d03 100644 --- a/tools/marvin/marvin/integration/lib/base/ResourceLimit.py +++ b/tools/marvin/marvin/base/ResourceLimit.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listResourceLimits from marvin.cloudstackAPI import updateResourceLimit diff --git a/tools/marvin/marvin/integration/lib/base/Router.py b/tools/marvin/marvin/base/Router.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Router.py rename to tools/marvin/marvin/base/Router.py index 6e3ed116975..012eb33d52c 100644 --- a/tools/marvin/marvin/integration/lib/base/Router.py +++ b/tools/marvin/marvin/base/Router.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import destroyRouter from marvin.cloudstackAPI import listRouters from marvin.cloudstackAPI import stopRouter diff --git a/tools/marvin/marvin/integration/lib/base/S3.py b/tools/marvin/marvin/base/S3.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/S3.py rename to tools/marvin/marvin/base/S3.py index fa0fdc33ea5..d9957945c48 100644 --- a/tools/marvin/marvin/integration/lib/base/S3.py +++ b/tools/marvin/marvin/base/S3.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addS3 from marvin.cloudstackAPI import listS3s diff --git a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py b/tools/marvin/marvin/base/SSHKeyPair.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/SSHKeyPair.py rename to tools/marvin/marvin/base/SSHKeyPair.py index 51e7316b6ff..670515686ac 100644 --- a/tools/marvin/marvin/integration/lib/base/SSHKeyPair.py +++ b/tools/marvin/marvin/base/SSHKeyPair.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createSSHKeyPair from marvin.cloudstackAPI import registerSSHKeyPair from marvin.cloudstackAPI import listSSHKeyPairs diff --git a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py b/tools/marvin/marvin/base/SecondaryStorage.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/SecondaryStorage.py rename to tools/marvin/marvin/base/SecondaryStorage.py index 8f7e8c62d68..ec57bb13d1f 100644 --- a/tools/marvin/marvin/integration/lib/base/SecondaryStorage.py +++ b/tools/marvin/marvin/base/SecondaryStorage.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addSecondaryStorage class SecondaryStorage(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py b/tools/marvin/marvin/base/SecurityGroup.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/SecurityGroup.py rename to tools/marvin/marvin/base/SecurityGroup.py index bc0f01ba108..3ed662c90f3 100644 --- a/tools/marvin/marvin/integration/lib/base/SecurityGroup.py +++ b/tools/marvin/marvin/base/SecurityGroup.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createSecurityGroup from marvin.cloudstackAPI import listSecurityGroups from marvin.cloudstackAPI import deleteSecurityGroup diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py b/tools/marvin/marvin/base/ServiceForRouter.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/ServiceForRouter.py rename to tools/marvin/marvin/base/ServiceForRouter.py index c754c98ce12..c2e8f3521da 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForRouter.py +++ b/tools/marvin/marvin/base/ServiceForRouter.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForRouter class ServiceForRouter(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py b/tools/marvin/marvin/base/ServiceForSystemVm.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py rename to tools/marvin/marvin/base/ServiceForSystemVm.py index dd09d49e18c..512154f62eb 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForSystemVm.py +++ b/tools/marvin/marvin/base/ServiceForSystemVm.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForSystemVm class ServiceForSystemVm(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py b/tools/marvin/marvin/base/ServiceForVirtualMachine.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py rename to tools/marvin/marvin/base/ServiceForVirtualMachine.py index 251dad39157..a8fbff00699 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceForVirtualMachine.py +++ b/tools/marvin/marvin/base/ServiceForVirtualMachine.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import changeServiceForVirtualMachine class ServiceForVirtualMachine(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py b/tools/marvin/marvin/base/ServiceOffering.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/ServiceOffering.py rename to tools/marvin/marvin/base/ServiceOffering.py index 665874ee362..aa49bb34e3c 100644 --- a/tools/marvin/marvin/integration/lib/base/ServiceOffering.py +++ b/tools/marvin/marvin/base/ServiceOffering.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createServiceOffering from marvin.cloudstackAPI import listServiceOfferings from marvin.cloudstackAPI import updateServiceOffering diff --git a/tools/marvin/marvin/integration/lib/base/Simulator.py b/tools/marvin/marvin/base/Simulator.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/Simulator.py rename to tools/marvin/marvin/base/Simulator.py index b89b8294f5c..e609f48f403 100644 --- a/tools/marvin/marvin/integration/lib/base/Simulator.py +++ b/tools/marvin/marvin/base/Simulator.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import configureSimulator class Simulator(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/Snapshot.py b/tools/marvin/marvin/base/Snapshot.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Snapshot.py rename to tools/marvin/marvin/base/Snapshot.py index 845ddf21dfb..d8f990f1e86 100644 --- a/tools/marvin/marvin/integration/lib/base/Snapshot.py +++ b/tools/marvin/marvin/base/Snapshot.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createSnapshot from marvin.cloudstackAPI import listSnapshots from marvin.cloudstackAPI import deleteSnapshot diff --git a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py b/tools/marvin/marvin/base/SnapshotPolicy.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py rename to tools/marvin/marvin/base/SnapshotPolicy.py index a3ef2f87c26..5358bac917f 100644 --- a/tools/marvin/marvin/integration/lib/base/SnapshotPolicy.py +++ b/tools/marvin/marvin/base/SnapshotPolicy.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createSnapshotPolicy from marvin.cloudstackAPI import listSnapshotPolicies from marvin.cloudstackAPI import deleteSnapshotPolicies diff --git a/tools/marvin/marvin/integration/lib/base/StaticNat.py b/tools/marvin/marvin/base/StaticNat.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/StaticNat.py rename to tools/marvin/marvin/base/StaticNat.py index 774aa1fb0c9..e99256793fd 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticNat.py +++ b/tools/marvin/marvin/base/StaticNat.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import enableStaticNat from marvin.cloudstackAPI import disableStaticNat diff --git a/tools/marvin/marvin/integration/lib/base/StaticRoute.py b/tools/marvin/marvin/base/StaticRoute.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/StaticRoute.py rename to tools/marvin/marvin/base/StaticRoute.py index 0e44e8bfa68..e8bf1878388 100644 --- a/tools/marvin/marvin/integration/lib/base/StaticRoute.py +++ b/tools/marvin/marvin/base/StaticRoute.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createStaticRoute from marvin.cloudstackAPI import listStaticRoutes from marvin.cloudstackAPI import deleteStaticRoute diff --git a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py b/tools/marvin/marvin/base/StorageNetworkIpRange.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py rename to tools/marvin/marvin/base/StorageNetworkIpRange.py index 2685c92f53e..350529c6823 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageNetworkIpRange.py +++ b/tools/marvin/marvin/base/StorageNetworkIpRange.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createStorageNetworkIpRange from marvin.cloudstackAPI import listStorageNetworkIpRange from marvin.cloudstackAPI import updateStorageNetworkIpRange diff --git a/tools/marvin/marvin/integration/lib/base/StoragePool.py b/tools/marvin/marvin/base/StoragePool.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/StoragePool.py rename to tools/marvin/marvin/base/StoragePool.py index fa3d060d3c5..26f039e0cb2 100644 --- a/tools/marvin/marvin/integration/lib/base/StoragePool.py +++ b/tools/marvin/marvin/base/StoragePool.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createStoragePool from marvin.cloudstackAPI import listStoragePools from marvin.cloudstackAPI import updateStoragePool diff --git a/tools/marvin/marvin/integration/lib/base/StorageProviders.py b/tools/marvin/marvin/base/StorageProviders.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/StorageProviders.py rename to tools/marvin/marvin/base/StorageProviders.py index 406282fe8f1..7dab8a67977 100644 --- a/tools/marvin/marvin/integration/lib/base/StorageProviders.py +++ b/tools/marvin/marvin/base/StorageProviders.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listStorageProviders class StorageProviders(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py b/tools/marvin/marvin/base/SupportedNetworkServices.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py rename to tools/marvin/marvin/base/SupportedNetworkServices.py index 7230ed1edd6..ec62c06f420 100644 --- a/tools/marvin/marvin/integration/lib/base/SupportedNetworkServices.py +++ b/tools/marvin/marvin/base/SupportedNetworkServices.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listSupportedNetworkServices class SupportedNetworkServices(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/Swift.py b/tools/marvin/marvin/base/Swift.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/Swift.py rename to tools/marvin/marvin/base/Swift.py index 435251c1773..3cef301e69b 100644 --- a/tools/marvin/marvin/integration/lib/base/Swift.py +++ b/tools/marvin/marvin/base/Swift.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addSwift from marvin.cloudstackAPI import listSwifts diff --git a/tools/marvin/marvin/integration/lib/base/SystemVm.py b/tools/marvin/marvin/base/SystemVm.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/SystemVm.py rename to tools/marvin/marvin/base/SystemVm.py index c0f427b463a..45e7a7541d0 100644 --- a/tools/marvin/marvin/integration/lib/base/SystemVm.py +++ b/tools/marvin/marvin/base/SystemVm.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import migrateSystemVm from marvin.cloudstackAPI import stopSystemVm from marvin.cloudstackAPI import listSystemVms diff --git a/tools/marvin/marvin/integration/lib/base/Tags.py b/tools/marvin/marvin/base/Tags.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Tags.py rename to tools/marvin/marvin/base/Tags.py index c7f40a3f0a7..38e47a5db60 100644 --- a/tools/marvin/marvin/integration/lib/base/Tags.py +++ b/tools/marvin/marvin/base/Tags.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createTags from marvin.cloudstackAPI import listTags from marvin.cloudstackAPI import deleteTags diff --git a/tools/marvin/marvin/integration/lib/base/Template.py b/tools/marvin/marvin/base/Template.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Template.py rename to tools/marvin/marvin/base/Template.py index 71d9ae94887..b2c6fada939 100644 --- a/tools/marvin/marvin/integration/lib/base/Template.py +++ b/tools/marvin/marvin/base/Template.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import prepareTemplate from marvin.cloudstackAPI import createTemplate from marvin.cloudstackAPI import registerTemplate diff --git a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py b/tools/marvin/marvin/base/TemplatePermissions.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/TemplatePermissions.py rename to tools/marvin/marvin/base/TemplatePermissions.py index 59da3ab9d18..2f3e31a7438 100644 --- a/tools/marvin/marvin/integration/lib/base/TemplatePermissions.py +++ b/tools/marvin/marvin/base/TemplatePermissions.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listTemplatePermissions from marvin.cloudstackAPI import updateTemplatePermissions diff --git a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py b/tools/marvin/marvin/base/TrafficMonitor.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/TrafficMonitor.py rename to tools/marvin/marvin/base/TrafficMonitor.py index 089088f398d..4625a5628c8 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficMonitor.py +++ b/tools/marvin/marvin/base/TrafficMonitor.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addTrafficMonitor from marvin.cloudstackAPI import listTrafficMonitors from marvin.cloudstackAPI import deleteTrafficMonitor diff --git a/tools/marvin/marvin/integration/lib/base/TrafficType.py b/tools/marvin/marvin/base/TrafficType.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/TrafficType.py rename to tools/marvin/marvin/base/TrafficType.py index f227673b649..1d9fed11d5c 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficType.py +++ b/tools/marvin/marvin/base/TrafficType.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addTrafficType from marvin.cloudstackAPI import listTrafficTypes from marvin.cloudstackAPI import updateTrafficType diff --git a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py b/tools/marvin/marvin/base/TrafficTypeImplementors.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py rename to tools/marvin/marvin/base/TrafficTypeImplementors.py index 17c204f23a3..39f31120e79 100644 --- a/tools/marvin/marvin/integration/lib/base/TrafficTypeImplementors.py +++ b/tools/marvin/marvin/base/TrafficTypeImplementors.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listTrafficTypeImplementors class TrafficTypeImplementors(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/UsageRecords.py b/tools/marvin/marvin/base/UsageRecords.py similarity index 96% rename from tools/marvin/marvin/integration/lib/base/UsageRecords.py rename to tools/marvin/marvin/base/UsageRecords.py index 69fde0e03ac..1349a18b860 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageRecords.py +++ b/tools/marvin/marvin/base/UsageRecords.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listUsageRecords from marvin.cloudstackAPI import generateUsageRecords diff --git a/tools/marvin/marvin/integration/lib/base/UsageTypes.py b/tools/marvin/marvin/base/UsageTypes.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/UsageTypes.py rename to tools/marvin/marvin/base/UsageTypes.py index a32654aafdf..46d4e5dcc66 100644 --- a/tools/marvin/marvin/integration/lib/base/UsageTypes.py +++ b/tools/marvin/marvin/base/UsageTypes.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import listUsageTypes class UsageTypes(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/User.py b/tools/marvin/marvin/base/User.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/User.py rename to tools/marvin/marvin/base/User.py index 84f6c56b7c7..5d094e4a704 100644 --- a/tools/marvin/marvin/integration/lib/base/User.py +++ b/tools/marvin/marvin/base/User.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import enableUser from marvin.cloudstackAPI import getUser from marvin.cloudstackAPI import lockUser diff --git a/tools/marvin/marvin/integration/lib/base/VMPassword.py b/tools/marvin/marvin/base/VMPassword.py similarity index 95% rename from tools/marvin/marvin/integration/lib/base/VMPassword.py rename to tools/marvin/marvin/base/VMPassword.py index 5b3e2f8fff5..87d7c8e34cd 100644 --- a/tools/marvin/marvin/integration/lib/base/VMPassword.py +++ b/tools/marvin/marvin/base/VMPassword.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import getVMPassword class VMPassword(CloudStackEntity.CloudStackEntity): diff --git a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py b/tools/marvin/marvin/base/VMSnapshot.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VMSnapshot.py rename to tools/marvin/marvin/base/VMSnapshot.py index ead640823e9..f88b57776a3 100644 --- a/tools/marvin/marvin/integration/lib/base/VMSnapshot.py +++ b/tools/marvin/marvin/base/VMSnapshot.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVMSnapshot from marvin.cloudstackAPI import listVMSnapshot from marvin.cloudstackAPI import deleteVMSnapshot diff --git a/tools/marvin/marvin/integration/lib/base/VPC.py b/tools/marvin/marvin/base/VPC.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VPC.py rename to tools/marvin/marvin/base/VPC.py index 75768e572ba..51e76f0ccc5 100644 --- a/tools/marvin/marvin/integration/lib/base/VPC.py +++ b/tools/marvin/marvin/base/VPC.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVPC from marvin.cloudstackAPI import listVPCs from marvin.cloudstackAPI import updateVPC diff --git a/tools/marvin/marvin/integration/lib/base/VPCOffering.py b/tools/marvin/marvin/base/VPCOffering.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VPCOffering.py rename to tools/marvin/marvin/base/VPCOffering.py index 2aec27d296c..3028fdde670 100644 --- a/tools/marvin/marvin/integration/lib/base/VPCOffering.py +++ b/tools/marvin/marvin/base/VPCOffering.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVPCOffering from marvin.cloudstackAPI import listVPCOfferings from marvin.cloudstackAPI import updateVPCOffering diff --git a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py b/tools/marvin/marvin/base/VirtualMachine.py similarity index 99% rename from tools/marvin/marvin/integration/lib/base/VirtualMachine.py rename to tools/marvin/marvin/base/VirtualMachine.py index 340a7e00393..d6dfd6d0468 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualMachine.py +++ b/tools/marvin/marvin/base/VirtualMachine.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import restoreVirtualMachine from marvin.cloudstackAPI import scaleVirtualMachine from marvin.cloudstackAPI import deployVirtualMachine diff --git a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py b/tools/marvin/marvin/base/VirtualRouterElement.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py rename to tools/marvin/marvin/base/VirtualRouterElement.py index b711785a5ef..14c227961fb 100644 --- a/tools/marvin/marvin/integration/lib/base/VirtualRouterElement.py +++ b/tools/marvin/marvin/base/VirtualRouterElement.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVirtualRouterElement from marvin.cloudstackAPI import listVirtualRouterElements from marvin.cloudstackAPI import configureVirtualRouterElement diff --git a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py b/tools/marvin/marvin/base/VlanIpRange.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VlanIpRange.py rename to tools/marvin/marvin/base/VlanIpRange.py index 5265b92199f..a3a4746e9e7 100644 --- a/tools/marvin/marvin/integration/lib/base/VlanIpRange.py +++ b/tools/marvin/marvin/base/VlanIpRange.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVlanIpRange from marvin.cloudstackAPI import listVlanIpRanges from marvin.cloudstackAPI import deleteVlanIpRange diff --git a/tools/marvin/marvin/integration/lib/base/Volume.py b/tools/marvin/marvin/base/Volume.py similarity index 98% rename from tools/marvin/marvin/integration/lib/base/Volume.py rename to tools/marvin/marvin/base/Volume.py index 3515ca590e6..169f4f05cce 100644 --- a/tools/marvin/marvin/integration/lib/base/Volume.py +++ b/tools/marvin/marvin/base/Volume.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import migrateVolume from marvin.cloudstackAPI import createVolume from marvin.cloudstackAPI import listVolumes diff --git a/tools/marvin/marvin/integration/lib/base/VpnConnection.py b/tools/marvin/marvin/base/VpnConnection.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VpnConnection.py rename to tools/marvin/marvin/base/VpnConnection.py index cfabe825233..9dd65124d3a 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnConnection.py +++ b/tools/marvin/marvin/base/VpnConnection.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import resetVpnConnection from marvin.cloudstackAPI import createVpnConnection from marvin.cloudstackAPI import listVpnConnections diff --git a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py b/tools/marvin/marvin/base/VpnCustomerGateway.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py rename to tools/marvin/marvin/base/VpnCustomerGateway.py index 0862427bfcc..76af3dc15e7 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnCustomerGateway.py +++ b/tools/marvin/marvin/base/VpnCustomerGateway.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVpnCustomerGateway from marvin.cloudstackAPI import listVpnCustomerGateways from marvin.cloudstackAPI import updateVpnCustomerGateway diff --git a/tools/marvin/marvin/integration/lib/base/VpnGateway.py b/tools/marvin/marvin/base/VpnGateway.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VpnGateway.py rename to tools/marvin/marvin/base/VpnGateway.py index 8d2d4ebf731..541a3fff7eb 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnGateway.py +++ b/tools/marvin/marvin/base/VpnGateway.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createVpnGateway from marvin.cloudstackAPI import listVpnGateways from marvin.cloudstackAPI import deleteVpnGateway diff --git a/tools/marvin/marvin/integration/lib/base/VpnUser.py b/tools/marvin/marvin/base/VpnUser.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/VpnUser.py rename to tools/marvin/marvin/base/VpnUser.py index 03ecb8767fc..e940aca2164 100644 --- a/tools/marvin/marvin/integration/lib/base/VpnUser.py +++ b/tools/marvin/marvin/base/VpnUser.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import addVpnUser from marvin.cloudstackAPI import listVpnUsers from marvin.cloudstackAPI import removeVpnUser diff --git a/tools/marvin/marvin/integration/lib/base/Zone.py b/tools/marvin/marvin/base/Zone.py similarity index 97% rename from tools/marvin/marvin/integration/lib/base/Zone.py rename to tools/marvin/marvin/base/Zone.py index 3597b78e77c..aba9f566a86 100644 --- a/tools/marvin/marvin/integration/lib/base/Zone.py +++ b/tools/marvin/marvin/base/Zone.py @@ -14,7 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -from marvin.integration.lib.base import CloudStackEntity +from marvin.base import CloudStackEntity from marvin.cloudstackAPI import createZone from marvin.cloudstackAPI import listZones from marvin.cloudstackAPI import updateZone diff --git a/tools/marvin/marvin/integration/lib/base/__init__.py b/tools/marvin/marvin/base/__init__.py similarity index 100% rename from tools/marvin/marvin/integration/lib/base/__init__.py rename to tools/marvin/marvin/base/__init__.py diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/common.py similarity index 99% rename from tools/marvin/marvin/integration/lib/common.py rename to tools/marvin/marvin/common.py index 164ef2052dd..65d2f777384 100644 --- a/tools/marvin/marvin/integration/lib/common.py +++ b/tools/marvin/marvin/common.py @@ -5,9 +5,9 @@ # 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 @@ -20,8 +20,8 @@ #Import Local Modules from marvin.cloudstackAPI import * from marvin.remoteSSHClient import remoteSSHClient -from utils import * -from base import * +from marvin.utils import * +from marvin.integration.lib.base import Configurations #Import System modules import time diff --git a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py b/tools/marvin/marvin/factory/AccountFactory.py similarity index 89% rename from tools/marvin/marvin/integration/lib/factory/AccountFactory.py rename to tools/marvin/marvin/factory/AccountFactory.py index 00399e415c3..5b973325eed 100644 --- a/tools/marvin/marvin/integration/lib/factory/AccountFactory.py +++ b/tools/marvin/marvin/factory/AccountFactory.py @@ -16,9 +16,9 @@ # under the License. import hashlib -from marvin.integration.lib.factory.CloudStackBaseFactory import * -from marvin.integration.lib.base import Account -from marvin.integration.lib.utils import random_gen +from marvin.factory.CloudStackBaseFactory import * +from marvin.base import Account +from marvin.utils import random_gen @factory.use_strategy(new_strategy=factory.BUILD_STRATEGY) class AccountFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py b/tools/marvin/marvin/factory/AutoScalePolicyFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py rename to tools/marvin/marvin/factory/AutoScalePolicyFactory.py index 20a73f39f21..ad2640e5798 100644 --- a/tools/marvin/marvin/integration/lib/factory/AutoScalePolicyFactory.py +++ b/tools/marvin/marvin/factory/AutoScalePolicyFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import AutoScalePolicy +from marvin.base import AutoScalePolicy + class AutoScalePolicyFactory(factory.Factory): FACTORY_FOR = AutoScalePolicy diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py b/tools/marvin/marvin/factory/AutoScaleVmGroupFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py rename to tools/marvin/marvin/factory/AutoScaleVmGroupFactory.py index 4b1f8aefcc5..67562301210 100644 --- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmGroupFactory.py +++ b/tools/marvin/marvin/factory/AutoScaleVmGroupFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import AutoScaleVmGroup +from marvin.base import AutoScaleVmGroup class AutoScaleVmGroupFactory(factory.Factory): FACTORY_FOR = AutoScaleVmGroup diff --git a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py b/tools/marvin/marvin/factory/AutoScaleVmProfileFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py rename to tools/marvin/marvin/factory/AutoScaleVmProfileFactory.py index a0daf300e7a..9e932b510d3 100644 --- a/tools/marvin/marvin/integration/lib/factory/AutoScaleVmProfileFactory.py +++ b/tools/marvin/marvin/factory/AutoScaleVmProfileFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import AutoScaleVmProfile +from marvin.base import AutoScaleVmProfile class AutoScaleVmProfileFactory(factory.Factory): FACTORY_FOR = AutoScaleVmProfile diff --git a/tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py b/tools/marvin/marvin/factory/CloudStackBaseFactory.py similarity index 100% rename from tools/marvin/marvin/integration/lib/factory/CloudStackBaseFactory.py rename to tools/marvin/marvin/factory/CloudStackBaseFactory.py diff --git a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py b/tools/marvin/marvin/factory/ClusterFactory.py similarity index 73% rename from tools/marvin/marvin/integration/lib/factory/ClusterFactory.py rename to tools/marvin/marvin/factory/ClusterFactory.py index e8e2e223542..d411bbb6b3a 100644 --- a/tools/marvin/marvin/integration/lib/factory/ClusterFactory.py +++ b/tools/marvin/marvin/factory/ClusterFactory.py @@ -1,7 +1,7 @@ import factory -from marvin.integration.lib.base import Cluster -from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory -from marvin.integration.lib.utils import random_gen +from marvin.base import Cluster +from marvin.factory import CloudStackBaseFactory +from marvin.utils import random_gen class ClusterFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py b/tools/marvin/marvin/factory/ConditionFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/ConditionFactory.py rename to tools/marvin/marvin/factory/ConditionFactory.py index fccfddf0878..534fc75562b 100644 --- a/tools/marvin/marvin/integration/lib/factory/ConditionFactory.py +++ b/tools/marvin/marvin/factory/ConditionFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Condition +from marvin.base import Condition + class ConditionFactory(factory.Factory): FACTORY_FOR = Condition diff --git a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py b/tools/marvin/marvin/factory/CounterFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/CounterFactory.py rename to tools/marvin/marvin/factory/CounterFactory.py index 046d43a6e6c..7dd16bb3519 100644 --- a/tools/marvin/marvin/integration/lib/factory/CounterFactory.py +++ b/tools/marvin/marvin/factory/CounterFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Counter +from marvin.base import Counter class CounterFactory(factory.Factory): FACTORY_FOR = Counter diff --git a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py b/tools/marvin/marvin/factory/DiskOfferingFactory.py similarity index 89% rename from tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py rename to tools/marvin/marvin/factory/DiskOfferingFactory.py index 0ca22dfb2a8..dd14d744d9c 100644 --- a/tools/marvin/marvin/integration/lib/factory/DiskOfferingFactory.py +++ b/tools/marvin/marvin/factory/DiskOfferingFactory.py @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.factory.CloudStackBaseFactory import * -from marvin.integration.lib.base import DiskOffering -from marvin.integration.lib.utils import random_gen +from marvin.factory.CloudStackBaseFactory import * +from marvin.base import DiskOffering +from marvin.utils import random_gen class DiskOfferingFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py b/tools/marvin/marvin/factory/DomainFactory.py similarity index 90% rename from tools/marvin/marvin/integration/lib/factory/DomainFactory.py rename to tools/marvin/marvin/factory/DomainFactory.py index 337f9f2153e..3924fd35a31 100644 --- a/tools/marvin/marvin/integration/lib/factory/DomainFactory.py +++ b/tools/marvin/marvin/factory/DomainFactory.py @@ -15,8 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Domain -from marvin.integration.lib.utils import random_gen +from marvin.base import Domain +from marvin.utils import random_gen class DomainFactory(factory.Factory): FACTORY_FOR = Domain diff --git a/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py b/tools/marvin/marvin/factory/EgressFirewallRuleFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py rename to tools/marvin/marvin/factory/EgressFirewallRuleFactory.py index 13954290d42..7e567452c56 100644 --- a/tools/marvin/marvin/integration/lib/factory/EgressFirewallRuleFactory.py +++ b/tools/marvin/marvin/factory/EgressFirewallRuleFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import EgressFirewallRule +from marvin.base import EgressFirewallRule class EgressFirewallRuleFactory(factory.Factory): FACTORY_FOR = EgressFirewallRule diff --git a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py b/tools/marvin/marvin/factory/FirewallRuleFactory.py similarity index 64% rename from tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py rename to tools/marvin/marvin/factory/FirewallRuleFactory.py index a0d17ec2327..d833205c876 100644 --- a/tools/marvin/marvin/integration/lib/factory/FirewallRuleFactory.py +++ b/tools/marvin/marvin/factory/FirewallRuleFactory.py @@ -14,11 +14,25 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import factory -from marvin.integration.lib.base import FirewallRule -class FirewallRuleFactory(factory.Factory): - FACTORY_FOR = FirewallRule +from marvin.base import FirewallRule +from marvin.factory import CloudStackBaseFactory + +class FirewallRuleFactory(CloudStackBaseFactory): + + FACTORY_FOR = FirewallRule.FirewallRule ipaddressid = None protocol = None + +class SshFirewallRuleFactory(FirewallRuleFactory): + protocol = 'tcp' + startport = 22 + endport = 22 + cidrlist = '0.0.0.0/0' + +class HttpFirewallRuleFactory(FirewallRuleFactory): + protocol = 'tcp' + startport = 80 + endport = 80 + cidrlist = '0.0.0.0/0' diff --git a/tools/marvin/marvin/factory/HostFactory.py b/tools/marvin/marvin/factory/HostFactory.py new file mode 100644 index 00000000000..abc572dc335 --- /dev/null +++ b/tools/marvin/marvin/factory/HostFactory.py @@ -0,0 +1,27 @@ +from marvin.base import Host +from marvin.factory import CloudStackBaseFactory + +class HostFactory(CloudStackBaseFactory): + + FACTORY_FOR = Host + + hypervisor = None + password = None + podid = None + url = None + username = None + zoneid = None + + +class XenserverHostFactory(HostFactory): + + hypervisor = 'XenServer' + password = 'password' + username = 'root' + + +class KvmHostFactory(HostFactory): + + hypervisor = 'KVM' + password = 'password' + username = 'root' diff --git a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py b/tools/marvin/marvin/factory/InstanceGroupFactory.py similarity index 77% rename from tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py rename to tools/marvin/marvin/factory/InstanceGroupFactory.py index 426c00cc553..376a2a4b56f 100644 --- a/tools/marvin/marvin/integration/lib/factory/InstanceGroupFactory.py +++ b/tools/marvin/marvin/factory/InstanceGroupFactory.py @@ -15,9 +15,13 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import InstanceGroup -class InstanceGroupFactory(factory.Factory): +from marvin.base import InstanceGroup +from marvin.factory import CloudStackBaseFactory +from marvin.common import random_gen + + +class InstanceGroupFactory(CloudStackBaseFactory): FACTORY_FOR = InstanceGroup.InstanceGroup - name = None + name = factory.Sequence(lambda n : 'instance_group_' + random_gen()) diff --git a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py b/tools/marvin/marvin/factory/IpAddressFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py rename to tools/marvin/marvin/factory/IpAddressFactory.py index 46b931ac8fc..bda2a1a43cd 100644 --- a/tools/marvin/marvin/integration/lib/factory/IpAddressFactory.py +++ b/tools/marvin/marvin/factory/IpAddressFactory.py @@ -15,8 +15,9 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import IpAddress +from marvin.base import IpAddress + + class IpAddressFactory(factory.Factory): FACTORY_FOR = IpAddress.IpAddress - diff --git a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py b/tools/marvin/marvin/factory/IpForwardingRuleFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py rename to tools/marvin/marvin/factory/IpForwardingRuleFactory.py index c9bc4474e4e..900e2b4a34e 100644 --- a/tools/marvin/marvin/integration/lib/factory/IpForwardingRuleFactory.py +++ b/tools/marvin/marvin/factory/IpForwardingRuleFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import IpForwardingRule +from marvin.base import IpForwardingRule class IpForwardingRuleFactory(factory.Factory): FACTORY_FOR = IpForwardingRule diff --git a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py b/tools/marvin/marvin/factory/IsoFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/IsoFactory.py rename to tools/marvin/marvin/factory/IsoFactory.py index 65655aa9e18..11f6e5599ae 100644 --- a/tools/marvin/marvin/integration/lib/factory/IsoFactory.py +++ b/tools/marvin/marvin/factory/IsoFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Iso +from marvin.base import Iso class IsoFactory(factory.Factory): FACTORY_FOR = Iso.Iso diff --git a/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py b/tools/marvin/marvin/factory/LBHealthCheckPolicyFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py rename to tools/marvin/marvin/factory/LBHealthCheckPolicyFactory.py index 215c4c369e1..ee8036624a5 100644 --- a/tools/marvin/marvin/integration/lib/factory/LBHealthCheckPolicyFactory.py +++ b/tools/marvin/marvin/factory/LBHealthCheckPolicyFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import LBHealthCheckPolicy +from marvin.base import LBHealthCheckPolicy class LBHealthCheckPolicyFactory(factory.Factory): diff --git a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py b/tools/marvin/marvin/factory/LBStickinessPolicyFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py rename to tools/marvin/marvin/factory/LBStickinessPolicyFactory.py index 380ab66f9d9..eab0d61ea5c 100644 --- a/tools/marvin/marvin/integration/lib/factory/LBStickinessPolicyFactory.py +++ b/tools/marvin/marvin/factory/LBStickinessPolicyFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import LBStickinessPolicy +from marvin.base import LBStickinessPolicy class LBStickinessPolicyFactory(factory.Factory): FACTORY_FOR = LBStickinessPolicy diff --git a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py b/tools/marvin/marvin/factory/LoadBalancerRuleFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py rename to tools/marvin/marvin/factory/LoadBalancerRuleFactory.py index 82d38a6afda..84151f3aaaf 100644 --- a/tools/marvin/marvin/integration/lib/factory/LoadBalancerRuleFactory.py +++ b/tools/marvin/marvin/factory/LoadBalancerRuleFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import LoadBalancerRule +from marvin.base import LoadBalancerRule class LoadBalancerRuleFactory(factory.Factory): FACTORY_FOR = LoadBalancerRule diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py b/tools/marvin/marvin/factory/NetworkACLFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py rename to tools/marvin/marvin/factory/NetworkACLFactory.py index 19697257b34..4b699779954 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkACLFactory.py +++ b/tools/marvin/marvin/factory/NetworkACLFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import NetworkACL +from marvin.base import NetworkACL class NetworkACLFactory(factory.Factory): FACTORY_FOR = NetworkACL diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py b/tools/marvin/marvin/factory/NetworkFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/NetworkFactory.py rename to tools/marvin/marvin/factory/NetworkFactory.py index ed8f1ab7284..0144648a18f 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkFactory.py +++ b/tools/marvin/marvin/factory/NetworkFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Network +from marvin.base import Network class NetworkFactory(factory.Factory): FACTORY_FOR = Network diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py b/tools/marvin/marvin/factory/NetworkOfferingFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py rename to tools/marvin/marvin/factory/NetworkOfferingFactory.py index 8b00819e0e8..06d1c180efc 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkOfferingFactory.py +++ b/tools/marvin/marvin/factory/NetworkOfferingFactory.py @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.factory.CloudStackBaseFactory import * -from marvin.integration.lib.base import NetworkOffering -from marvin.integration.lib.utils import random_gen +from marvin.factory.CloudStackBaseFactory import * +from marvin.base import NetworkOffering +from marvin.utils import random_gen class NetworkOfferingFactory(CloudStackBaseFactory): @@ -81,5 +81,3 @@ class DefaultSharedNetworkOfferingWithSGServiceFactory(NetworkOfferingFactory): 'provider': provider } ) - - diff --git a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py b/tools/marvin/marvin/factory/NetworkServiceProviderFactory.py similarity index 71% rename from tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py rename to tools/marvin/marvin/factory/NetworkServiceProviderFactory.py index 649ea1675a6..ba85e4b3665 100644 --- a/tools/marvin/marvin/integration/lib/factory/NetworkServiceProviderFactory.py +++ b/tools/marvin/marvin/factory/NetworkServiceProviderFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import NetworkServiceProvider +from marvin.base import NetworkServiceProvider class NetworkServiceProviderFactory(factory.Factory): FACTORY_FOR = NetworkServiceProvider diff --git a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py b/tools/marvin/marvin/factory/NiciraNvpDeviceFactory.py similarity index 79% rename from tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py rename to tools/marvin/marvin/factory/NiciraNvpDeviceFactory.py index 1e71beb39af..4cc3709a8fa 100644 --- a/tools/marvin/marvin/integration/lib/factory/NiciraNvpDeviceFactory.py +++ b/tools/marvin/marvin/factory/NiciraNvpDeviceFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import NiciraNvpDevice +from marvin.base import NiciraNvpDevice class NiciraNvpDeviceFactory(factory.Factory): FACTORY_FOR = NiciraNvpDevice diff --git a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py b/tools/marvin/marvin/factory/OsCategoriesFactory.py similarity index 63% rename from tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py rename to tools/marvin/marvin/factory/OsCategoriesFactory.py index 0e0e79ad274..7ecb7edde19 100644 --- a/tools/marvin/marvin/integration/lib/factory/OsCategoriesFactory.py +++ b/tools/marvin/marvin/factory/OsCategoriesFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import OsCategories +from marvin.base import OsCategories class OsCategoriesFactory(factory.Factory): FACTORY_FOR = OsCategories diff --git a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py b/tools/marvin/marvin/factory/OsTypesFactory.py similarity index 62% rename from tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py rename to tools/marvin/marvin/factory/OsTypesFactory.py index dacdfd37ed6..6e344baaa46 100644 --- a/tools/marvin/marvin/integration/lib/factory/OsTypesFactory.py +++ b/tools/marvin/marvin/factory/OsTypesFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import OsTypes +from marvin.base import OsTypes class OsTypesFactory(factory.Factory): FACTORY_FOR = OsTypes diff --git a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py b/tools/marvin/marvin/factory/PhysicalNetworkFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py rename to tools/marvin/marvin/factory/PhysicalNetworkFactory.py index 6438846c046..5f104a8631d 100644 --- a/tools/marvin/marvin/integration/lib/factory/PhysicalNetworkFactory.py +++ b/tools/marvin/marvin/factory/PhysicalNetworkFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import PhysicalNetwork +from marvin.base import PhysicalNetwork class PhysicalNetworkFactory(factory.Factory): FACTORY_FOR = PhysicalNetwork diff --git a/tools/marvin/marvin/integration/lib/factory/PodFactory.py b/tools/marvin/marvin/factory/PodFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/PodFactory.py rename to tools/marvin/marvin/factory/PodFactory.py index 0cff95d1535..49e350bc326 100644 --- a/tools/marvin/marvin/integration/lib/factory/PodFactory.py +++ b/tools/marvin/marvin/factory/PodFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Pod +from marvin.base import Pod class PodFactory(factory.Factory): FACTORY_FOR = Pod diff --git a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py b/tools/marvin/marvin/factory/PortForwardingRuleFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py rename to tools/marvin/marvin/factory/PortForwardingRuleFactory.py index 179d1e07e8c..e2339d4862f 100644 --- a/tools/marvin/marvin/integration/lib/factory/PortForwardingRuleFactory.py +++ b/tools/marvin/marvin/factory/PortForwardingRuleFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import PortForwardingRule +from marvin.base import PortForwardingRule class PortForwardingRuleFactory(factory.Factory): FACTORY_FOR = PortForwardingRule diff --git a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py b/tools/marvin/marvin/factory/PrivateGatewayFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py rename to tools/marvin/marvin/factory/PrivateGatewayFactory.py index cdc2bb619b4..ddc6200aca1 100644 --- a/tools/marvin/marvin/integration/lib/factory/PrivateGatewayFactory.py +++ b/tools/marvin/marvin/factory/PrivateGatewayFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import PrivateGateway +from marvin.base import PrivateGateway class PrivateGatewayFactory(factory.Factory): FACTORY_FOR = PrivateGateway diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py b/tools/marvin/marvin/factory/ProjectFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/ProjectFactory.py rename to tools/marvin/marvin/factory/ProjectFactory.py index 6edeff254ff..4bb5ca99360 100644 --- a/tools/marvin/marvin/integration/lib/factory/ProjectFactory.py +++ b/tools/marvin/marvin/factory/ProjectFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Project +from marvin.base import Project + class ProjectFactory(factory.Factory): FACTORY_FOR = Project diff --git a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py b/tools/marvin/marvin/factory/ProjectInvitationFactory.py similarity index 70% rename from tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py rename to tools/marvin/marvin/factory/ProjectInvitationFactory.py index 70034a376b4..fc43e4aab8d 100644 --- a/tools/marvin/marvin/integration/lib/factory/ProjectInvitationFactory.py +++ b/tools/marvin/marvin/factory/ProjectInvitationFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import ProjectInvitation +from marvin.base import ProjectInvitation class ProjectInvitationFactory(factory.Factory): FACTORY_FOR = ProjectInvitation diff --git a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py b/tools/marvin/marvin/factory/RemoteAccessVpnFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py rename to tools/marvin/marvin/factory/RemoteAccessVpnFactory.py index 6c52d60cadf..c3512291e60 100644 --- a/tools/marvin/marvin/integration/lib/factory/RemoteAccessVpnFactory.py +++ b/tools/marvin/marvin/factory/RemoteAccessVpnFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import RemoteAccessVpn +from marvin.base import RemoteAccessVpn class RemoteAccessVpnFactory(factory.Factory): FACTORY_FOR = RemoteAccessVpn diff --git a/tools/marvin/marvin/integration/lib/factory/S3Factory.py b/tools/marvin/marvin/factory/S3Factory.py similarity index 75% rename from tools/marvin/marvin/integration/lib/factory/S3Factory.py rename to tools/marvin/marvin/factory/S3Factory.py index 56765cead3e..ca2f93fead6 100644 --- a/tools/marvin/marvin/integration/lib/factory/S3Factory.py +++ b/tools/marvin/marvin/factory/S3Factory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import S3 +from marvin.base import S3 class S3Factory(factory.Factory): FACTORY_FOR = S3.S3 diff --git a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py b/tools/marvin/marvin/factory/SSHKeyPairFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py rename to tools/marvin/marvin/factory/SSHKeyPairFactory.py index 0838f30293b..d58084131ee 100644 --- a/tools/marvin/marvin/integration/lib/factory/SSHKeyPairFactory.py +++ b/tools/marvin/marvin/factory/SSHKeyPairFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import SSHKeyPair +from marvin.base import SSHKeyPair class SSHKeyPairFactory(factory.Factory): FACTORY_FOR = SSHKeyPair diff --git a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py b/tools/marvin/marvin/factory/SecondaryStorageFactory.py similarity index 66% rename from tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py rename to tools/marvin/marvin/factory/SecondaryStorageFactory.py index 6af655c3d8f..c3d972bcc61 100644 --- a/tools/marvin/marvin/integration/lib/factory/SecondaryStorageFactory.py +++ b/tools/marvin/marvin/factory/SecondaryStorageFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import SecondaryStorage +from marvin.base import SecondaryStorage class SecondaryStorageFactory(factory.Factory): FACTORY_FOR = SecondaryStorage diff --git a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py b/tools/marvin/marvin/factory/SecurityGroupFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py rename to tools/marvin/marvin/factory/SecurityGroupFactory.py index 8cb85e1de6c..2a8c033581c 100644 --- a/tools/marvin/marvin/integration/lib/factory/SecurityGroupFactory.py +++ b/tools/marvin/marvin/factory/SecurityGroupFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import SecurityGroup +from marvin.base import SecurityGroup class SecurityGroupFactory(factory.Factory): FACTORY_FOR = SecurityGroup diff --git a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py b/tools/marvin/marvin/factory/ServiceOfferingFactory.py similarity index 88% rename from tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py rename to tools/marvin/marvin/factory/ServiceOfferingFactory.py index a0b429513b1..d44be1e5748 100644 --- a/tools/marvin/marvin/integration/lib/factory/ServiceOfferingFactory.py +++ b/tools/marvin/marvin/factory/ServiceOfferingFactory.py @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.factory.CloudStackBaseFactory import * -from marvin.integration.lib.base import ServiceOffering -from marvin.integration.lib.utils import random_gen +from marvin.base import ServiceOffering +from marvin.factory.CloudStackBaseFactory import * +from marvin.utils import random_gen class ServiceOfferingFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py b/tools/marvin/marvin/factory/SnapshotFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py rename to tools/marvin/marvin/factory/SnapshotFactory.py index 336fa8ad6d5..5b7641d87a0 100644 --- a/tools/marvin/marvin/integration/lib/factory/SnapshotFactory.py +++ b/tools/marvin/marvin/factory/SnapshotFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Snapshot +from marvin.base import Snapshot class SnapshotFactory(factory.Factory): FACTORY_FOR = Snapshot diff --git a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py b/tools/marvin/marvin/factory/SnapshotPolicyFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py rename to tools/marvin/marvin/factory/SnapshotPolicyFactory.py index 6851fcaaba0..f893ad928f0 100644 --- a/tools/marvin/marvin/integration/lib/factory/SnapshotPolicyFactory.py +++ b/tools/marvin/marvin/factory/SnapshotPolicyFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import SnapshotPolicy +from marvin.base import SnapshotPolicy + class SnapshotPolicyFactory(factory.Factory): FACTORY_FOR = SnapshotPolicy diff --git a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py b/tools/marvin/marvin/factory/StaticNatFactory.py similarity index 73% rename from tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py rename to tools/marvin/marvin/factory/StaticNatFactory.py index 72c5437ee52..4ae888728f2 100644 --- a/tools/marvin/marvin/integration/lib/factory/StaticNatFactory.py +++ b/tools/marvin/marvin/factory/StaticNatFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import StaticNat +from marvin.base import StaticNat class StaticNatFactory(factory.Factory): FACTORY_FOR = StaticNat diff --git a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py b/tools/marvin/marvin/factory/StaticRouteFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py rename to tools/marvin/marvin/factory/StaticRouteFactory.py index d427547acf6..54f72923c72 100644 --- a/tools/marvin/marvin/integration/lib/factory/StaticRouteFactory.py +++ b/tools/marvin/marvin/factory/StaticRouteFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import StaticRoute +from marvin.base import StaticRoute class StaticRouteFactory(factory.Factory): FACTORY_FOR = StaticRoute diff --git a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py b/tools/marvin/marvin/factory/StorageNetworkIpRangeFactory.py similarity index 93% rename from tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py rename to tools/marvin/marvin/factory/StorageNetworkIpRangeFactory.py index 8fe6ecf947a..c73b0893759 100644 --- a/tools/marvin/marvin/integration/lib/factory/StorageNetworkIpRangeFactory.py +++ b/tools/marvin/marvin/factory/StorageNetworkIpRangeFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import StorageNetworkIpRange +from marvin.base import StorageNetworkIpRange + class StorageNetworkIpRangeFactory(factory.Factory): FACTORY_FOR = StorageNetworkIpRange diff --git a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py b/tools/marvin/marvin/factory/StoragePoolFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py rename to tools/marvin/marvin/factory/StoragePoolFactory.py index da45385716f..9279c897acf 100644 --- a/tools/marvin/marvin/integration/lib/factory/StoragePoolFactory.py +++ b/tools/marvin/marvin/factory/StoragePoolFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import StoragePool +from marvin.base import StoragePool + class StoragePoolFactory(factory.Factory): FACTORY_FOR = StoragePool diff --git a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py b/tools/marvin/marvin/factory/TagsFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/TagsFactory.py rename to tools/marvin/marvin/factory/TagsFactory.py index 28e859d7715..18a32fe7f8f 100644 --- a/tools/marvin/marvin/integration/lib/factory/TagsFactory.py +++ b/tools/marvin/marvin/factory/TagsFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Tags +from marvin.base import Tags class TagsFactory(factory.Factory): FACTORY_FOR = Tags diff --git a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py b/tools/marvin/marvin/factory/TemplateFactory.py similarity index 88% rename from tools/marvin/marvin/integration/lib/factory/TemplateFactory.py rename to tools/marvin/marvin/factory/TemplateFactory.py index 47d10357d83..85c383fcda1 100644 --- a/tools/marvin/marvin/integration/lib/factory/TemplateFactory.py +++ b/tools/marvin/marvin/factory/TemplateFactory.py @@ -14,9 +14,8 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -import factory -from marvin.integration.lib.base import Template -from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory +from marvin.base import Template +from marvin.factory import CloudStackBaseFactory class TemplateFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py b/tools/marvin/marvin/factory/TrafficMonitorFactory.py similarity index 70% rename from tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py rename to tools/marvin/marvin/factory/TrafficMonitorFactory.py index 63841cbcfc5..804a0f84448 100644 --- a/tools/marvin/marvin/integration/lib/factory/TrafficMonitorFactory.py +++ b/tools/marvin/marvin/factory/TrafficMonitorFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import TrafficMonitor +from marvin.base import TrafficMonitor class TrafficMonitorFactory(factory.Factory): FACTORY_FOR = TrafficMonitor diff --git a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py b/tools/marvin/marvin/factory/TrafficTypeFactory.py similarity index 75% rename from tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py rename to tools/marvin/marvin/factory/TrafficTypeFactory.py index c3368109904..87fe929491e 100644 --- a/tools/marvin/marvin/integration/lib/factory/TrafficTypeFactory.py +++ b/tools/marvin/marvin/factory/TrafficTypeFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import TrafficType +from marvin.base import TrafficType class TrafficTypeFactory(factory.Factory): FACTORY_FOR = TrafficType diff --git a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py b/tools/marvin/marvin/factory/UsageRecordsFactory.py similarity index 71% rename from tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py rename to tools/marvin/marvin/factory/UsageRecordsFactory.py index e0c73c89dad..36c4ecdf446 100644 --- a/tools/marvin/marvin/integration/lib/factory/UsageRecordsFactory.py +++ b/tools/marvin/marvin/factory/UsageRecordsFactory.py @@ -1,5 +1,5 @@ import factory -from marvin.integration.lib.base import UsageRecords +from marvin.base import UsageRecords class UsageRecordsFactory(factory.Factory): FACTORY_FOR = UsageRecords diff --git a/tools/marvin/marvin/integration/lib/factory/UserFactory.py b/tools/marvin/marvin/factory/UserFactory.py similarity index 85% rename from tools/marvin/marvin/integration/lib/factory/UserFactory.py rename to tools/marvin/marvin/factory/UserFactory.py index 1b13b8bcbec..45f28fffcf8 100644 --- a/tools/marvin/marvin/integration/lib/factory/UserFactory.py +++ b/tools/marvin/marvin/factory/UserFactory.py @@ -15,9 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import User -from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory -from marvin.integration.lib.factory.AccountFactory import AccountFactory +from marvin.base import User +from marvin.factory import CloudStackBaseFactory, AccountFactory class UserFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/VMSnapshotFactory.py b/tools/marvin/marvin/factory/VMSnapshotFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VMSnapshotFactory.py rename to tools/marvin/marvin/factory/VMSnapshotFactory.py index bbd0bd7a743..fa3dcc969cd 100644 --- a/tools/marvin/marvin/integration/lib/factory/VMSnapshotFactory.py +++ b/tools/marvin/marvin/factory/VMSnapshotFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VMSnapshot +from marvin.base import VMSnapshot class VMSnapshotFactory(factory.Factory): FACTORY_FOR = VMSnapshot.VMSnapshot diff --git a/tools/marvin/marvin/integration/lib/factory/VPCFactory.py b/tools/marvin/marvin/factory/VPCFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/VPCFactory.py rename to tools/marvin/marvin/factory/VPCFactory.py index bef42f6eb51..e7f46a7be37 100644 --- a/tools/marvin/marvin/integration/lib/factory/VPCFactory.py +++ b/tools/marvin/marvin/factory/VPCFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VPC +from marvin.base import VPC class VPCFactory(factory.Factory): FACTORY_FOR = VPC diff --git a/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py b/tools/marvin/marvin/factory/VPCOfferingFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py rename to tools/marvin/marvin/factory/VPCOfferingFactory.py index ad45093f35b..a2a51d200c9 100644 --- a/tools/marvin/marvin/integration/lib/factory/VPCOfferingFactory.py +++ b/tools/marvin/marvin/factory/VPCOfferingFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VPCOffering +from marvin.base import VPCOffering class VPCOfferingFactory(factory.Factory): FACTORY_FOR = VPCOffering diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py b/tools/marvin/marvin/factory/VirtualMachineFactory.py similarity index 85% rename from tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py rename to tools/marvin/marvin/factory/VirtualMachineFactory.py index 260a0edefff..4d8a4d69268 100644 --- a/tools/marvin/marvin/integration/lib/factory/VirtualMachineFactory.py +++ b/tools/marvin/marvin/factory/VirtualMachineFactory.py @@ -15,9 +15,8 @@ # specific language governing permissions and limitations # under the License. -import factory -from marvin.integration.lib.base import VirtualMachine -from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory +from marvin.base import VirtualMachine +from marvin.factory import CloudStackBaseFactory class VirtualMachineFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py b/tools/marvin/marvin/factory/VirtualRouterElementFactory.py similarity index 93% rename from tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py rename to tools/marvin/marvin/factory/VirtualRouterElementFactory.py index a1f85dafc7d..fc1fd7d2096 100644 --- a/tools/marvin/marvin/integration/lib/factory/VirtualRouterElementFactory.py +++ b/tools/marvin/marvin/factory/VirtualRouterElementFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VirtualRouterElement +from marvin.base import VirtualRouterElement + class VirtualRouterElementFactory(factory.Factory): FACTORY_FOR = VirtualRouterElement diff --git a/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py b/tools/marvin/marvin/factory/VlanIpRangeFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py rename to tools/marvin/marvin/factory/VlanIpRangeFactory.py index 6ae1e3572a0..4301edbec15 100644 --- a/tools/marvin/marvin/integration/lib/factory/VlanIpRangeFactory.py +++ b/tools/marvin/marvin/factory/VlanIpRangeFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VlanIpRange +from marvin.base import VlanIpRange class VlanIpRangeFactory(factory.Factory): FACTORY_FOR = VlanIpRange diff --git a/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py b/tools/marvin/marvin/factory/VolumeFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VolumeFactory.py rename to tools/marvin/marvin/factory/VolumeFactory.py index e1f5cdb016b..fa270847d51 100644 --- a/tools/marvin/marvin/integration/lib/factory/VolumeFactory.py +++ b/tools/marvin/marvin/factory/VolumeFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Volume +from marvin.base import Volume class VolumeFactory(factory.Factory): FACTORY_FOR = Volume diff --git a/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py b/tools/marvin/marvin/factory/VpnConnectionFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py rename to tools/marvin/marvin/factory/VpnConnectionFactory.py index 7ba45ddb5c8..2f6676d32de 100644 --- a/tools/marvin/marvin/integration/lib/factory/VpnConnectionFactory.py +++ b/tools/marvin/marvin/factory/VpnConnectionFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VpnConnection +from marvin.base import VpnConnection class VpnConnectionFactory(factory.Factory): FACTORY_FOR = VpnConnection diff --git a/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py b/tools/marvin/marvin/factory/VpnCustomerGatewayFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py rename to tools/marvin/marvin/factory/VpnCustomerGatewayFactory.py index ca85dbe4f8f..be1675f6539 100644 --- a/tools/marvin/marvin/integration/lib/factory/VpnCustomerGatewayFactory.py +++ b/tools/marvin/marvin/factory/VpnCustomerGatewayFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VpnCustomerGateway +from marvin.base import VpnCustomerGateway class VpnCustomerGatewayFactory(factory.Factory): FACTORY_FOR = VpnCustomerGateway diff --git a/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py b/tools/marvin/marvin/factory/VpnGatewayFactory.py similarity index 94% rename from tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py rename to tools/marvin/marvin/factory/VpnGatewayFactory.py index 76d9596457b..2f2642da46e 100644 --- a/tools/marvin/marvin/integration/lib/factory/VpnGatewayFactory.py +++ b/tools/marvin/marvin/factory/VpnGatewayFactory.py @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VpnGateway +from marvin.base import VpnGateway class VpnGatewayFactory(factory.Factory): FACTORY_FOR = VpnGateway diff --git a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py b/tools/marvin/marvin/factory/VpnUserFactory.py similarity index 95% rename from tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py rename to tools/marvin/marvin/factory/VpnUserFactory.py index 8647ea90419..86982c75e6e 100644 --- a/tools/marvin/marvin/integration/lib/factory/VpnUserFactory.py +++ b/tools/marvin/marvin/factory/VpnUserFactory.py @@ -15,7 +15,8 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import VpnUser +from marvin.base import VpnUser + class VpnUserFactory(factory.Factory): FACTORY_FOR = VpnUser.VpnUser diff --git a/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py b/tools/marvin/marvin/factory/ZoneFactory.py similarity index 86% rename from tools/marvin/marvin/integration/lib/factory/ZoneFactory.py rename to tools/marvin/marvin/factory/ZoneFactory.py index 31c5264820f..c3f1dcac1ce 100644 --- a/tools/marvin/marvin/integration/lib/factory/ZoneFactory.py +++ b/tools/marvin/marvin/factory/ZoneFactory.py @@ -15,9 +15,9 @@ # specific language governing permissions and limitations # under the License. import factory -from marvin.integration.lib.base import Zone -from marvin.integration.lib.factory.CloudStackBaseFactory import CloudStackBaseFactory -from marvin.integration.lib.utils import random_gen +from marvin.base import Zone +from marvin.factory import CloudStackBaseFactory +from marvin.utils import random_gen class ZoneFactory(CloudStackBaseFactory): diff --git a/tools/marvin/marvin/integration/lib/factory/__init__.py b/tools/marvin/marvin/factory/__init__.py similarity index 100% rename from tools/marvin/marvin/integration/lib/factory/__init__.py rename to tools/marvin/marvin/factory/__init__.py diff --git a/tools/marvin/marvin/integration/lib/factory/test/__init__.py b/tools/marvin/marvin/factory/test/__init__.py similarity index 100% rename from tools/marvin/marvin/integration/lib/factory/test/__init__.py rename to tools/marvin/marvin/factory/test/__init__.py diff --git a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py b/tools/marvin/marvin/factory/test/testFactories.py similarity index 90% rename from tools/marvin/marvin/integration/lib/factory/test/testFactories.py rename to tools/marvin/marvin/factory/test/testFactories.py index a2361293cfa..89f9b262eda 100644 --- a/tools/marvin/marvin/integration/lib/factory/test/testFactories.py +++ b/tools/marvin/marvin/factory/test/testFactories.py @@ -18,23 +18,19 @@ import unittest import logging from marvin.cloudstackTestClient import cloudstackTestClient +from marvin.base import Account, Zone, Template, User -from marvin.integration.lib.factory.AccountFactory import * -from marvin.integration.lib.base.Account import Account +from marvin.factory.AccountFactory import * -from marvin.integration.lib.factory.ServiceOfferingFactory import * +from marvin.factory.ServiceOfferingFactory import * -from marvin.integration.lib.factory.NetworkOfferingFactory import * +from marvin.factory.NetworkOfferingFactory import * -from marvin.integration.lib.base.Zone import Zone +from marvin.factory.TemplateFactory import * -from marvin.integration.lib.factory.TemplateFactory import * -from marvin.integration.lib.base.Template import Template +from marvin.factory.VirtualMachineFactory import * -from marvin.integration.lib.factory.VirtualMachineFactory import * - -from marvin.integration.lib.factory.UserFactory import * -from marvin.integration.lib.base.User import User +from marvin.factory.UserFactory import * class BuildVsCreateStrategyTest(unittest.TestCase): diff --git a/tools/marvin/marvin/integration/lib/generateBase.py b/tools/marvin/marvin/generateBase.py similarity index 100% rename from tools/marvin/marvin/integration/lib/generateBase.py rename to tools/marvin/marvin/generateBase.py diff --git a/tools/marvin/marvin/integration/__init__.py b/tools/marvin/marvin/integration/__init__.py deleted file mode 100644 index 57823fcc162..00000000000 --- a/tools/marvin/marvin/integration/__init__.py +++ /dev/null @@ -1,18 +0,0 @@ -# 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. - - diff --git a/tools/marvin/marvin/integration/lib/__init__.py b/tools/marvin/marvin/integration/lib/__init__.py deleted file mode 100644 index 978b68af62a..00000000000 --- a/tools/marvin/marvin/integration/lib/__init__.py +++ /dev/null @@ -1,16 +0,0 @@ -# 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. diff --git a/tools/marvin/marvin/integration/lib/factory/HostFactory.py b/tools/marvin/marvin/integration/lib/factory/HostFactory.py deleted file mode 100644 index 3bbbaf61236..00000000000 --- a/tools/marvin/marvin/integration/lib/factory/HostFactory.py +++ /dev/null @@ -1,13 +0,0 @@ -import factory -from marvin.integration.lib.base import Host -class HostFactory(factory.Factory): - - FACTORY_FOR = Host - - hypervisor = None - password = None - podid = None - url = None - username = None - zoneid = None - diff --git a/tools/marvin/marvin/integration/lib/oldbase.py b/tools/marvin/marvin/oldbase.py similarity index 99% rename from tools/marvin/marvin/integration/lib/oldbase.py rename to tools/marvin/marvin/oldbase.py index f7f88bf5094..0d493fc449d 100755 --- a/tools/marvin/marvin/integration/lib/oldbase.py +++ b/tools/marvin/marvin/oldbase.py @@ -19,8 +19,7 @@ -Virtual machine, Volume, Snapshot etc """ -import marvin -from utils import is_server_ssh_ready, random_gen +from marvin.utils import is_server_ssh_ready, random_gen from marvin.cloudstackAPI import * # Import System modules import time diff --git a/tools/marvin/marvin/integration/lib/utils.py b/tools/marvin/marvin/utils.py similarity index 100% rename from tools/marvin/marvin/integration/lib/utils.py rename to tools/marvin/marvin/utils.py