From 9093275886d173d542caf33eea0c49ae52edf75f Mon Sep 17 00:00:00 2001 From: Andrey Kurilin Date: Fri, 16 Feb 2018 18:44:12 +0200 Subject: [PATCH] Change structure and imports rally.plugins.openstack -> rally_openstack - rally_openstack.context -> rally_openstack.contexts rally.plugins.workloads -> rally_openstack/workloads rally.consts -> rally_openstack.consts TODO: fix pep8 --- README.rst | 89 +------------------ rally/plugins/__init__.py | 55 ------------ {rally => rally_openstack}/__init__.py | 0 .../cfg}/__init__.py | 0 .../cfg/cinder.py | 0 .../cfg/cleanup.py | 0 .../openstack => rally_openstack}/cfg/ec2.py | 0 .../cfg/glance.py | 0 .../openstack => rally_openstack}/cfg/heat.py | 0 .../cfg/ironic.py | 0 .../cfg/keystone_roles.py | 0 .../cfg/keystone_users.py | 0 .../cfg/magnum.py | 0 .../cfg/manila.py | 0 .../cfg/mistral.py | 0 .../cfg/monasca.py | 0 .../cfg/murano.py | 0 .../cfg/neutron.py | 0 .../openstack => rally_openstack}/cfg/nova.py | 0 .../openstack => rally_openstack}/cfg/opts.py | 44 ++++----- .../cfg/osclients.py | 0 .../cfg/profiler.py | 0 .../cfg/sahara.py | 0 .../cfg/senlin.py | 0 .../cfg/tempest.py | 0 .../openstack => rally_openstack}/cfg/vm.py | 0 .../cfg/watcher.py | 0 .../cleanup}/__init__.py | 0 .../cleanup/base.py | 0 .../cleanup/manager.py | 2 +- .../cleanup/resources.py | 8 +- {rally => rally_openstack}/consts.py | 0 .../contexts}/__init__.py | 0 .../contexts}/api_versions.py | 2 +- .../contexts/ceilometer}/__init__.py | 0 .../contexts}/ceilometer/samples.py | 2 +- .../contexts/cinder}/__init__.py | 0 .../contexts}/cinder/volume_types.py | 6 +- .../contexts}/cinder/volumes.py | 6 +- .../contexts/cleanup}/__init__.py | 0 .../contexts}/cleanup/admin.py | 6 +- .../contexts}/cleanup/base.py | 2 +- .../contexts}/cleanup/user.py | 6 +- .../contexts/dataplane}/__init__.py | 0 .../contexts}/dataplane/heat.py | 6 +- .../contexts/designate}/__init__.py | 0 .../contexts}/designate/zones.py | 4 +- .../contexts/ec2}/__init__.py | 0 .../contexts}/ec2/servers.py | 8 +- .../contexts/glance}/__init__.py | 0 .../contexts}/glance/images.py | 6 +- .../contexts/heat}/__init__.py | 0 .../contexts}/heat/stacks.py | 4 +- .../contexts/keystone}/__init__.py | 0 .../contexts}/keystone/roles.py | 4 +- .../contexts}/keystone/users.py | 8 +- .../contexts/magnum}/__init__.py | 0 .../contexts}/magnum/ca_certs.py | 2 +- .../contexts}/magnum/cluster_templates.py | 4 +- .../contexts}/magnum/clusters.py | 6 +- .../contexts/manila}/__init__.py | 0 .../contexts}/manila/consts.py | 0 .../manila/manila_security_services.py | 6 +- .../contexts}/manila/manila_share_networks.py | 6 +- .../contexts}/manila/manila_shares.py | 6 +- .../contexts/monasca}/__init__.py | 0 .../contexts}/monasca/metrics.py | 2 +- .../contexts/murano}/__init__.py | 0 .../contexts}/murano/murano_environments.py | 4 +- .../contexts}/murano/murano_packages.py | 4 +- .../contexts/network}/__init__.py | 0 .../contexts}/network/allow_ssh.py | 4 +- .../contexts}/network/existing_network.py | 4 +- .../contexts}/network/networks.py | 4 +- .../contexts}/network/routers.py | 4 +- .../contexts/neutron}/__init__.py | 0 .../contexts}/neutron/lbaas.py | 4 +- .../contexts/nova}/__init__.py | 0 .../contexts}/nova/flavors.py | 4 +- .../contexts}/nova/keypairs.py | 4 +- .../contexts}/nova/servers.py | 8 +- .../contexts/quotas}/__init__.py | 0 .../contexts}/quotas/cinder_quotas.py | 0 .../contexts}/quotas/designate_quotas.py | 0 .../contexts}/quotas/manila_quotas.py | 0 .../contexts}/quotas/neutron_quotas.py | 0 .../contexts}/quotas/nova_quotas.py | 0 .../contexts}/quotas/quotas.py | 12 +-- .../contexts/sahara}/__init__.py | 0 .../contexts}/sahara/sahara_cluster.py | 4 +- .../contexts}/sahara/sahara_image.py | 8 +- .../sahara/sahara_input_data_sources.py | 8 +- .../contexts}/sahara/sahara_job_binaries.py | 6 +- .../sahara/sahara_output_data_sources.py | 8 +- .../contexts/senlin}/__init__.py | 0 .../contexts}/senlin/profiles.py | 2 +- .../contexts/swift}/__init__.py | 0 .../contexts}/swift/objects.py | 2 +- .../contexts}/swift/utils.py | 2 +- .../contexts/vm}/__init__.py | 0 .../contexts}/vm/custom_image.py | 8 +- .../contexts}/vm/image_command_customizer.py | 4 +- .../contexts/watcher}/__init__.py | 0 .../contexts}/watcher/audit_templates.py | 8 +- .../credential.py | 2 +- .../embedcharts}/__init__.py | 0 .../embedcharts/osprofilerchart.py | 0 .../hook}/__init__.py | 0 .../hook/fault_injection.py | 0 .../osclients.py | 2 +- .../platforms}/__init__.py | 0 .../platforms/existing.py | 2 +- .../openstack => rally_openstack}/scenario.py | 2 +- .../scenarios}/__init__.py | 0 .../scenarios/authenticate}/__init__.py | 0 .../scenarios/authenticate/authenticate.py | 2 +- .../scenarios/ceilometer}/__init__.py | 0 .../scenarios/ceilometer/alarms.py | 4 +- .../scenarios/ceilometer/events.py | 6 +- .../scenarios/ceilometer/meters.py | 4 +- .../scenarios/ceilometer/queries.py | 4 +- .../scenarios/ceilometer/resources.py | 4 +- .../scenarios/ceilometer/samples.py | 4 +- .../scenarios/ceilometer/stats.py | 4 +- .../scenarios/ceilometer/traits.py | 6 +- .../scenarios/ceilometer/utils.py | 2 +- .../scenarios/cinder}/__init__.py | 0 .../scenarios/cinder/qos_specs.py | 4 +- .../scenarios/cinder/utils.py | 8 +- .../scenarios/cinder/volume_backups.py | 4 +- .../scenarios/cinder/volume_types.py | 6 +- .../scenarios/cinder/volumes.py | 8 +- .../scenarios/designate}/__init__.py | 0 .../scenarios/designate/basic.py | 4 +- .../scenarios/designate/utils.py | 2 +- .../scenarios/dummy.py | 3 +- .../scenarios/ec2}/__init__.py | 0 .../scenarios/ec2/servers.py | 4 +- .../scenarios/ec2/utils.py | 2 +- .../scenarios/glance}/__init__.py | 0 .../scenarios/glance/images.py | 8 +- .../scenarios/glance/utils.py | 4 +- .../scenarios/gnocchi}/__init__.py | 0 .../scenarios/gnocchi/capabilities.py | 4 +- .../scenarios/gnocchi/status.py | 4 +- .../scenarios/gnocchi/utils.py | 4 +- .../scenarios/heat}/__init__.py | 0 .../scenarios/heat/stacks.py | 4 +- .../scenarios/heat/utils.py | 2 +- .../scenarios/ironic}/__init__.py | 0 .../scenarios/ironic/nodes.py | 4 +- .../scenarios/ironic/utils.py | 2 +- .../scenarios/keystone}/__init__.py | 0 .../scenarios/keystone/basic.py | 4 +- .../scenarios/keystone/utils.py | 4 +- .../scenarios/magnum}/__init__.py | 0 .../scenarios/magnum/cluster_templates.py | 4 +- .../scenarios/magnum/clusters.py | 6 +- .../scenarios/magnum/k8s_pods.py | 4 +- .../scenarios/magnum/utils.py | 2 +- .../scenarios/manila}/__init__.py | 0 .../scenarios/manila/shares.py | 6 +- .../scenarios/manila/utils.py | 4 +- .../scenarios/mistral}/__init__.py | 0 .../scenarios/mistral/executions.py | 4 +- .../scenarios/mistral/utils.py | 2 +- .../scenarios/mistral/workbooks.py | 4 +- .../scenarios/monasca}/__init__.py | 0 .../scenarios/monasca/metrics.py | 4 +- .../scenarios/monasca/utils.py | 2 +- .../scenarios/murano}/__init__.py | 0 .../scenarios/murano/environments.py | 4 +- .../scenarios/murano/packages.py | 4 +- .../scenarios/murano/utils.py | 2 +- .../scenarios/neutron}/__init__.py | 0 .../scenarios/neutron/bgpvpn.py | 4 +- .../scenarios/neutron/loadbalancer_v1.py | 4 +- .../scenarios/neutron/loadbalancer_v2.py | 4 +- .../scenarios/neutron/network.py | 4 +- .../scenarios/neutron/security_groups.py | 4 +- .../scenarios/neutron/utils.py | 4 +- .../scenarios/nova}/__init__.py | 0 .../scenarios/nova/agents.py | 4 +- .../scenarios/nova/aggregates.py | 4 +- .../scenarios/nova/availability_zones.py | 4 +- .../scenarios/nova/flavors.py | 4 +- .../scenarios/nova/hosts.py | 4 +- .../scenarios/nova/hypervisors.py | 4 +- .../scenarios/nova/images.py | 4 +- .../scenarios/nova/keypairs.py | 4 +- .../scenarios/nova/server_groups.py | 4 +- .../scenarios/nova/servers.py | 10 +-- .../scenarios/nova/services.py | 4 +- .../scenarios/nova/utils.py | 6 +- .../scenarios/quotas}/__init__.py | 0 .../scenarios/quotas/quotas.py | 4 +- .../scenarios/quotas/utils.py | 2 +- .../scenarios/sahara}/__init__.py | 0 .../scenarios/sahara/clusters.py | 4 +- .../scenarios/sahara/consts.py | 0 .../scenarios/sahara/jobs.py | 4 +- .../scenarios/sahara/node_group_templates.py | 4 +- .../scenarios/sahara/utils.py | 4 +- .../scenarios/senlin}/__init__.py | 0 .../scenarios/senlin/clusters.py | 4 +- .../scenarios/senlin/utils.py | 2 +- .../scenarios/swift}/__init__.py | 0 .../scenarios/swift/objects.py | 4 +- .../scenarios/swift/utils.py | 2 +- .../scenarios/vm}/__init__.py | 0 .../scenarios/vm/utils.py | 4 +- .../scenarios/vm/vmtasks.py | 8 +- .../scenarios/watcher}/__init__.py | 0 .../scenarios/watcher/basic.py | 4 +- .../scenarios/watcher/utils.py | 2 +- .../scenarios/zaqar}/__init__.py | 0 .../scenarios/zaqar/basic.py | 4 +- .../scenarios/zaqar/utils.py | 2 +- .../openstack => rally_openstack}/service.py | 0 .../services}/__init__.py | 0 .../services/gnocchi}/__init__.py | 0 .../services/gnocchi/metric.py | 0 .../services/heat}/__init__.py | 0 .../services/heat/main.py | 0 .../services/identity}/__init__.py | 0 .../services/identity/identity.py | 0 .../services/identity/keystone_common.py | 4 +- .../services/identity/keystone_v2.py | 6 +- .../services/identity/keystone_v3.py | 6 +- .../services/image}/__init__.py | 0 .../services/image/glance_common.py | 2 +- .../services/image/glance_v1.py | 6 +- .../services/image/glance_v2.py | 6 +- .../services/image/image.py | 0 .../services/storage}/__init__.py | 0 .../services/storage/block.py | 0 .../services/storage/cinder_common.py | 4 +- .../services/storage/cinder_v1.py | 6 +- .../services/storage/cinder_v2.py | 6 +- .../openstack => rally_openstack}/types.py | 2 +- .../validators.py | 6 +- .../verification}/__init__.py | 0 .../verification/tempest}/__init__.py | 0 .../verification/tempest/config.ini | 0 .../verification/tempest/config.py | 0 .../verification/tempest/consts.py | 0 .../verification/tempest/context.py | 6 +- .../verification/tempest/manager.py | 4 +- .../workload}/__init__.py | 0 .../workload/siege.py | 0 .../wrappers/__init__.py | 0 .../wrappers/cinder.py | 0 .../wrappers/glance.py | 0 .../wrappers/keystone.py | 0 .../wrappers/network.py | 0 requirements.txt | 22 +---- setup.cfg | 19 ++-- .../unit/cleanup}/__init__.py | 0 .../openstack => }/cleanup/test_base.py | 4 +- .../openstack => }/cleanup/test_manager.py | 6 +- .../openstack => }/cleanup/test_resources.py | 14 +-- tests/unit/{plugins => contexts}/__init__.py | 0 .../ceilometer}/__init__.py | 0 .../ceilometer/test_samples.py | 8 +- .../cleanup => contexts/cinder}/__init__.py | 0 .../cinder/test_volume_types.py | 6 +- .../cinder/test_volumes.py | 8 +- .../context => contexts/cleanup}/__init__.py | 0 .../cleanup/test_admin.py | 8 +- .../context => contexts}/cleanup/test_user.py | 8 +- .../dataplane}/__init__.py | 0 .../dataplane/test_heat.py | 4 +- .../cinder => contexts/designate}/__init__.py | 0 .../designate/test_zones.py | 8 +- .../cleanup => contexts/ec2}/__init__.py | 0 .../context => contexts}/ec2/test_servers.py | 10 +-- .../dataplane => contexts/glance}/__init__.py | 0 .../glance/test_images.py | 10 +-- .../designate => contexts/heat}/__init__.py | 0 .../context => contexts}/heat/test_stacks.py | 8 +- .../ec2 => contexts/keystone}/__init__.py | 0 .../keystone/test_roles.py | 4 +- .../keystone/test_users.py | 6 +- .../glance => contexts/magnum}/__init__.py | 0 .../magnum/test_ca_certs.py | 6 +- .../magnum/test_cluster_templates.py | 8 +- .../magnum/test_clusters.py | 8 +- .../heat => contexts/manila}/__init__.py | 0 .../manila/test_manila_security_services.py | 6 +- .../manila/test_manila_share_networks.py | 20 ++--- .../manila/test_manila_shares.py | 10 +-- .../keystone => contexts/monasca}/__init__.py | 0 .../monasca/test_metrics.py | 6 +- .../magnum => contexts/murano}/__init__.py | 0 .../murano/test_murano_environments.py | 8 +- .../murano/test_murano_packages.py | 4 +- .../manila => contexts/network}/__init__.py | 0 .../network/test_allow_ssh.py | 8 +- .../network/test_network.py | 14 +-- .../network/test_routers.py | 8 +- .../monasca => contexts/neutron}/__init__.py | 0 .../neutron/test_existing_network.py | 8 +- .../neutron/test_lbaas.py | 24 ++--- .../murano => contexts/nova}/__init__.py | 0 .../context => contexts}/nova/test_flavors.py | 4 +- .../nova/test_keypairs.py | 6 +- .../context => contexts}/nova/test_servers.py | 10 +-- .../network => contexts/quotas}/__init__.py | 0 .../quotas/test_cinder_quotas.py | 2 +- .../quotas/test_designate_quotas.py | 2 +- .../quotas/test_manila_quotas.py | 2 +- .../quotas/test_neutron_quotas.py | 2 +- .../quotas/test_nova_quotas.py | 2 +- .../quotas/test_quotas.py | 12 +-- .../neutron => contexts/sahara}/__init__.py | 0 .../sahara/test_sahara_cluster.py | 6 +- .../sahara/test_sahara_image.py | 10 +-- .../sahara/test_sahara_input_data_sources.py | 6 +- .../sahara/test_sahara_job_binaries.py | 6 +- .../sahara/test_sahara_output_data_sources.py | 6 +- .../nova => contexts/senlin}/__init__.py | 0 .../senlin/test_profiles.py | 6 +- .../quotas => contexts/swift}/__init__.py | 0 .../swift/test_objects.py | 16 ++-- .../context => contexts}/swift/test_utils.py | 10 +-- .../context => contexts}/test_api_versions.py | 4 +- .../sahara => contexts/vm}/__init__.py | 0 .../vm/test_custom_image.py | 4 +- .../vm/test_image_command_customizer.py | 4 +- .../senlin => contexts/watcher}/__init__.py | 0 .../watcher/test_audit_templates.py | 10 +-- tests/unit/doc/test_format.py | 5 +- tests/unit/doc/test_specs.py | 4 +- tests/unit/doc/test_task_samples.py | 9 +- .../embedcharts/test_osprofilerchart.py | 4 +- .../context/swift => hook}/__init__.py | 0 .../hook/test_fault_injection.py | 2 +- .../context/vm => platforms}/__init__.py | 0 .../openstack => }/platforms/test_existing.py | 33 +++++-- .../verification/tempest/__init__.py | 0 .../plugins/openstack/wrappers/__init__.py | 0 tests/unit/plugins/workload/__init__.py | 0 tests/unit/rally_jobs/test_jobs.py | 7 +- .../context/watcher => scenarios}/__init__.py | 0 .../authenticate}/__init__.py | 0 .../authenticate/test_authenticate.py | 2 +- .../ceilometer}/__init__.py | 0 .../scenarios/ceilometer/test_alarms.py | 2 +- .../scenarios/ceilometer/test_events.py | 4 +- .../scenarios/ceilometer/test_meters.py | 4 +- .../scenarios/ceilometer/test_queries.py | 2 +- .../scenarios/ceilometer/test_resources.py | 4 +- .../scenarios/ceilometer/test_samples.py | 4 +- .../scenarios/ceilometer/test_stats.py | 2 +- .../scenarios/ceilometer/test_traits.py | 4 +- .../scenarios/ceilometer/test_utils.py | 4 +- .../cinder}/__init__.py | 0 .../scenarios/cinder/test_qos_specs.py | 4 +- .../scenarios/cinder/test_utils.py | 14 +-- .../scenarios/cinder/test_volume_backups.py | 4 +- .../scenarios/cinder/test_volume_types.py | 6 +- .../scenarios/cinder/test_volumes.py | 8 +- .../designate}/__init__.py | 0 .../scenarios/designate/test_basic.py | 4 +- .../scenarios/designate/test_utils.py | 4 +- .../ceilometer => scenarios/ec2}/__init__.py | 0 .../scenarios/ec2/test_servers.py | 2 +- .../scenarios/ec2/test_utils.py | 2 +- .../cinder => scenarios/glance}/__init__.py | 0 .../scenarios/glance/test_images.py | 8 +- .../scenarios/glance/test_utils.py | 8 +- .../gnocchi}/__init__.py | 0 .../scenarios/gnocchi/test_capabilities.py | 4 +- .../scenarios/gnocchi/test_status.py | 4 +- .../scenarios/gnocchi/test_utils.py | 4 +- .../ec2 => scenarios/heat}/__init__.py | 0 .../scenarios/heat/test_stacks.py | 4 +- .../scenarios/heat/test_utils.py | 4 +- .../glance => scenarios/ironic}/__init__.py | 0 .../scenarios/ironic/test_nodes.py | 2 +- .../scenarios/ironic/test_utils.py | 4 +- .../keystone}/__init__.py | 0 .../scenarios/keystone/test_basic.py | 4 +- .../scenarios/keystone/test_utils.py | 10 +-- .../heat => scenarios/magnum}/__init__.py | 0 .../magnum/test_cluster_templates.py | 2 +- .../scenarios/magnum/test_clusters.py | 2 +- .../scenarios/magnum/test_k8s_pods.py | 10 +-- .../scenarios/magnum/test_utils.py | 4 +- .../ironic => scenarios/manila}/__init__.py | 0 .../scenarios/manila/test_shares.py | 2 +- .../scenarios/manila/test_utils.py | 4 +- .../mistral}/__init__.py | 0 .../scenarios/mistral/test_executions.py | 6 +- .../scenarios/mistral/test_utils.py | 4 +- .../scenarios/mistral/test_workbooks.py | 4 +- .../magnum => scenarios/monasca}/__init__.py | 0 .../scenarios/monasca/test_metrics.py | 2 +- .../scenarios/monasca/test_utils.py | 2 +- .../manila => scenarios/murano}/__init__.py | 0 .../scenarios/murano/test_environments.py | 4 +- .../scenarios/murano/test_packages.py | 4 +- .../scenarios/murano/test_utils.py | 4 +- .../mistral => scenarios/neutron}/__init__.py | 0 .../scenarios/neutron/test_bgpvpn.py | 2 +- .../scenarios/neutron/test_loadbalancer_v1.py | 2 +- .../scenarios/neutron/test_loadbalancer_v2.py | 2 +- .../scenarios/neutron/test_network.py | 4 +- .../scenarios/neutron/test_security_groups.py | 2 +- .../scenarios/neutron/test_utils.py | 4 +- .../monasca => scenarios/nova}/__init__.py | 0 .../scenarios/nova/test_agents.py | 2 +- .../scenarios/nova/test_aggregates.py | 2 +- .../scenarios/nova/test_availability_zones.py | 2 +- .../scenarios/nova/test_flavors.py | 2 +- .../scenarios/nova/test_hosts.py | 2 +- .../scenarios/nova/test_hypervisors.py | 2 +- .../scenarios/nova/test_images.py | 2 +- .../scenarios/nova/test_keypairs.py | 2 +- .../scenarios/nova/test_server_groups.py | 4 +- .../scenarios/nova/test_servers.py | 22 ++--- .../scenarios/nova/test_services.py | 2 +- .../scenarios/nova/test_utils.py | 12 +-- .../murano => scenarios/quotas}/__init__.py | 0 .../scenarios/quotas/test_quotas.py | 2 +- .../scenarios/quotas/test_utils.py | 2 +- .../neutron => scenarios/sahara}/__init__.py | 0 .../scenarios/sahara/test_clusters.py | 4 +- .../scenarios/sahara/test_jobs.py | 4 +- .../sahara/test_node_group_templates.py | 5 +- .../scenarios/sahara/test_utils.py | 4 +- .../nova => scenarios/senlin}/__init__.py | 0 .../scenarios/senlin/test_clusters.py | 2 +- .../scenarios/senlin/test_utils.py | 4 +- .../quotas => scenarios/swift}/__init__.py | 0 .../scenarios/swift/test_objects.py | 2 +- .../scenarios/swift/test_utils.py | 4 +- .../sahara => scenarios/vm}/__init__.py | 0 .../openstack => }/scenarios/vm/test_utils.py | 4 +- .../scenarios/vm/test_vmtasks.py | 6 +- .../senlin => scenarios/watcher}/__init__.py | 0 .../scenarios/watcher/test_basic.py | 2 +- .../scenarios/watcher/test_utils.py | 2 +- .../swift => scenarios/zaqar}/__init__.py | 0 .../scenarios/zaqar/test_basic.py | 4 +- .../scenarios/zaqar/test_utils.py | 4 +- .../scenarios/vm => services}/__init__.py | 0 .../watcher => services/gnocchi}/__init__.py | 0 .../services/gnocchi/test_metric.py | 2 +- .../zaqar => services/heat}/__init__.py | 0 .../openstack => }/services/heat/test_main.py | 14 +-- .../identity}/__init__.py | 0 .../services/identity/test_identity.py | 4 +- .../services/identity/test_keystone_common.py | 8 +- .../services/identity/test_keystone_v2.py | 6 +- .../services/identity/test_keystone_v3.py | 6 +- .../gnocchi => services/image}/__init__.py | 0 .../services/image/test_glance_common.py | 6 +- .../services/image/test_glance_v1.py | 6 +- .../services/image/test_glance_v2.py | 4 +- .../services/image/test_image.py | 8 +- .../heat => services/storage}/__init__.py | 0 .../services/storage/test_block.py | 4 +- .../services/storage/test_cinder_common.py | 10 +-- .../services/storage/test_cinder_v1.py | 4 +- .../services/storage/test_cinder_v2.py | 4 +- tests/unit/test.py | 4 +- .../openstack => }/test_credential.py | 6 +- .../{plugins/openstack => }/test_osclients.py | 6 +- .../{plugins/openstack => }/test_scenario.py | 10 +-- .../{plugins/openstack => }/test_service.py | 2 +- .../{plugins/openstack => }/test_types.py | 2 +- .../openstack => }/test_validators.py | 8 +- .../identity => verification}/__init__.py | 0 .../tempest}/__init__.py | 0 .../verification/tempest/test_config.py | 6 +- .../verification/tempest/test_context.py | 20 ++--- .../verification/tempest/test_manager.py | 4 +- .../services/storage => workload}/__init__.py | 0 .../unit/{plugins => }/workload/test_siege.py | 0 .../verification => wrappers}/__init__.py | 0 .../openstack => }/wrappers/test_cinder.py | 4 +- .../openstack => }/wrappers/test_glance.py | 4 +- .../openstack => }/wrappers/test_keystone.py | 2 +- .../openstack => }/wrappers/test_network.py | 16 ++-- tox.ini | 3 +- upper-constraints.txt | 2 +- 487 files changed, 824 insertions(+), 970 deletions(-) delete mode 100644 rally/plugins/__init__.py rename {rally => rally_openstack}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack/cfg}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/cinder.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/cleanup.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/ec2.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/glance.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/heat.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/ironic.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/keystone_roles.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/keystone_users.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/magnum.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/manila.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/mistral.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/monasca.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/murano.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/neutron.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/nova.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/opts.py (53%) rename {rally/plugins/openstack => rally_openstack}/cfg/osclients.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/profiler.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/sahara.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/senlin.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/tempest.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/vm.py (100%) rename {rally/plugins/openstack => rally_openstack}/cfg/watcher.py (100%) rename {rally/plugins/openstack/cfg => rally_openstack/cleanup}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/cleanup/base.py (100%) rename {rally/plugins/openstack => rally_openstack}/cleanup/manager.py (99%) rename {rally/plugins/openstack => rally_openstack}/cleanup/resources.py (99%) rename {rally => rally_openstack}/consts.py (100%) rename {rally/plugins/openstack/cleanup => rally_openstack/contexts}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/api_versions.py (99%) rename {rally/plugins/openstack/context => rally_openstack/contexts/ceilometer}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/ceilometer/samples.py (98%) rename {rally/plugins/openstack/context/ceilometer => rally_openstack/contexts/cinder}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/cinder/volume_types.py (92%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/cinder/volumes.py (94%) rename {rally/plugins/openstack/context/cinder => rally_openstack/contexts/cleanup}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/cleanup/admin.py (90%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/cleanup/base.py (96%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/cleanup/user.py (89%) rename {rally/plugins/openstack/context/cleanup => rally_openstack/contexts/dataplane}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/dataplane/heat.py (96%) rename {rally/plugins/openstack/context/dataplane => rally_openstack/contexts/designate}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/designate/zones.py (94%) rename {rally/plugins/openstack/context/designate => rally_openstack/contexts/ec2}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/ec2/servers.py (93%) rename {rally/plugins/openstack/context/ec2 => rally_openstack/contexts/glance}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/glance/images.py (98%) rename {rally/plugins/openstack/context/glance => rally_openstack/contexts/heat}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/heat/stacks.py (95%) rename {rally/plugins/openstack/context/heat => rally_openstack/contexts/keystone}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/keystone/roles.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/keystone/users.py (98%) rename {rally/plugins/openstack/context/keystone => rally_openstack/contexts/magnum}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/magnum/ca_certs.py (98%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/magnum/cluster_templates.py (96%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/magnum/clusters.py (92%) rename {rally/plugins/openstack/context/magnum => rally_openstack/contexts/manila}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/manila/consts.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/manila/manila_security_services.py (94%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/manila/manila_share_networks.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/manila/manila_shares.py (94%) rename {rally/plugins/openstack/context/manila => rally_openstack/contexts/monasca}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/monasca/metrics.py (97%) rename {rally/plugins/openstack/context/monasca => rally_openstack/contexts/murano}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/murano/murano_environments.py (93%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/murano/murano_packages.py (96%) rename {rally/plugins/openstack/context/murano => rally_openstack/contexts/network}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/network/allow_ssh.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/network/existing_network.py (93%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/network/networks.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/network/routers.py (96%) rename {rally/plugins/openstack/context/network => rally_openstack/contexts/neutron}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/neutron/lbaas.py (96%) rename {rally/plugins/openstack/context/neutron => rally_openstack/contexts/nova}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/nova/flavors.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/nova/keypairs.py (95%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/nova/servers.py (95%) rename {rally/plugins/openstack/context/nova => rally_openstack/contexts/quotas}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/cinder_quotas.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/designate_quotas.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/manila_quotas.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/neutron_quotas.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/nova_quotas.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/quotas/quotas.py (91%) rename {rally/plugins/openstack/context/quotas => rally_openstack/contexts/sahara}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/sahara/sahara_cluster.py (98%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/sahara/sahara_image.py (95%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/sahara/sahara_input_data_sources.py (95%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/sahara/sahara_job_binaries.py (96%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/sahara/sahara_output_data_sources.py (94%) rename {rally/plugins/openstack/context/sahara => rally_openstack/contexts/senlin}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/senlin/profiles.py (97%) rename {rally/plugins/openstack/context/senlin => rally_openstack/contexts/swift}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/swift/objects.py (98%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/swift/utils.py (98%) rename {rally/plugins/openstack/context/swift => rally_openstack/contexts/vm}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/vm/custom_image.py (97%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/vm/image_command_customizer.py (96%) rename {rally/plugins/openstack/context/vm => rally_openstack/contexts/watcher}/__init__.py (100%) rename {rally/plugins/openstack/context => rally_openstack/contexts}/watcher/audit_templates.py (94%) rename {rally/plugins/openstack => rally_openstack}/credential.py (98%) rename {rally/plugins/openstack/context/watcher => rally_openstack/embedcharts}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/embedcharts/osprofilerchart.py (100%) rename {rally/plugins/openstack/embedcharts => rally_openstack/hook}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/hook/fault_injection.py (100%) rename {rally/plugins/openstack => rally_openstack}/osclients.py (99%) rename {rally/plugins/openstack/hook => rally_openstack/platforms}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/platforms/existing.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenario.py (99%) rename {rally/plugins/openstack/platforms => rally_openstack/scenarios}/__init__.py (100%) rename {rally/plugins/openstack/scenarios => rally_openstack/scenarios/authenticate}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/authenticate/authenticate.py (99%) rename {rally/plugins/openstack/scenarios/authenticate => rally_openstack/scenarios/ceilometer}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/alarms.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/events.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/meters.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/queries.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/resources.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/samples.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/stats.py (96%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/traits.py (93%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ceilometer/utils.py (99%) rename {rally/plugins/openstack/scenarios/ceilometer => rally_openstack/scenarios/cinder}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/cinder/qos_specs.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/cinder/utils.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/cinder/volume_backups.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/cinder/volume_types.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/cinder/volumes.py (99%) rename {rally/plugins/openstack/scenarios/cinder => rally_openstack/scenarios/designate}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/designate/basic.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/designate/utils.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/dummy.py (94%) rename {rally/plugins/openstack/scenarios/designate => rally_openstack/scenarios/ec2}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ec2/servers.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ec2/utils.py (98%) rename {rally/plugins/openstack/scenarios/ec2 => rally_openstack/scenarios/glance}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/glance/images.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/glance/utils.py (96%) rename {rally/plugins/openstack/scenarios/glance => rally_openstack/scenarios/gnocchi}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/gnocchi/capabilities.py (90%) rename {rally/plugins/openstack => rally_openstack}/scenarios/gnocchi/status.py (90%) rename {rally/plugins/openstack => rally_openstack}/scenarios/gnocchi/utils.py (92%) rename {rally/plugins/openstack/scenarios/gnocchi => rally_openstack/scenarios/heat}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/heat/stacks.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/heat/utils.py (99%) rename {rally/plugins/openstack/scenarios/heat => rally_openstack/scenarios/ironic}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ironic/nodes.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/ironic/utils.py (99%) rename {rally/plugins/openstack/scenarios/ironic => rally_openstack/scenarios/keystone}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/keystone/basic.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/keystone/utils.py (98%) rename {rally/plugins/openstack/scenarios/keystone => rally_openstack/scenarios/magnum}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/magnum/cluster_templates.py (94%) rename {rally/plugins/openstack => rally_openstack}/scenarios/magnum/clusters.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/magnum/k8s_pods.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/magnum/utils.py (99%) rename {rally/plugins/openstack/scenarios/magnum => rally_openstack/scenarios/manila}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/manila/shares.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/manila/utils.py (99%) rename {rally/plugins/openstack/scenarios/manila => rally_openstack/scenarios/mistral}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/mistral/executions.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/mistral/utils.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/mistral/workbooks.py (95%) rename {rally/plugins/openstack/scenarios/mistral => rally_openstack/scenarios/monasca}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/monasca/metrics.py (90%) rename {rally/plugins/openstack => rally_openstack}/scenarios/monasca/utils.py (97%) rename {rally/plugins/openstack/scenarios/monasca => rally_openstack/scenarios/murano}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/murano/environments.py (96%) rename {rally/plugins/openstack => rally_openstack}/scenarios/murano/packages.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/murano/utils.py (99%) rename {rally/plugins/openstack/scenarios/murano => rally_openstack/scenarios/neutron}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/bgpvpn.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/loadbalancer_v1.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/loadbalancer_v2.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/network.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/security_groups.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/neutron/utils.py (99%) rename {rally/plugins/openstack/scenarios/neutron => rally_openstack/scenarios/nova}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/agents.py (92%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/aggregates.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/availability_zones.py (93%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/flavors.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/hosts.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/hypervisors.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/images.py (94%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/keypairs.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/server_groups.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/servers.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/services.py (92%) rename {rally/plugins/openstack => rally_openstack}/scenarios/nova/utils.py (99%) rename {rally/plugins/openstack/scenarios/nova => rally_openstack/scenarios/quotas}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/quotas/quotas.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/quotas/utils.py (98%) rename {rally/plugins/openstack/scenarios/quotas => rally_openstack/scenarios/sahara}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/sahara/clusters.py (99%) rename {rally/plugins/openstack => rally_openstack}/scenarios/sahara/consts.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/sahara/jobs.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/sahara/node_group_templates.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/sahara/utils.py (99%) rename {rally/plugins/openstack/scenarios/sahara => rally_openstack/scenarios/senlin}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/senlin/clusters.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/senlin/utils.py (99%) rename {rally/plugins/openstack/scenarios/senlin => rally_openstack/scenarios/swift}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/swift/objects.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/swift/utils.py (99%) rename {rally/plugins/openstack/scenarios/swift => rally_openstack/scenarios/vm}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/vm/utils.py (98%) rename {rally/plugins/openstack => rally_openstack}/scenarios/vm/vmtasks.py (98%) rename {rally/plugins/openstack/scenarios/vm => rally_openstack/scenarios/watcher}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/watcher/basic.py (97%) rename {rally/plugins/openstack => rally_openstack}/scenarios/watcher/utils.py (98%) rename {rally/plugins/openstack/scenarios/watcher => rally_openstack/scenarios/zaqar}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/scenarios/zaqar/basic.py (95%) rename {rally/plugins/openstack => rally_openstack}/scenarios/zaqar/utils.py (97%) rename {rally/plugins/openstack => rally_openstack}/service.py (100%) rename {rally/plugins/openstack/scenarios/zaqar => rally_openstack/services}/__init__.py (100%) rename {rally/plugins/openstack/services => rally_openstack/services/gnocchi}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/gnocchi/metric.py (100%) rename {rally/plugins/openstack/services/gnocchi => rally_openstack/services/heat}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/heat/main.py (100%) rename {rally/plugins/openstack/services/heat => rally_openstack/services/identity}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/identity/identity.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/identity/keystone_common.py (98%) rename {rally/plugins/openstack => rally_openstack}/services/identity/keystone_v2.py (98%) rename {rally/plugins/openstack => rally_openstack}/services/identity/keystone_v3.py (98%) rename {rally/plugins/openstack/services/identity => rally_openstack/services/image}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/image/glance_common.py (97%) rename {rally/plugins/openstack => rally_openstack}/services/image/glance_v1.py (97%) rename {rally/plugins/openstack => rally_openstack}/services/image/glance_v2.py (98%) rename {rally/plugins/openstack => rally_openstack}/services/image/image.py (100%) rename {rally/plugins/openstack/services/image => rally_openstack/services/storage}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/storage/block.py (100%) rename {rally/plugins/openstack => rally_openstack}/services/storage/cinder_common.py (99%) rename {rally/plugins/openstack => rally_openstack}/services/storage/cinder_v1.py (98%) rename {rally/plugins/openstack => rally_openstack}/services/storage/cinder_v2.py (98%) rename {rally/plugins/openstack => rally_openstack}/types.py (99%) rename {rally/plugins/openstack => rally_openstack}/validators.py (99%) rename {rally/plugins/openstack/services/storage => rally_openstack/verification}/__init__.py (100%) rename {rally/plugins/openstack/verification => rally_openstack/verification/tempest}/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/verification/tempest/config.ini (100%) rename {rally/plugins/openstack => rally_openstack}/verification/tempest/config.py (100%) rename {rally/plugins/openstack => rally_openstack}/verification/tempest/consts.py (100%) rename {rally/plugins/openstack => rally_openstack}/verification/tempest/context.py (98%) rename {rally/plugins/openstack => rally_openstack}/verification/tempest/manager.py (98%) rename {rally/plugins/openstack/verification/tempest => rally_openstack/workload}/__init__.py (100%) rename {rally/plugins => rally_openstack}/workload/siege.py (100%) rename {rally/plugins/openstack => rally_openstack}/wrappers/__init__.py (100%) rename {rally/plugins/openstack => rally_openstack}/wrappers/cinder.py (100%) rename {rally/plugins/openstack => rally_openstack}/wrappers/glance.py (100%) rename {rally/plugins/openstack => rally_openstack}/wrappers/keystone.py (100%) rename {rally/plugins/openstack => rally_openstack}/wrappers/network.py (100%) rename {rally/plugins/workload => tests/unit/cleanup}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/cleanup/test_base.py (97%) rename tests/unit/{plugins/openstack => }/cleanup/test_manager.py (99%) rename tests/unit/{plugins/openstack => }/cleanup/test_resources.py (98%) rename tests/unit/{plugins => contexts}/__init__.py (100%) rename tests/unit/{plugins/openstack => contexts/ceilometer}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/ceilometer/test_samples.py (96%) rename tests/unit/{plugins/openstack/cleanup => contexts/cinder}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/cinder/test_volume_types.py (93%) rename tests/unit/{plugins/openstack/context => contexts}/cinder/test_volumes.py (96%) rename tests/unit/{plugins/openstack/context => contexts/cleanup}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/cleanup/test_admin.py (95%) rename tests/unit/{plugins/openstack/context => contexts}/cleanup/test_user.py (95%) rename tests/unit/{plugins/openstack/context/ceilometer => contexts/dataplane}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/dataplane/test_heat.py (97%) rename tests/unit/{plugins/openstack/context/cinder => contexts/designate}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/designate/test_zones.py (95%) rename tests/unit/{plugins/openstack/context/cleanup => contexts/ec2}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/ec2/test_servers.py (94%) rename tests/unit/{plugins/openstack/context/dataplane => contexts/glance}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/glance/test_images.py (97%) rename tests/unit/{plugins/openstack/context/designate => contexts/heat}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/heat/test_stacks.py (93%) rename tests/unit/{plugins/openstack/context/ec2 => contexts/keystone}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/keystone/test_roles.py (98%) rename tests/unit/{plugins/openstack/context => contexts}/keystone/test_users.py (99%) rename tests/unit/{plugins/openstack/context/glance => contexts/magnum}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/magnum/test_ca_certs.py (98%) rename tests/unit/{plugins/openstack/context => contexts}/magnum/test_cluster_templates.py (94%) rename tests/unit/{plugins/openstack/context => contexts}/magnum/test_clusters.py (96%) rename tests/unit/{plugins/openstack/context/heat => contexts/manila}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/manila/test_manila_security_services.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/manila/test_manila_share_networks.py (95%) rename tests/unit/{plugins/openstack/context => contexts}/manila/test_manila_shares.py (95%) rename tests/unit/{plugins/openstack/context/keystone => contexts/monasca}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/monasca/test_metrics.py (95%) rename tests/unit/{plugins/openstack/context/magnum => contexts/murano}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/murano/test_murano_environments.py (92%) rename tests/unit/{plugins/openstack/context => contexts}/murano/test_murano_packages.py (96%) rename tests/unit/{plugins/openstack/context/manila => contexts/network}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/network/test_allow_ssh.py (94%) rename tests/unit/{plugins/openstack/context => contexts}/network/test_network.py (91%) rename tests/unit/{plugins/openstack/context => contexts}/network/test_routers.py (92%) rename tests/unit/{plugins/openstack/context/monasca => contexts/neutron}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/neutron/test_existing_network.py (91%) rename tests/unit/{plugins/openstack/context => contexts}/neutron/test_lbaas.py (90%) rename tests/unit/{plugins/openstack/context/murano => contexts/nova}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/nova/test_flavors.py (97%) rename tests/unit/{plugins/openstack/context => contexts}/nova/test_keypairs.py (95%) rename tests/unit/{plugins/openstack/context => contexts}/nova/test_servers.py (96%) rename tests/unit/{plugins/openstack/context/network => contexts/quotas}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_cinder_quotas.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_designate_quotas.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_manila_quotas.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_neutron_quotas.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_nova_quotas.py (97%) rename tests/unit/{plugins/openstack/context => contexts}/quotas/test_quotas.py (97%) rename tests/unit/{plugins/openstack/context/neutron => contexts/sahara}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/sahara/test_sahara_cluster.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/sahara/test_sahara_image.py (95%) rename tests/unit/{plugins/openstack/context => contexts}/sahara/test_sahara_input_data_sources.py (97%) rename tests/unit/{plugins/openstack/context => contexts}/sahara/test_sahara_job_binaries.py (96%) rename tests/unit/{plugins/openstack/context => contexts}/sahara/test_sahara_output_data_sources.py (96%) rename tests/unit/{plugins/openstack/context/nova => contexts/senlin}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/senlin/test_profiles.py (95%) rename tests/unit/{plugins/openstack/context/quotas => contexts/swift}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/swift/test_objects.py (94%) rename tests/unit/{plugins/openstack/context => contexts}/swift/test_utils.py (95%) rename tests/unit/{plugins/openstack/context => contexts}/test_api_versions.py (97%) rename tests/unit/{plugins/openstack/context/sahara => contexts/vm}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/vm/test_custom_image.py (98%) rename tests/unit/{plugins/openstack/context => contexts}/vm/test_image_command_customizer.py (96%) rename tests/unit/{plugins/openstack/context/senlin => contexts/watcher}/__init__.py (100%) rename tests/unit/{plugins/openstack/context => contexts}/watcher/test_audit_templates.py (92%) rename tests/unit/{plugins/openstack => }/embedcharts/test_osprofilerchart.py (93%) rename tests/unit/{plugins/openstack/context/swift => hook}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/hook/test_fault_injection.py (98%) rename tests/unit/{plugins/openstack/context/vm => platforms}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/platforms/test_existing.py (90%) delete mode 100644 tests/unit/plugins/openstack/verification/tempest/__init__.py delete mode 100644 tests/unit/plugins/openstack/wrappers/__init__.py delete mode 100644 tests/unit/plugins/workload/__init__.py rename tests/unit/{plugins/openstack/context/watcher => scenarios}/__init__.py (100%) rename tests/unit/{plugins/openstack/hook => scenarios/authenticate}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/authenticate/test_authenticate.py (98%) rename tests/unit/{plugins/openstack/platforms => scenarios/ceilometer}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_alarms.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_events.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_meters.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_queries.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_resources.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_samples.py (95%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_stats.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_traits.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/ceilometer/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios => scenarios/cinder}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/cinder/test_qos_specs.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/cinder/test_utils.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/cinder/test_volume_backups.py (93%) rename tests/unit/{plugins/openstack => }/scenarios/cinder/test_volume_types.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/cinder/test_volumes.py (98%) rename tests/unit/{plugins/openstack/scenarios/authenticate => scenarios/designate}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/designate/test_basic.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/designate/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/ceilometer => scenarios/ec2}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/ec2/test_servers.py (95%) rename tests/unit/{plugins/openstack => }/scenarios/ec2/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/cinder => scenarios/glance}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/glance/test_images.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/glance/test_utils.py (93%) rename tests/unit/{plugins/openstack/scenarios/designate => scenarios/gnocchi}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/gnocchi/test_capabilities.py (90%) rename tests/unit/{plugins/openstack => }/scenarios/gnocchi/test_status.py (90%) rename tests/unit/{plugins/openstack => }/scenarios/gnocchi/test_utils.py (92%) rename tests/unit/{plugins/openstack/scenarios/ec2 => scenarios/heat}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/heat/test_stacks.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/heat/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/glance => scenarios/ironic}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/ironic/test_nodes.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/ironic/test_utils.py (95%) rename tests/unit/{plugins/openstack/scenarios/gnocchi => scenarios/keystone}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/keystone/test_basic.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/keystone/test_utils.py (97%) rename tests/unit/{plugins/openstack/scenarios/heat => scenarios/magnum}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/magnum/test_cluster_templates.py (93%) rename tests/unit/{plugins/openstack => }/scenarios/magnum/test_clusters.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/magnum/test_k8s_pods.py (90%) rename tests/unit/{plugins/openstack => }/scenarios/magnum/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/ironic => scenarios/manila}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/manila/test_shares.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/manila/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/keystone => scenarios/mistral}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/mistral/test_executions.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/mistral/test_utils.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/mistral/test_workbooks.py (94%) rename tests/unit/{plugins/openstack/scenarios/magnum => scenarios/monasca}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/monasca/test_metrics.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/monasca/test_utils.py (96%) rename tests/unit/{plugins/openstack/scenarios/manila => scenarios/murano}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/murano/test_environments.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/murano/test_packages.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/murano/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/mistral => scenarios/neutron}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_bgpvpn.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_loadbalancer_v1.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_loadbalancer_v2.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_network.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_security_groups.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/neutron/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/monasca => scenarios/nova}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_agents.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_aggregates.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_availability_zones.py (93%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_flavors.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_hosts.py (96%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_hypervisors.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_images.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_keypairs.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_server_groups.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_servers.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_services.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/nova/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/murano => scenarios/quotas}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/quotas/test_quotas.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/quotas/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/neutron => scenarios/sahara}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/sahara/test_clusters.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/sahara/test_jobs.py (98%) rename tests/unit/{plugins/openstack => }/scenarios/sahara/test_node_group_templates.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/sahara/test_utils.py (99%) rename tests/unit/{plugins/openstack/scenarios/nova => scenarios/senlin}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/senlin/test_clusters.py (95%) rename tests/unit/{plugins/openstack => }/scenarios/senlin/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/quotas => scenarios/swift}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/swift/test_objects.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/swift/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/sahara => scenarios/vm}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/vm/test_utils.py (99%) rename tests/unit/{plugins/openstack => }/scenarios/vm/test_vmtasks.py (99%) rename tests/unit/{plugins/openstack/scenarios/senlin => scenarios/watcher}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/watcher/test_basic.py (97%) rename tests/unit/{plugins/openstack => }/scenarios/watcher/test_utils.py (98%) rename tests/unit/{plugins/openstack/scenarios/swift => scenarios/zaqar}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/scenarios/zaqar/test_basic.py (94%) rename tests/unit/{plugins/openstack => }/scenarios/zaqar/test_utils.py (95%) rename tests/unit/{plugins/openstack/scenarios/vm => services}/__init__.py (100%) rename tests/unit/{plugins/openstack/scenarios/watcher => services/gnocchi}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/services/gnocchi/test_metric.py (99%) rename tests/unit/{plugins/openstack/scenarios/zaqar => services/heat}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/services/heat/test_main.py (89%) rename tests/unit/{plugins/openstack/services => services/identity}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/services/identity/test_identity.py (98%) rename tests/unit/{plugins/openstack => }/services/identity/test_keystone_common.py (97%) rename tests/unit/{plugins/openstack => }/services/identity/test_keystone_v2.py (99%) rename tests/unit/{plugins/openstack => }/services/identity/test_keystone_v3.py (99%) rename tests/unit/{plugins/openstack/services/gnocchi => services/image}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/services/image/test_glance_common.py (96%) rename tests/unit/{plugins/openstack => }/services/image/test_glance_v1.py (97%) rename tests/unit/{plugins/openstack => }/services/image/test_glance_v2.py (98%) rename tests/unit/{plugins/openstack => }/services/image/test_image.py (95%) rename tests/unit/{plugins/openstack/services/heat => services/storage}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/services/storage/test_block.py (99%) rename tests/unit/{plugins/openstack => }/services/storage/test_cinder_common.py (98%) rename tests/unit/{plugins/openstack => }/services/storage/test_cinder_v1.py (99%) rename tests/unit/{plugins/openstack => }/services/storage/test_cinder_v2.py (99%) rename tests/unit/{plugins/openstack => }/test_credential.py (93%) rename tests/unit/{plugins/openstack => }/test_osclients.py (99%) rename tests/unit/{plugins/openstack => }/test_scenario.py (95%) rename tests/unit/{plugins/openstack => }/test_service.py (96%) rename tests/unit/{plugins/openstack => }/test_types.py (99%) rename tests/unit/{plugins/openstack => }/test_validators.py (99%) rename tests/unit/{plugins/openstack/services/identity => verification}/__init__.py (100%) rename tests/unit/{plugins/openstack/services/image => verification/tempest}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/verification/tempest/test_config.py (98%) rename tests/unit/{plugins/openstack => }/verification/tempest/test_context.py (96%) rename tests/unit/{plugins/openstack => }/verification/tempest/test_manager.py (98%) rename tests/unit/{plugins/openstack/services/storage => workload}/__init__.py (100%) rename tests/unit/{plugins => }/workload/test_siege.py (100%) rename tests/unit/{plugins/openstack/verification => wrappers}/__init__.py (100%) rename tests/unit/{plugins/openstack => }/wrappers/test_cinder.py (96%) rename tests/unit/{plugins/openstack => }/wrappers/test_glance.py (98%) rename tests/unit/{plugins/openstack => }/wrappers/test_keystone.py (99%) rename tests/unit/{plugins/openstack => }/wrappers/test_network.py (97%) diff --git a/README.rst b/README.rst index 1c491fbe..d48f7af5 100644 --- a/README.rst +++ b/README.rst @@ -1,92 +1,8 @@ ===== -Rally +rally-openstack ===== -Team and repository tags -======================== - -.. image:: https://governance.openstack.org/badges/rally.svg - :target: https://governance.openstack.org/reference/tags/index.html - -.. image:: https://img.shields.io/pypi/v/rally.svg - :target: https://pypi.python.org/pypi/rally/ - :alt: Latest Version - -.. image:: https://img.shields.io/badge/gitter-join_chat-ff69b4.svg - :target: https://gitter.im/rally-dev/Lobby - :alt: Gitter Chat - -.. image:: https://img.shields.io/badge/tasks-trello_board-blue.svg - :target: https://trello.com/b/DoD8aeZy/rally - :alt: Trello Board - -.. image:: https://img.shields.io/github/license/openstack/rally.svg - :target: https://www.apache.org/licenses/LICENSE-2.0 - :alt: Apache License, Version 2.0 - - -What is Rally -============= - -Rally is a Benchmark-as-a-Service project for OpenStack. - -Rally is intended to provide the community with a benchmarking tool that is capable of performing **specific**, **complicated** and **reproducible** test cases on **real deployment** scenarios. - -If you are here, you are probably familiar with OpenStack and you also know that it's a really huge ecosystem of cooperative services. When something fails, performs slowly or doesn't scale, it's really hard to answer different questions on "what", "why" and "where" has happened. Another reason why you could be here is that you would like to build an OpenStack CI/CD system that will allow you to improve SLA, performance and stability of OpenStack continuously. - -The OpenStack QA team mostly works on CI/CD that ensures that new patches don't break some specific single node installation of OpenStack. On the other hand it's clear that such CI/CD is only an indication and does not cover all cases (e.g. if a cloud works well on a single node installation it doesn't mean that it will continue to do so on a 1k servers installation under high load as well). Rally aims to fix this and help us to answer the question "How does OpenStack work at scale?". To make it possible, we are going to automate and unify all steps that are required for benchmarking OpenStack at scale: multi-node OS deployment, verification, benchmarking & profiling. - - -**Rally** workflow can be visualized by the following diagram: - -.. image:: doc/source/images/Rally-Actions.png - :alt: Rally Architecture - - -Who Is Using Rally -================== - -.. image:: doc/source/images/Rally_who_is_using.png - :alt: Who is Using Rally - - -Documentation -============= - -`Rally documentation on ReadTheDocs `_ is a perfect place to start learning about Rally. It provides you with an **easy** and **illustrative** guidance through this benchmarking tool. For example, check out the `Rally step-by-step tutorial `_ that explains, in a series of lessons, how to explore the power of Rally in benchmarking your OpenStack clouds. - - -Architecture ------------- - -In terms of software architecture, Rally is built of 4 main components: - -1. **Server Providers** - provide servers (virtual servers), with ssh access, in one L3 network. -2. **Deploy Engines** - deploy OpenStack cloud on servers that are presented by **Server Providers** -3. **Verification** - component that runs tempest (or another specific set of tests) against a deployed cloud, collects results & presents them in human readable form. -4. **Benchmark engine** - allows to write parameterized benchmark scenarios & run them against the cloud. - -Use Cases ---------- - -There are 3 major high level Rally Use Cases: - -.. image:: doc/source/images/Rally-UseCases.png - :alt: Rally Use Cases - - -Typical cases where Rally aims to help are: - -- Automate measuring & profiling focused on how new code changes affect the OS performance; -- Using Rally profiler to detect scaling & performance issues; -- Investigate how different deployments affect the OS performance: - - Find the set of suitable OpenStack deployment architectures; - - Create deployment specifications for different loads (amount of controllers, swift nodes, etc.); -- Automate the search for hardware best suited for particular OpenStack cloud; -- Automate the production cloud specification generation: - - Determine terminal loads for basic cloud operations: VM start & stop, Block Device create/destroy & various OpenStack API methods; - - Check performance of basic cloud operations in case of different loads. - +Rally plugins for `OpenStack platform `_ Links ---------------------- @@ -96,7 +12,6 @@ Links * Source: https://git.openstack.org/cgit/openstack/rally * Bugs: https://bugs.launchpad.net/rally * Step-by-step tutorial: https://rally.readthedocs.io/en/latest/quick_start/tutorial.html -* RoadMap: https://docs.google.com/a/mirantis.com/spreadsheets/d/16DXpfbqvlzMFaqaXAcJsBzzpowb_XpymaK2aFY2gA2g * Launchpad page: https://launchpad.net/rally * Gitter chat: https://gitter.im/rally-dev/Lobby * Trello board: https://trello.com/b/DoD8aeZy/rally diff --git a/rally/plugins/__init__.py b/rally/plugins/__init__.py deleted file mode 100644 index c31175ae..00000000 --- a/rally/plugins/__init__.py +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 2015: Mirantis Inc. -# All Rights Reserved. -# -# Licensed 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. - -import os - -import decorator - -from rally.common.plugin import discover - - -PLUGINS_LOADED = False - - -def load(): - global PLUGINS_LOADED - - if not PLUGINS_LOADED: - from rally.common import opts - - opts.register() - - discover.import_modules_from_package("rally.deployment.engines") - discover.import_modules_from_package("rally.deployment.serverprovider") - discover.import_modules_from_package("rally.plugins.common") - try: - import rally_openstack # noqa - except ImportError: - # print warnings when rally_openstack will be released - discover.import_modules_from_package("rally.plugins.openstack") - discover.import_modules_from_package("rally.plugins.workload") - - discover.import_modules_by_entry_point() - - discover.load_plugins("/opt/rally/plugins/") - discover.load_plugins(os.path.expanduser("~/.rally/plugins/")) - - PLUGINS_LOADED = True - - -@decorator.decorator -def ensure_plugins_are_loaded(f, *args, **kwargs): - load() - return f(*args, **kwargs) diff --git a/rally/__init__.py b/rally_openstack/__init__.py similarity index 100% rename from rally/__init__.py rename to rally_openstack/__init__.py diff --git a/rally/plugins/openstack/__init__.py b/rally_openstack/cfg/__init__.py similarity index 100% rename from rally/plugins/openstack/__init__.py rename to rally_openstack/cfg/__init__.py diff --git a/rally/plugins/openstack/cfg/cinder.py b/rally_openstack/cfg/cinder.py similarity index 100% rename from rally/plugins/openstack/cfg/cinder.py rename to rally_openstack/cfg/cinder.py diff --git a/rally/plugins/openstack/cfg/cleanup.py b/rally_openstack/cfg/cleanup.py similarity index 100% rename from rally/plugins/openstack/cfg/cleanup.py rename to rally_openstack/cfg/cleanup.py diff --git a/rally/plugins/openstack/cfg/ec2.py b/rally_openstack/cfg/ec2.py similarity index 100% rename from rally/plugins/openstack/cfg/ec2.py rename to rally_openstack/cfg/ec2.py diff --git a/rally/plugins/openstack/cfg/glance.py b/rally_openstack/cfg/glance.py similarity index 100% rename from rally/plugins/openstack/cfg/glance.py rename to rally_openstack/cfg/glance.py diff --git a/rally/plugins/openstack/cfg/heat.py b/rally_openstack/cfg/heat.py similarity index 100% rename from rally/plugins/openstack/cfg/heat.py rename to rally_openstack/cfg/heat.py diff --git a/rally/plugins/openstack/cfg/ironic.py b/rally_openstack/cfg/ironic.py similarity index 100% rename from rally/plugins/openstack/cfg/ironic.py rename to rally_openstack/cfg/ironic.py diff --git a/rally/plugins/openstack/cfg/keystone_roles.py b/rally_openstack/cfg/keystone_roles.py similarity index 100% rename from rally/plugins/openstack/cfg/keystone_roles.py rename to rally_openstack/cfg/keystone_roles.py diff --git a/rally/plugins/openstack/cfg/keystone_users.py b/rally_openstack/cfg/keystone_users.py similarity index 100% rename from rally/plugins/openstack/cfg/keystone_users.py rename to rally_openstack/cfg/keystone_users.py diff --git a/rally/plugins/openstack/cfg/magnum.py b/rally_openstack/cfg/magnum.py similarity index 100% rename from rally/plugins/openstack/cfg/magnum.py rename to rally_openstack/cfg/magnum.py diff --git a/rally/plugins/openstack/cfg/manila.py b/rally_openstack/cfg/manila.py similarity index 100% rename from rally/plugins/openstack/cfg/manila.py rename to rally_openstack/cfg/manila.py diff --git a/rally/plugins/openstack/cfg/mistral.py b/rally_openstack/cfg/mistral.py similarity index 100% rename from rally/plugins/openstack/cfg/mistral.py rename to rally_openstack/cfg/mistral.py diff --git a/rally/plugins/openstack/cfg/monasca.py b/rally_openstack/cfg/monasca.py similarity index 100% rename from rally/plugins/openstack/cfg/monasca.py rename to rally_openstack/cfg/monasca.py diff --git a/rally/plugins/openstack/cfg/murano.py b/rally_openstack/cfg/murano.py similarity index 100% rename from rally/plugins/openstack/cfg/murano.py rename to rally_openstack/cfg/murano.py diff --git a/rally/plugins/openstack/cfg/neutron.py b/rally_openstack/cfg/neutron.py similarity index 100% rename from rally/plugins/openstack/cfg/neutron.py rename to rally_openstack/cfg/neutron.py diff --git a/rally/plugins/openstack/cfg/nova.py b/rally_openstack/cfg/nova.py similarity index 100% rename from rally/plugins/openstack/cfg/nova.py rename to rally_openstack/cfg/nova.py diff --git a/rally/plugins/openstack/cfg/opts.py b/rally_openstack/cfg/opts.py similarity index 53% rename from rally/plugins/openstack/cfg/opts.py rename to rally_openstack/cfg/opts.py index edab940f..93dce004 100644 --- a/rally/plugins/openstack/cfg/opts.py +++ b/rally_openstack/cfg/opts.py @@ -13,31 +13,31 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack.cfg import cinder -from rally.plugins.openstack.cfg import ec2 -from rally.plugins.openstack.cfg import glance -from rally.plugins.openstack.cfg import heat -from rally.plugins.openstack.cfg import ironic -from rally.plugins.openstack.cfg import magnum -from rally.plugins.openstack.cfg import manila -from rally.plugins.openstack.cfg import mistral -from rally.plugins.openstack.cfg import monasca -from rally.plugins.openstack.cfg import murano -from rally.plugins.openstack.cfg import neutron -from rally.plugins.openstack.cfg import nova -from rally.plugins.openstack.cfg import osclients -from rally.plugins.openstack.cfg import profiler -from rally.plugins.openstack.cfg import sahara -from rally.plugins.openstack.cfg import senlin -from rally.plugins.openstack.cfg import vm -from rally.plugins.openstack.cfg import watcher +from rally_openstack.cfg import cinder +from rally_openstack.cfg import ec2 +from rally_openstack.cfg import glance +from rally_openstack.cfg import heat +from rally_openstack.cfg import ironic +from rally_openstack.cfg import magnum +from rally_openstack.cfg import manila +from rally_openstack.cfg import mistral +from rally_openstack.cfg import monasca +from rally_openstack.cfg import murano +from rally_openstack.cfg import neutron +from rally_openstack.cfg import nova +from rally_openstack.cfg import osclients +from rally_openstack.cfg import profiler +from rally_openstack.cfg import sahara +from rally_openstack.cfg import senlin +from rally_openstack.cfg import vm +from rally_openstack.cfg import watcher -from rally.plugins.openstack.cfg import tempest +from rally_openstack.cfg import tempest -from rally.plugins.openstack.cfg import keystone_roles -from rally.plugins.openstack.cfg import keystone_users +from rally_openstack.cfg import keystone_roles +from rally_openstack.cfg import keystone_users -from rally.plugins.openstack.cfg import cleanup +from rally_openstack.cfg import cleanup def list_opts(): diff --git a/rally/plugins/openstack/cfg/osclients.py b/rally_openstack/cfg/osclients.py similarity index 100% rename from rally/plugins/openstack/cfg/osclients.py rename to rally_openstack/cfg/osclients.py diff --git a/rally/plugins/openstack/cfg/profiler.py b/rally_openstack/cfg/profiler.py similarity index 100% rename from rally/plugins/openstack/cfg/profiler.py rename to rally_openstack/cfg/profiler.py diff --git a/rally/plugins/openstack/cfg/sahara.py b/rally_openstack/cfg/sahara.py similarity index 100% rename from rally/plugins/openstack/cfg/sahara.py rename to rally_openstack/cfg/sahara.py diff --git a/rally/plugins/openstack/cfg/senlin.py b/rally_openstack/cfg/senlin.py similarity index 100% rename from rally/plugins/openstack/cfg/senlin.py rename to rally_openstack/cfg/senlin.py diff --git a/rally/plugins/openstack/cfg/tempest.py b/rally_openstack/cfg/tempest.py similarity index 100% rename from rally/plugins/openstack/cfg/tempest.py rename to rally_openstack/cfg/tempest.py diff --git a/rally/plugins/openstack/cfg/vm.py b/rally_openstack/cfg/vm.py similarity index 100% rename from rally/plugins/openstack/cfg/vm.py rename to rally_openstack/cfg/vm.py diff --git a/rally/plugins/openstack/cfg/watcher.py b/rally_openstack/cfg/watcher.py similarity index 100% rename from rally/plugins/openstack/cfg/watcher.py rename to rally_openstack/cfg/watcher.py diff --git a/rally/plugins/openstack/cfg/__init__.py b/rally_openstack/cleanup/__init__.py similarity index 100% rename from rally/plugins/openstack/cfg/__init__.py rename to rally_openstack/cleanup/__init__.py diff --git a/rally/plugins/openstack/cleanup/base.py b/rally_openstack/cleanup/base.py similarity index 100% rename from rally/plugins/openstack/cleanup/base.py rename to rally_openstack/cleanup/base.py diff --git a/rally/plugins/openstack/cleanup/manager.py b/rally_openstack/cleanup/manager.py similarity index 99% rename from rally/plugins/openstack/cleanup/manager.py rename to rally_openstack/cleanup/manager.py index 44d80e3e..767571d3 100644 --- a/rally/plugins/openstack/cleanup/manager.py +++ b/rally_openstack/cleanup/manager.py @@ -20,7 +20,7 @@ from rally.common import logging from rally.common.plugin import discover from rally.common.plugin import plugin from rally.common import utils as rutils -from rally.plugins.openstack.cleanup import base +from rally_openstack.cleanup import base LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/cleanup/resources.py b/rally_openstack/cleanup/resources.py similarity index 99% rename from rally/plugins/openstack/cleanup/resources.py rename to rally_openstack/cleanup/resources.py index b0d62e3c..7c4885b0 100644 --- a/rally/plugins/openstack/cleanup/resources.py +++ b/rally_openstack/cleanup/resources.py @@ -20,10 +20,10 @@ from saharaclient.api import base as saharaclient_base from rally.common import cfg from rally.common import logging -from rally.plugins.openstack.cleanup import base -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.image import glance_v2 -from rally.plugins.openstack.services.image import image +from rally_openstack.cleanup import base +from rally_openstack.services.identity import identity +from rally_openstack.services.image import glance_v2 +from rally_openstack.services.image import image from rally.task import utils as task_utils CONF = cfg.CONF diff --git a/rally/consts.py b/rally_openstack/consts.py similarity index 100% rename from rally/consts.py rename to rally_openstack/consts.py diff --git a/rally/plugins/openstack/cleanup/__init__.py b/rally_openstack/contexts/__init__.py similarity index 100% rename from rally/plugins/openstack/cleanup/__init__.py rename to rally_openstack/contexts/__init__.py diff --git a/rally/plugins/openstack/context/api_versions.py b/rally_openstack/contexts/api_versions.py similarity index 99% rename from rally/plugins/openstack/context/api_versions.py rename to rally_openstack/contexts/api_versions.py index 21526662..537be0ff 100644 --- a/rally/plugins/openstack/context/api_versions.py +++ b/rally_openstack/contexts/api_versions.py @@ -15,7 +15,7 @@ import random from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack import osclients +from rally_openstack import osclients from rally.task import context diff --git a/rally/plugins/openstack/context/__init__.py b/rally_openstack/contexts/ceilometer/__init__.py similarity index 100% rename from rally/plugins/openstack/context/__init__.py rename to rally_openstack/contexts/ceilometer/__init__.py diff --git a/rally/plugins/openstack/context/ceilometer/samples.py b/rally_openstack/contexts/ceilometer/samples.py similarity index 98% rename from rally/plugins/openstack/context/ceilometer/samples.py rename to rally_openstack/contexts/ceilometer/samples.py index 0c9f26af..2dd3dfe4 100644 --- a/rally/plugins/openstack/context/ceilometer/samples.py +++ b/rally_openstack/contexts/ceilometer/samples.py @@ -21,7 +21,7 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.scenarios.ceilometer import utils as ceilo_utils +from rally_openstack.scenarios.ceilometer import utils as ceilo_utils from rally.task import context diff --git a/rally/plugins/openstack/context/ceilometer/__init__.py b/rally_openstack/contexts/cinder/__init__.py similarity index 100% rename from rally/plugins/openstack/context/ceilometer/__init__.py rename to rally_openstack/contexts/cinder/__init__.py diff --git a/rally/plugins/openstack/context/cinder/volume_types.py b/rally_openstack/contexts/cinder/volume_types.py similarity index 92% rename from rally/plugins/openstack/context/cinder/volume_types.py rename to rally_openstack/contexts/cinder/volume_types.py index 1f51538e..51d606c5 100644 --- a/rally/plugins/openstack/context/cinder/volume_types.py +++ b/rally_openstack/contexts/cinder/volume_types.py @@ -16,9 +16,9 @@ from rally.common import logging from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.storage import block +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.services.storage import block from rally.task import context diff --git a/rally/plugins/openstack/context/cinder/volumes.py b/rally_openstack/contexts/cinder/volumes.py similarity index 94% rename from rally/plugins/openstack/context/cinder/volumes.py rename to rally_openstack/contexts/cinder/volumes.py index 44295fd0..5109f1cf 100644 --- a/rally/plugins/openstack/context/cinder/volumes.py +++ b/rally_openstack/contexts/cinder/volumes.py @@ -14,9 +14,9 @@ from rally.common import utils as rutils from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.storage import block +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.services.storage import block from rally.task import context diff --git a/rally/plugins/openstack/context/cinder/__init__.py b/rally_openstack/contexts/cleanup/__init__.py similarity index 100% rename from rally/plugins/openstack/context/cinder/__init__.py rename to rally_openstack/contexts/cleanup/__init__.py diff --git a/rally/plugins/openstack/context/cleanup/admin.py b/rally_openstack/contexts/cleanup/admin.py similarity index 90% rename from rally/plugins/openstack/context/cleanup/admin.py rename to rally_openstack/contexts/cleanup/admin.py index bdd2414b..5f3ae0e2 100644 --- a/rally/plugins/openstack/context/cleanup/admin.py +++ b/rally_openstack/contexts/cleanup/admin.py @@ -16,9 +16,9 @@ import sys from rally.common import validation -from rally.plugins.openstack.cleanup import manager -from rally.plugins.openstack.context.cleanup import base -from rally.plugins.openstack import scenario +from rally_openstack.cleanup import manager +from rally_openstack.contexts.cleanup import base +from rally_openstack import scenario from rally.task import context diff --git a/rally/plugins/openstack/context/cleanup/base.py b/rally_openstack/contexts/cleanup/base.py similarity index 96% rename from rally/plugins/openstack/context/cleanup/base.py rename to rally_openstack/contexts/cleanup/base.py index 39232694..2631731a 100644 --- a/rally/plugins/openstack/context/cleanup/base.py +++ b/rally_openstack/contexts/cleanup/base.py @@ -15,7 +15,7 @@ from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager +from rally_openstack.cleanup import manager @validation.configure("check_cleanup_resources") diff --git a/rally/plugins/openstack/context/cleanup/user.py b/rally_openstack/contexts/cleanup/user.py similarity index 89% rename from rally/plugins/openstack/context/cleanup/user.py rename to rally_openstack/contexts/cleanup/user.py index 86acedb0..111f3bbe 100644 --- a/rally/plugins/openstack/context/cleanup/user.py +++ b/rally_openstack/contexts/cleanup/user.py @@ -16,9 +16,9 @@ import sys from rally.common import validation -from rally.plugins.openstack.cleanup import manager -from rally.plugins.openstack.context.cleanup import base -from rally.plugins.openstack import scenario +from rally_openstack.cleanup import manager +from rally_openstack.contexts.cleanup import base +from rally_openstack import scenario from rally.task import context diff --git a/rally/plugins/openstack/context/cleanup/__init__.py b/rally_openstack/contexts/dataplane/__init__.py similarity index 100% rename from rally/plugins/openstack/context/cleanup/__init__.py rename to rally_openstack/contexts/dataplane/__init__.py diff --git a/rally/plugins/openstack/context/dataplane/heat.py b/rally_openstack/contexts/dataplane/heat.py similarity index 96% rename from rally/plugins/openstack/context/dataplane/heat.py rename to rally_openstack/contexts/dataplane/heat.py index 392f1bf3..e77eaa6b 100644 --- a/rally/plugins/openstack/context/dataplane/heat.py +++ b/rally_openstack/contexts/dataplane/heat.py @@ -19,9 +19,9 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.heat import utils as heat_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.heat import utils as heat_utils from rally.task import context diff --git a/rally/plugins/openstack/context/dataplane/__init__.py b/rally_openstack/contexts/designate/__init__.py similarity index 100% rename from rally/plugins/openstack/context/dataplane/__init__.py rename to rally_openstack/contexts/designate/__init__.py diff --git a/rally/plugins/openstack/context/designate/zones.py b/rally_openstack/contexts/designate/zones.py similarity index 94% rename from rally/plugins/openstack/context/designate/zones.py rename to rally_openstack/contexts/designate/zones.py index 1d402880..2a8507cb 100644 --- a/rally/plugins/openstack/context/designate/zones.py +++ b/rally_openstack/contexts/designate/zones.py @@ -15,8 +15,8 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.designate import utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.designate import utils from rally.task import context diff --git a/rally/plugins/openstack/context/designate/__init__.py b/rally_openstack/contexts/ec2/__init__.py similarity index 100% rename from rally/plugins/openstack/context/designate/__init__.py rename to rally_openstack/contexts/ec2/__init__.py diff --git a/rally/plugins/openstack/context/ec2/servers.py b/rally_openstack/contexts/ec2/servers.py similarity index 93% rename from rally/plugins/openstack/context/ec2/servers.py rename to rally_openstack/contexts/ec2/servers.py index 454862d7..39984d9e 100644 --- a/rally/plugins/openstack/context/ec2/servers.py +++ b/rally_openstack/contexts/ec2/servers.py @@ -15,10 +15,10 @@ from rally.common import logging from rally.common import utils as rutils from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.ec2 import utils as ec2_utils -from rally.plugins.openstack import types +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.ec2 import utils as ec2_utils +from rally_openstack import types from rally.task import context diff --git a/rally/plugins/openstack/context/ec2/__init__.py b/rally_openstack/contexts/glance/__init__.py similarity index 100% rename from rally/plugins/openstack/context/ec2/__init__.py rename to rally_openstack/contexts/glance/__init__.py diff --git a/rally/plugins/openstack/context/glance/images.py b/rally_openstack/contexts/glance/images.py similarity index 98% rename from rally/plugins/openstack/context/glance/images.py rename to rally_openstack/contexts/glance/images.py index 95e26f14..6ea05922 100644 --- a/rally/plugins/openstack/context/glance/images.py +++ b/rally_openstack/contexts/glance/images.py @@ -17,9 +17,9 @@ from rally.common import logging from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.image import image +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.services.image import image from rally.task import context CONF = cfg.CONF diff --git a/rally/plugins/openstack/context/glance/__init__.py b/rally_openstack/contexts/heat/__init__.py similarity index 100% rename from rally/plugins/openstack/context/glance/__init__.py rename to rally_openstack/contexts/heat/__init__.py diff --git a/rally/plugins/openstack/context/heat/stacks.py b/rally_openstack/contexts/heat/stacks.py similarity index 95% rename from rally/plugins/openstack/context/heat/stacks.py rename to rally_openstack/contexts/heat/stacks.py index 5875ecb5..86e3ed47 100644 --- a/rally/plugins/openstack/context/heat/stacks.py +++ b/rally_openstack/contexts/heat/stacks.py @@ -16,8 +16,8 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.heat import utils as heat_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.heat import utils as heat_utils from rally.task import context diff --git a/rally/plugins/openstack/context/heat/__init__.py b/rally_openstack/contexts/keystone/__init__.py similarity index 100% rename from rally/plugins/openstack/context/heat/__init__.py rename to rally_openstack/contexts/keystone/__init__.py diff --git a/rally/plugins/openstack/context/keystone/roles.py b/rally_openstack/contexts/keystone/roles.py similarity index 97% rename from rally/plugins/openstack/context/keystone/roles.py rename to rally_openstack/contexts/keystone/roles.py index 9c516703..162574fb 100644 --- a/rally/plugins/openstack/context/keystone/roles.py +++ b/rally_openstack/contexts/keystone/roles.py @@ -19,8 +19,8 @@ from rally.common import logging from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.identity import identity +from rally_openstack import osclients +from rally_openstack.services.identity import identity from rally.task import context diff --git a/rally/plugins/openstack/context/keystone/users.py b/rally_openstack/contexts/keystone/users.py similarity index 98% rename from rally/plugins/openstack/context/keystone/users.py rename to rally_openstack/contexts/keystone/users.py index 073ba19d..f3de4fe1 100644 --- a/rally/plugins/openstack/context/keystone/users.py +++ b/rally_openstack/contexts/keystone/users.py @@ -23,10 +23,10 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack import credential -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.wrappers import network +from rally_openstack import credential +from rally_openstack import osclients +from rally_openstack.services.identity import identity +from rally_openstack.wrappers import network from rally.task import context diff --git a/rally/plugins/openstack/context/keystone/__init__.py b/rally_openstack/contexts/magnum/__init__.py similarity index 100% rename from rally/plugins/openstack/context/keystone/__init__.py rename to rally_openstack/contexts/magnum/__init__.py diff --git a/rally/plugins/openstack/context/magnum/ca_certs.py b/rally_openstack/contexts/magnum/ca_certs.py similarity index 98% rename from rally/plugins/openstack/context/magnum/ca_certs.py rename to rally_openstack/contexts/magnum/ca_certs.py index c0e698b8..f710ba97 100644 --- a/rally/plugins/openstack/context/magnum/ca_certs.py +++ b/rally_openstack/contexts/magnum/ca_certs.py @@ -24,7 +24,7 @@ from cryptography.x509 import oid from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils +from rally_openstack.scenarios.magnum import utils as magnum_utils from rally.task import context diff --git a/rally/plugins/openstack/context/magnum/cluster_templates.py b/rally_openstack/contexts/magnum/cluster_templates.py similarity index 96% rename from rally/plugins/openstack/context/magnum/cluster_templates.py rename to rally_openstack/contexts/magnum/cluster_templates.py index 589dd78a..53109d24 100644 --- a/rally/plugins/openstack/context/magnum/cluster_templates.py +++ b/rally_openstack/contexts/magnum/cluster_templates.py @@ -15,8 +15,8 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.magnum import utils as magnum_utils from rally.task import context diff --git a/rally/plugins/openstack/context/magnum/clusters.py b/rally_openstack/contexts/magnum/clusters.py similarity index 92% rename from rally/plugins/openstack/context/magnum/clusters.py rename to rally_openstack/contexts/magnum/clusters.py index a930f25a..f2f4e94c 100644 --- a/rally/plugins/openstack/context/magnum/clusters.py +++ b/rally_openstack/contexts/magnum/clusters.py @@ -15,9 +15,9 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils -from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.magnum import utils as magnum_utils +from rally_openstack.scenarios.nova import utils as nova_utils from rally.task import context diff --git a/rally/plugins/openstack/context/magnum/__init__.py b/rally_openstack/contexts/manila/__init__.py similarity index 100% rename from rally/plugins/openstack/context/magnum/__init__.py rename to rally_openstack/contexts/manila/__init__.py diff --git a/rally/plugins/openstack/context/manila/consts.py b/rally_openstack/contexts/manila/consts.py similarity index 100% rename from rally/plugins/openstack/context/manila/consts.py rename to rally_openstack/contexts/manila/consts.py diff --git a/rally/plugins/openstack/context/manila/manila_security_services.py b/rally_openstack/contexts/manila/manila_security_services.py similarity index 94% rename from rally/plugins/openstack/context/manila/manila_security_services.py rename to rally_openstack/contexts/manila/manila_security_services.py index adabcc13..ae94de4a 100644 --- a/rally/plugins/openstack/context/manila/manila_security_services.py +++ b/rally_openstack/contexts/manila/manila_security_services.py @@ -17,9 +17,9 @@ from rally.common import cfg from rally.common import utils from rally.common import validation from rally import consts as rally_consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.scenarios.manila import utils as manila_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.contexts.manila import consts +from rally_openstack.scenarios.manila import utils as manila_utils from rally.task import context CONF = cfg.CONF diff --git a/rally/plugins/openstack/context/manila/manila_share_networks.py b/rally_openstack/contexts/manila/manila_share_networks.py similarity index 97% rename from rally/plugins/openstack/context/manila/manila_share_networks.py rename to rally_openstack/contexts/manila/manila_share_networks.py index ef15d527..749e3531 100644 --- a/rally/plugins/openstack/context/manila/manila_share_networks.py +++ b/rally_openstack/contexts/manila/manila_share_networks.py @@ -19,9 +19,9 @@ from rally.common import utils from rally.common import validation from rally import consts as rally_consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.scenarios.manila import utils as manila_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.contexts.manila import consts +from rally_openstack.scenarios.manila import utils as manila_utils from rally.task import context CONF = cfg.CONF diff --git a/rally/plugins/openstack/context/manila/manila_shares.py b/rally_openstack/contexts/manila/manila_shares.py similarity index 94% rename from rally/plugins/openstack/context/manila/manila_shares.py rename to rally_openstack/contexts/manila/manila_shares.py index fe9b59f7..b04320ba 100644 --- a/rally/plugins/openstack/context/manila/manila_shares.py +++ b/rally_openstack/contexts/manila/manila_shares.py @@ -17,9 +17,9 @@ from rally.common import cfg from rally.common import utils from rally.common import validation from rally import consts as rally_consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.scenarios.manila import utils as manila_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.contexts.manila import consts +from rally_openstack.scenarios.manila import utils as manila_utils from rally.task import context CONF = cfg.CONF diff --git a/rally/plugins/openstack/context/manila/__init__.py b/rally_openstack/contexts/monasca/__init__.py similarity index 100% rename from rally/plugins/openstack/context/manila/__init__.py rename to rally_openstack/contexts/monasca/__init__.py diff --git a/rally/plugins/openstack/context/monasca/metrics.py b/rally_openstack/contexts/monasca/metrics.py similarity index 97% rename from rally/plugins/openstack/context/monasca/metrics.py rename to rally_openstack/contexts/monasca/metrics.py index ec706124..bc98be09 100644 --- a/rally/plugins/openstack/context/monasca/metrics.py +++ b/rally_openstack/contexts/monasca/metrics.py @@ -17,7 +17,7 @@ from six import moves from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.scenarios.monasca import utils as monasca_utils +from rally_openstack.scenarios.monasca import utils as monasca_utils from rally.task import context diff --git a/rally/plugins/openstack/context/monasca/__init__.py b/rally_openstack/contexts/murano/__init__.py similarity index 100% rename from rally/plugins/openstack/context/monasca/__init__.py rename to rally_openstack/contexts/murano/__init__.py diff --git a/rally/plugins/openstack/context/murano/murano_environments.py b/rally_openstack/contexts/murano/murano_environments.py similarity index 93% rename from rally/plugins/openstack/context/murano/murano_environments.py rename to rally_openstack/contexts/murano/murano_environments.py index 5592852f..6578ff94 100644 --- a/rally/plugins/openstack/context/murano/murano_environments.py +++ b/rally_openstack/contexts/murano/murano_environments.py @@ -16,8 +16,8 @@ from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.murano import utils as murano_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.murano import utils as murano_utils from rally.task import context diff --git a/rally/plugins/openstack/context/murano/murano_packages.py b/rally_openstack/contexts/murano/murano_packages.py similarity index 96% rename from rally/plugins/openstack/context/murano/murano_packages.py rename to rally_openstack/contexts/murano/murano_packages.py index 38f428e9..b44690e1 100644 --- a/rally/plugins/openstack/context/murano/murano_packages.py +++ b/rally_openstack/contexts/murano/murano_packages.py @@ -21,8 +21,8 @@ from rally.common import utils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients from rally.task import context diff --git a/rally/plugins/openstack/context/murano/__init__.py b/rally_openstack/contexts/network/__init__.py similarity index 100% rename from rally/plugins/openstack/context/murano/__init__.py rename to rally_openstack/contexts/network/__init__.py diff --git a/rally/plugins/openstack/context/network/allow_ssh.py b/rally_openstack/contexts/network/allow_ssh.py similarity index 97% rename from rally/plugins/openstack/context/network/allow_ssh.py rename to rally_openstack/contexts/network/allow_ssh.py index 0a9c55d6..9116b784 100644 --- a/rally/plugins/openstack/context/network/allow_ssh.py +++ b/rally_openstack/contexts/network/allow_ssh.py @@ -16,8 +16,8 @@ from rally.common import logging from rally.common import utils from rally.common import validation -from rally.plugins.openstack import osclients -from rally.plugins.openstack.wrappers import network +from rally_openstack import osclients +from rally_openstack.wrappers import network from rally.task import context diff --git a/rally/plugins/openstack/context/network/existing_network.py b/rally_openstack/contexts/network/existing_network.py similarity index 93% rename from rally/plugins/openstack/context/network/existing_network.py rename to rally_openstack/contexts/network/existing_network.py index 4c6fdbde..6a8dc72b 100644 --- a/rally/plugins/openstack/context/network/existing_network.py +++ b/rally_openstack/contexts/network/existing_network.py @@ -15,8 +15,8 @@ from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack import osclients -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack import osclients +from rally_openstack.wrappers import network as network_wrapper from rally.task import context diff --git a/rally/plugins/openstack/context/network/networks.py b/rally_openstack/contexts/network/networks.py similarity index 97% rename from rally/plugins/openstack/context/network/networks.py rename to rally_openstack/contexts/network/networks.py index 33d81c44..2a98a5ef 100644 --- a/rally/plugins/openstack/context/network/networks.py +++ b/rally_openstack/contexts/network/networks.py @@ -17,8 +17,8 @@ from rally.common import logging from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack import osclients -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack import osclients +from rally_openstack.wrappers import network as network_wrapper from rally.task import context diff --git a/rally/plugins/openstack/context/network/routers.py b/rally_openstack/contexts/network/routers.py similarity index 96% rename from rally/plugins/openstack/context/network/routers.py rename to rally_openstack/contexts/network/routers.py index d5ff6d70..a187b597 100644 --- a/rally/plugins/openstack/context/network/routers.py +++ b/rally_openstack/contexts/network/routers.py @@ -16,8 +16,8 @@ from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.neutron import utils as neutron_utils from rally.task import context diff --git a/rally/plugins/openstack/context/network/__init__.py b/rally_openstack/contexts/neutron/__init__.py similarity index 100% rename from rally/plugins/openstack/context/network/__init__.py rename to rally_openstack/contexts/neutron/__init__.py diff --git a/rally/plugins/openstack/context/neutron/lbaas.py b/rally_openstack/contexts/neutron/lbaas.py similarity index 96% rename from rally/plugins/openstack/context/neutron/lbaas.py rename to rally_openstack/contexts/neutron/lbaas.py index 8ba5efc1..f557f797 100644 --- a/rally/plugins/openstack/context/neutron/lbaas.py +++ b/rally_openstack/contexts/neutron/lbaas.py @@ -14,8 +14,8 @@ from rally.common import logging from rally.common import utils from rally.common import validation from rally import consts -from rally.plugins.openstack import osclients -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack import osclients +from rally_openstack.wrappers import network as network_wrapper from rally.task import context diff --git a/rally/plugins/openstack/context/neutron/__init__.py b/rally_openstack/contexts/nova/__init__.py similarity index 100% rename from rally/plugins/openstack/context/neutron/__init__.py rename to rally_openstack/contexts/nova/__init__.py diff --git a/rally/plugins/openstack/context/nova/flavors.py b/rally_openstack/contexts/nova/flavors.py similarity index 97% rename from rally/plugins/openstack/context/nova/flavors.py rename to rally_openstack/contexts/nova/flavors.py index 5b646a24..245158ce 100644 --- a/rally/plugins/openstack/context/nova/flavors.py +++ b/rally_openstack/contexts/nova/flavors.py @@ -17,8 +17,8 @@ from rally.common import logging from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/nova/keypairs.py b/rally_openstack/contexts/nova/keypairs.py similarity index 95% rename from rally/plugins/openstack/context/nova/keypairs.py rename to rally_openstack/contexts/nova/keypairs.py index 7ad344d7..19f81d46 100644 --- a/rally/plugins/openstack/context/nova/keypairs.py +++ b/rally_openstack/contexts/nova/keypairs.py @@ -14,8 +14,8 @@ # under the License. from rally.common import validation -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients from rally.task import context diff --git a/rally/plugins/openstack/context/nova/servers.py b/rally_openstack/contexts/nova/servers.py similarity index 95% rename from rally/plugins/openstack/context/nova/servers.py rename to rally_openstack/contexts/nova/servers.py index 975ad1c4..77bd9a63 100755 --- a/rally/plugins/openstack/context/nova/servers.py +++ b/rally_openstack/contexts/nova/servers.py @@ -15,10 +15,10 @@ from rally.common import logging from rally.common import utils as rutils from rally.common import validation -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.nova import utils as nova_utils -from rally.plugins.openstack import types +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.nova import utils as nova_utils +from rally_openstack import types from rally.task import context diff --git a/rally/plugins/openstack/context/nova/__init__.py b/rally_openstack/contexts/quotas/__init__.py similarity index 100% rename from rally/plugins/openstack/context/nova/__init__.py rename to rally_openstack/contexts/quotas/__init__.py diff --git a/rally/plugins/openstack/context/quotas/cinder_quotas.py b/rally_openstack/contexts/quotas/cinder_quotas.py similarity index 100% rename from rally/plugins/openstack/context/quotas/cinder_quotas.py rename to rally_openstack/contexts/quotas/cinder_quotas.py diff --git a/rally/plugins/openstack/context/quotas/designate_quotas.py b/rally_openstack/contexts/quotas/designate_quotas.py similarity index 100% rename from rally/plugins/openstack/context/quotas/designate_quotas.py rename to rally_openstack/contexts/quotas/designate_quotas.py diff --git a/rally/plugins/openstack/context/quotas/manila_quotas.py b/rally_openstack/contexts/quotas/manila_quotas.py similarity index 100% rename from rally/plugins/openstack/context/quotas/manila_quotas.py rename to rally_openstack/contexts/quotas/manila_quotas.py diff --git a/rally/plugins/openstack/context/quotas/neutron_quotas.py b/rally_openstack/contexts/quotas/neutron_quotas.py similarity index 100% rename from rally/plugins/openstack/context/quotas/neutron_quotas.py rename to rally_openstack/contexts/quotas/neutron_quotas.py diff --git a/rally/plugins/openstack/context/quotas/nova_quotas.py b/rally_openstack/contexts/quotas/nova_quotas.py similarity index 100% rename from rally/plugins/openstack/context/quotas/nova_quotas.py rename to rally_openstack/contexts/quotas/nova_quotas.py diff --git a/rally/plugins/openstack/context/quotas/quotas.py b/rally_openstack/contexts/quotas/quotas.py similarity index 91% rename from rally/plugins/openstack/context/quotas/quotas.py rename to rally_openstack/contexts/quotas/quotas.py index 642dfa44..7f75ee24 100644 --- a/rally/plugins/openstack/context/quotas/quotas.py +++ b/rally_openstack/contexts/quotas/quotas.py @@ -16,12 +16,12 @@ from rally.common import logging from rally.common import validation from rally import consts -from rally.plugins.openstack.context.quotas import cinder_quotas -from rally.plugins.openstack.context.quotas import designate_quotas -from rally.plugins.openstack.context.quotas import manila_quotas -from rally.plugins.openstack.context.quotas import neutron_quotas -from rally.plugins.openstack.context.quotas import nova_quotas -from rally.plugins.openstack import osclients +from rally_openstack.contexts.quotas import cinder_quotas +from rally_openstack.contexts.quotas import designate_quotas +from rally_openstack.contexts.quotas import manila_quotas +from rally_openstack.contexts.quotas import neutron_quotas +from rally_openstack.contexts.quotas import nova_quotas +from rally_openstack import osclients from rally.task import context diff --git a/rally/plugins/openstack/context/quotas/__init__.py b/rally_openstack/contexts/sahara/__init__.py similarity index 100% rename from rally/plugins/openstack/context/quotas/__init__.py rename to rally_openstack/contexts/sahara/__init__.py diff --git a/rally/plugins/openstack/context/sahara/sahara_cluster.py b/rally_openstack/contexts/sahara/sahara_cluster.py similarity index 98% rename from rally/plugins/openstack/context/sahara/sahara_cluster.py rename to rally_openstack/contexts/sahara/sahara_cluster.py index 9e288451..0021472f 100644 --- a/rally/plugins/openstack/context/sahara/sahara_cluster.py +++ b/rally_openstack/contexts/sahara/sahara_cluster.py @@ -18,8 +18,8 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack.scenarios.sahara import utils from rally.task import context from rally.task import utils as bench_utils diff --git a/rally/plugins/openstack/context/sahara/sahara_image.py b/rally_openstack/contexts/sahara/sahara_image.py similarity index 95% rename from rally/plugins/openstack/context/sahara/sahara_image.py rename to rally_openstack/contexts/sahara/sahara_image.py index 9aa33fef..700b7df1 100644 --- a/rally/plugins/openstack/context/sahara/sahara_image.py +++ b/rally_openstack/contexts/sahara/sahara_image.py @@ -16,10 +16,10 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.sahara import utils -from rally.plugins.openstack.services.image import image as image_services +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.sahara import utils +from rally_openstack.services.image import image as image_services from rally.task import context diff --git a/rally/plugins/openstack/context/sahara/sahara_input_data_sources.py b/rally_openstack/contexts/sahara/sahara_input_data_sources.py similarity index 95% rename from rally/plugins/openstack/context/sahara/sahara_input_data_sources.py rename to rally_openstack/contexts/sahara/sahara_input_data_sources.py index 6fc178c3..c9e4a43c 100644 --- a/rally/plugins/openstack/context/sahara/sahara_input_data_sources.py +++ b/rally_openstack/contexts/sahara/sahara_input_data_sources.py @@ -19,10 +19,10 @@ from six.moves.urllib import parse from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.sahara import utils -from rally.plugins.openstack.scenarios.swift import utils as swift_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.sahara import utils +from rally_openstack.scenarios.swift import utils as swift_utils from rally.task import context diff --git a/rally/plugins/openstack/context/sahara/sahara_job_binaries.py b/rally_openstack/contexts/sahara/sahara_job_binaries.py similarity index 96% rename from rally/plugins/openstack/context/sahara/sahara_job_binaries.py rename to rally_openstack/contexts/sahara/sahara_job_binaries.py index 4bd6bc39..4ea6333b 100644 --- a/rally/plugins/openstack/context/sahara/sahara_job_binaries.py +++ b/rally_openstack/contexts/sahara/sahara_job_binaries.py @@ -19,9 +19,9 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.sahara import utils from rally.task import context diff --git a/rally/plugins/openstack/context/sahara/sahara_output_data_sources.py b/rally_openstack/contexts/sahara/sahara_output_data_sources.py similarity index 94% rename from rally/plugins/openstack/context/sahara/sahara_output_data_sources.py rename to rally_openstack/contexts/sahara/sahara_output_data_sources.py index 8e4367fb..2479a150 100644 --- a/rally/plugins/openstack/context/sahara/sahara_output_data_sources.py +++ b/rally_openstack/contexts/sahara/sahara_output_data_sources.py @@ -16,10 +16,10 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.sahara import utils -from rally.plugins.openstack.scenarios.swift import utils as swift_utils +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.sahara import utils +from rally_openstack.scenarios.swift import utils as swift_utils from rally.task import context diff --git a/rally/plugins/openstack/context/sahara/__init__.py b/rally_openstack/contexts/senlin/__init__.py similarity index 100% rename from rally/plugins/openstack/context/sahara/__init__.py rename to rally_openstack/contexts/senlin/__init__.py diff --git a/rally/plugins/openstack/context/senlin/profiles.py b/rally_openstack/contexts/senlin/profiles.py similarity index 97% rename from rally/plugins/openstack/context/senlin/profiles.py rename to rally_openstack/contexts/senlin/profiles.py index c27c1802..826610ac 100644 --- a/rally/plugins/openstack/context/senlin/profiles.py +++ b/rally_openstack/contexts/senlin/profiles.py @@ -13,7 +13,7 @@ from rally.common import utils as rutils from rally.common import validation from rally import consts -from rally.plugins.openstack.scenarios.senlin import utils as senlin_utils +from rally_openstack.scenarios.senlin import utils as senlin_utils from rally.task import context diff --git a/rally/plugins/openstack/context/senlin/__init__.py b/rally_openstack/contexts/swift/__init__.py similarity index 100% rename from rally/plugins/openstack/context/senlin/__init__.py rename to rally_openstack/contexts/swift/__init__.py diff --git a/rally/plugins/openstack/context/swift/objects.py b/rally_openstack/contexts/swift/objects.py similarity index 98% rename from rally/plugins/openstack/context/swift/objects.py rename to rally_openstack/contexts/swift/objects.py index 6a6c82d5..d0a77c69 100644 --- a/rally/plugins/openstack/context/swift/objects.py +++ b/rally_openstack/contexts/swift/objects.py @@ -17,7 +17,7 @@ from rally.common import logging from rally.common import validation from rally import consts from rally import exceptions -from rally.plugins.openstack.context.swift import utils as swift_utils +from rally_openstack.contexts.swift import utils as swift_utils from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/swift/utils.py b/rally_openstack/contexts/swift/utils.py similarity index 98% rename from rally/plugins/openstack/context/swift/utils.py rename to rally_openstack/contexts/swift/utils.py index 127c0a4a..28ff1a58 100644 --- a/rally/plugins/openstack/context/swift/utils.py +++ b/rally_openstack/contexts/swift/utils.py @@ -17,7 +17,7 @@ import tempfile from rally.common import broker from rally.common import utils as rutils -from rally.plugins.openstack.scenarios.swift import utils as swift_utils +from rally_openstack.scenarios.swift import utils as swift_utils class SwiftObjectMixin(object): diff --git a/rally/plugins/openstack/context/swift/__init__.py b/rally_openstack/contexts/vm/__init__.py similarity index 100% rename from rally/plugins/openstack/context/swift/__init__.py rename to rally_openstack/contexts/vm/__init__.py diff --git a/rally/plugins/openstack/context/vm/custom_image.py b/rally_openstack/contexts/vm/custom_image.py similarity index 97% rename from rally/plugins/openstack/context/vm/custom_image.py rename to rally_openstack/contexts/vm/custom_image.py index e36d39b8..0a408567 100644 --- a/rally/plugins/openstack/context/vm/custom_image.py +++ b/rally_openstack/contexts/vm/custom_image.py @@ -21,10 +21,10 @@ from rally.common import broker from rally.common import logging from rally.common import utils from rally import consts -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.vm import vmtasks -from rally.plugins.openstack.services.image import image -from rally.plugins.openstack import types +from rally_openstack import osclients +from rally_openstack.scenarios.vm import vmtasks +from rally_openstack.services.image import image +from rally_openstack import types from rally.task import context LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/context/vm/image_command_customizer.py b/rally_openstack/contexts/vm/image_command_customizer.py similarity index 96% rename from rally/plugins/openstack/context/vm/image_command_customizer.py rename to rally_openstack/contexts/vm/image_command_customizer.py index 1d007a80..4797fbc9 100644 --- a/rally/plugins/openstack/context/vm/image_command_customizer.py +++ b/rally_openstack/contexts/vm/image_command_customizer.py @@ -17,8 +17,8 @@ import copy from rally.common import validation from rally import exceptions -from rally.plugins.openstack.context.vm import custom_image -from rally.plugins.openstack.scenarios.vm import utils as vm_utils +from rally_openstack.contexts.vm import custom_image +from rally_openstack.scenarios.vm import utils as vm_utils import rally.task.context as context diff --git a/rally/plugins/openstack/context/vm/__init__.py b/rally_openstack/contexts/watcher/__init__.py similarity index 100% rename from rally/plugins/openstack/context/vm/__init__.py rename to rally_openstack/contexts/watcher/__init__.py diff --git a/rally/plugins/openstack/context/watcher/audit_templates.py b/rally_openstack/contexts/watcher/audit_templates.py similarity index 94% rename from rally/plugins/openstack/context/watcher/audit_templates.py rename to rally_openstack/contexts/watcher/audit_templates.py index c3a7700a..423ddce8 100644 --- a/rally/plugins/openstack/context/watcher/audit_templates.py +++ b/rally_openstack/contexts/watcher/audit_templates.py @@ -18,10 +18,10 @@ import six from rally.common import validation from rally import consts -from rally.plugins.openstack.cleanup import manager as resource_manager -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.watcher import utils as watcher_utils -from rally.plugins.openstack import types +from rally_openstack.cleanup import manager as resource_manager +from rally_openstack import osclients +from rally_openstack.scenarios.watcher import utils as watcher_utils +from rally_openstack import types from rally.task import context diff --git a/rally/plugins/openstack/credential.py b/rally_openstack/credential.py similarity index 98% rename from rally/plugins/openstack/credential.py rename to rally_openstack/credential.py index b7cde394..9b765d65 100644 --- a/rally/plugins/openstack/credential.py +++ b/rally_openstack/credential.py @@ -14,7 +14,7 @@ # under the License. from rally.common import logging -from rally.plugins.openstack import osclients +from rally_openstack import osclients LOG = logging.getLogger(__file__) diff --git a/rally/plugins/openstack/context/watcher/__init__.py b/rally_openstack/embedcharts/__init__.py similarity index 100% rename from rally/plugins/openstack/context/watcher/__init__.py rename to rally_openstack/embedcharts/__init__.py diff --git a/rally/plugins/openstack/embedcharts/osprofilerchart.py b/rally_openstack/embedcharts/osprofilerchart.py similarity index 100% rename from rally/plugins/openstack/embedcharts/osprofilerchart.py rename to rally_openstack/embedcharts/osprofilerchart.py diff --git a/rally/plugins/openstack/embedcharts/__init__.py b/rally_openstack/hook/__init__.py similarity index 100% rename from rally/plugins/openstack/embedcharts/__init__.py rename to rally_openstack/hook/__init__.py diff --git a/rally/plugins/openstack/hook/fault_injection.py b/rally_openstack/hook/fault_injection.py similarity index 100% rename from rally/plugins/openstack/hook/fault_injection.py rename to rally_openstack/hook/fault_injection.py diff --git a/rally/plugins/openstack/osclients.py b/rally_openstack/osclients.py similarity index 99% rename from rally/plugins/openstack/osclients.py rename to rally_openstack/osclients.py index c781258d..130aeb4e 100644 --- a/rally/plugins/openstack/osclients.py +++ b/rally_openstack/osclients.py @@ -796,7 +796,7 @@ class Clients(object): @classmethod def create_from_env(cls): creds = envutils.get_creds_from_env_vars() - from rally.plugins.openstack import credential + from rally_openstack import credential oscred = credential.OpenStackCredential( auth_url=creds["auth_url"], username=creds["admin"]["username"], diff --git a/rally/plugins/openstack/hook/__init__.py b/rally_openstack/platforms/__init__.py similarity index 100% rename from rally/plugins/openstack/hook/__init__.py rename to rally_openstack/platforms/__init__.py diff --git a/rally/plugins/openstack/platforms/existing.py b/rally_openstack/platforms/existing.py similarity index 99% rename from rally/plugins/openstack/platforms/existing.py rename to rally_openstack/platforms/existing.py index 71c7bef6..9c0a62ee 100644 --- a/rally/plugins/openstack/platforms/existing.py +++ b/rally_openstack/platforms/existing.py @@ -19,7 +19,7 @@ import traceback from rally.common import cfg from rally.common import logging from rally.env import platform -from rally.plugins.openstack import osclients +from rally_openstack import osclients LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenario.py b/rally_openstack/scenario.py similarity index 99% rename from rally/plugins/openstack/scenario.py rename to rally_openstack/scenario.py index ad1c36c3..0963aefb 100644 --- a/rally/plugins/openstack/scenario.py +++ b/rally_openstack/scenario.py @@ -20,7 +20,7 @@ from osprofiler import profiler from rally.common import cfg from rally.common.plugin import plugin -from rally.plugins.openstack import osclients +from rally_openstack import osclients from rally.task import context from rally.task import scenario diff --git a/rally/plugins/openstack/platforms/__init__.py b/rally_openstack/scenarios/__init__.py similarity index 100% rename from rally/plugins/openstack/platforms/__init__.py rename to rally_openstack/scenarios/__init__.py diff --git a/rally/plugins/openstack/scenarios/__init__.py b/rally_openstack/scenarios/authenticate/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/__init__.py rename to rally_openstack/scenarios/authenticate/__init__.py diff --git a/rally/plugins/openstack/scenarios/authenticate/authenticate.py b/rally_openstack/scenarios/authenticate/authenticate.py similarity index 99% rename from rally/plugins/openstack/scenarios/authenticate/authenticate.py rename to rally_openstack/scenarios/authenticate/authenticate.py index ad54d385..733f0866 100644 --- a/rally/plugins/openstack/scenarios/authenticate/authenticate.py +++ b/rally_openstack/scenarios/authenticate/authenticate.py @@ -13,7 +13,7 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/authenticate/__init__.py b/rally_openstack/scenarios/ceilometer/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/authenticate/__init__.py rename to rally_openstack/scenarios/ceilometer/__init__.py diff --git a/rally/plugins/openstack/scenarios/ceilometer/alarms.py b/rally_openstack/scenarios/ceilometer/alarms.py similarity index 98% rename from rally/plugins/openstack/scenarios/ceilometer/alarms.py rename to rally_openstack/scenarios/ceilometer/alarms.py index dfe6d285..9dcb6858 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/alarms.py +++ b/rally_openstack/scenarios/ceilometer/alarms.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as ceiloutils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/events.py b/rally_openstack/scenarios/ceilometer/events.py similarity index 95% rename from rally/plugins/openstack/scenarios/ceilometer/events.py rename to rally_openstack/scenarios/ceilometer/events.py index 4ee4707f..c96474c4 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/events.py +++ b/rally_openstack/scenarios/ceilometer/events.py @@ -17,9 +17,9 @@ Scenarios for Ceilometer Events API. """ from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as cutils -from rally.plugins.openstack.scenarios.keystone import basic as kbasic +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as cutils +from rally_openstack.scenarios.keystone import basic as kbasic from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/meters.py b/rally_openstack/scenarios/ceilometer/meters.py similarity index 95% rename from rally/plugins/openstack/scenarios/ceilometer/meters.py rename to rally_openstack/scenarios/ceilometer/meters.py index 0552faf6..442b58a9 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/meters.py +++ b/rally_openstack/scenarios/ceilometer/meters.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as ceiloutils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/queries.py b/rally_openstack/scenarios/ceilometer/queries.py similarity index 97% rename from rally/plugins/openstack/scenarios/ceilometer/queries.py rename to rally_openstack/scenarios/ceilometer/queries.py index 7a28fe87..545bbafd 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/queries.py +++ b/rally_openstack/scenarios/ceilometer/queries.py @@ -15,8 +15,8 @@ import json from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as ceiloutils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/resources.py b/rally_openstack/scenarios/ceilometer/resources.py similarity index 97% rename from rally/plugins/openstack/scenarios/ceilometer/resources.py rename to rally_openstack/scenarios/ceilometer/resources.py index b6d9cde5..92ae05c9 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/resources.py +++ b/rally_openstack/scenarios/ceilometer/resources.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as ceiloutils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/samples.py b/rally_openstack/scenarios/ceilometer/samples.py similarity index 95% rename from rally/plugins/openstack/scenarios/ceilometer/samples.py rename to rally_openstack/scenarios/ceilometer/samples.py index 2f1f19d7..f477c499 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/samples.py +++ b/rally_openstack/scenarios/ceilometer/samples.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as ceiloutils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as ceiloutils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/stats.py b/rally_openstack/scenarios/ceilometer/stats.py similarity index 96% rename from rally/plugins/openstack/scenarios/ceilometer/stats.py rename to rally_openstack/scenarios/ceilometer/stats.py index ff8aedeb..d5a1b208 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/stats.py +++ b/rally_openstack/scenarios/ceilometer/stats.py @@ -14,8 +14,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/traits.py b/rally_openstack/scenarios/ceilometer/traits.py similarity index 93% rename from rally/plugins/openstack/scenarios/ceilometer/traits.py rename to rally_openstack/scenarios/ceilometer/traits.py index 25d69b59..7d575b0c 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/traits.py +++ b/rally_openstack/scenarios/ceilometer/traits.py @@ -13,9 +13,9 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ceilometer import utils as cutils -from rally.plugins.openstack.scenarios.keystone import basic as kbasic +from rally_openstack import scenario +from rally_openstack.scenarios.ceilometer import utils as cutils +from rally_openstack.scenarios.keystone import basic as kbasic from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ceilometer/utils.py b/rally_openstack/scenarios/ceilometer/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/ceilometer/utils.py rename to rally_openstack/scenarios/ceilometer/utils.py index ff2ea7ee..538f525e 100644 --- a/rally/plugins/openstack/scenarios/ceilometer/utils.py +++ b/rally_openstack/scenarios/ceilometer/utils.py @@ -18,7 +18,7 @@ import uuid import six from rally import exceptions -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils as bench_utils diff --git a/rally/plugins/openstack/scenarios/ceilometer/__init__.py b/rally_openstack/scenarios/cinder/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/ceilometer/__init__.py rename to rally_openstack/scenarios/cinder/__init__.py diff --git a/rally/plugins/openstack/scenarios/cinder/qos_specs.py b/rally_openstack/scenarios/cinder/qos_specs.py similarity index 97% rename from rally/plugins/openstack/scenarios/cinder/qos_specs.py rename to rally_openstack/scenarios/cinder/qos_specs.py index bcbb72e4..07b9d12c 100644 --- a/rally/plugins/openstack/scenarios/cinder/qos_specs.py +++ b/rally_openstack/scenarios/cinder/qos_specs.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/cinder/utils.py b/rally_openstack/scenarios/cinder/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/cinder/utils.py rename to rally_openstack/scenarios/cinder/utils.py index 7e2c4f87..a1d35b47 100644 --- a/rally/plugins/openstack/scenarios/cinder/utils.py +++ b/rally_openstack/scenarios/cinder/utils.py @@ -18,10 +18,10 @@ import random from rally.common import cfg from rally.common import logging from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.services.storage import block -from rally.plugins.openstack.wrappers import cinder as cinder_wrapper -from rally.plugins.openstack.wrappers import glance as glance_wrapper +from rally_openstack import scenario +from rally_openstack.services.storage import block +from rally_openstack.wrappers import cinder as cinder_wrapper +from rally_openstack.wrappers import glance as glance_wrapper from rally.task import atomic from rally.task import utils as bench_utils diff --git a/rally/plugins/openstack/scenarios/cinder/volume_backups.py b/rally_openstack/scenarios/cinder/volume_backups.py similarity index 95% rename from rally/plugins/openstack/scenarios/cinder/volume_backups.py rename to rally_openstack/scenarios/cinder/volume_backups.py index 7c4ea629..06fa77dd 100644 --- a/rally/plugins/openstack/scenarios/cinder/volume_backups.py +++ b/rally_openstack/scenarios/cinder/volume_backups.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/cinder/volume_types.py b/rally_openstack/scenarios/cinder/volume_types.py similarity index 99% rename from rally/plugins/openstack/scenarios/cinder/volume_types.py rename to rally_openstack/scenarios/cinder/volume_types.py index 5d5c62a9..7d7a5a55 100644 --- a/rally/plugins/openstack/scenarios/cinder/volume_types.py +++ b/rally_openstack/scenarios/cinder/volume_types.py @@ -14,9 +14,9 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.services.storage import cinder_v2 +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.services.storage import cinder_v2 from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally_openstack/scenarios/cinder/volumes.py similarity index 99% rename from rally/plugins/openstack/scenarios/cinder/volumes.py rename to rally_openstack/scenarios/cinder/volumes.py index 60d1966e..2625834f 100644 --- a/rally/plugins/openstack/scenarios/cinder/volumes.py +++ b/rally_openstack/scenarios/cinder/volumes.py @@ -18,10 +18,10 @@ import random from rally.common import logging from rally import consts from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.scenarios.glance import images -from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.scenarios.glance import images +from rally_openstack.scenarios.nova import utils as nova_utils from rally.task import atomic from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/cinder/__init__.py b/rally_openstack/scenarios/designate/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/cinder/__init__.py rename to rally_openstack/scenarios/designate/__init__.py diff --git a/rally/plugins/openstack/scenarios/designate/basic.py b/rally_openstack/scenarios/designate/basic.py similarity index 99% rename from rally/plugins/openstack/scenarios/designate/basic.py rename to rally_openstack/scenarios/designate/basic.py index c7c1da44..a669b0f9 100644 --- a/rally/plugins/openstack/scenarios/designate/basic.py +++ b/rally_openstack/scenarios/designate/basic.py @@ -16,8 +16,8 @@ import random from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.designate import utils +from rally_openstack import scenario +from rally_openstack.scenarios.designate import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/designate/utils.py b/rally_openstack/scenarios/designate/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/designate/utils.py rename to rally_openstack/scenarios/designate/utils.py index 80380300..652b01d0 100644 --- a/rally/plugins/openstack/scenarios/designate/utils.py +++ b/rally_openstack/scenarios/designate/utils.py @@ -14,7 +14,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic diff --git a/rally/plugins/openstack/scenarios/dummy.py b/rally_openstack/scenarios/dummy.py similarity index 94% rename from rally/plugins/openstack/scenarios/dummy.py rename to rally_openstack/scenarios/dummy.py index 7bd0793e..720c4446 100644 --- a/rally/plugins/openstack/scenarios/dummy.py +++ b/rally_openstack/scenarios/dummy.py @@ -14,7 +14,8 @@ # under the License. from rally.plugins.common.scenarios.dummy import dummy -from rally.plugins.openstack import scenario + +from rally_openstack import scenario @scenario.configure(name="Dummy.openstack") diff --git a/rally/plugins/openstack/scenarios/designate/__init__.py b/rally_openstack/scenarios/ec2/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/designate/__init__.py rename to rally_openstack/scenarios/ec2/__init__.py diff --git a/rally/plugins/openstack/scenarios/ec2/servers.py b/rally_openstack/scenarios/ec2/servers.py similarity index 95% rename from rally/plugins/openstack/scenarios/ec2/servers.py rename to rally_openstack/scenarios/ec2/servers.py index 8587214d..6bab91ad 100644 --- a/rally/plugins/openstack/scenarios/ec2/servers.py +++ b/rally_openstack/scenarios/ec2/servers.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ec2 import utils +from rally_openstack import scenario +from rally_openstack.scenarios.ec2 import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ec2/utils.py b/rally_openstack/scenarios/ec2/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/ec2/utils.py rename to rally_openstack/scenarios/ec2/utils.py index 70d60da3..6c6af070 100644 --- a/rally/plugins/openstack/scenarios/ec2/utils.py +++ b/rally_openstack/scenarios/ec2/utils.py @@ -14,7 +14,7 @@ from rally.common import cfg -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/ec2/__init__.py b/rally_openstack/scenarios/glance/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/ec2/__init__.py rename to rally_openstack/scenarios/glance/__init__.py diff --git a/rally/plugins/openstack/scenarios/glance/images.py b/rally_openstack/scenarios/glance/images.py similarity index 98% rename from rally/plugins/openstack/scenarios/glance/images.py rename to rally_openstack/scenarios/glance/images.py index 7744da40..6148444d 100644 --- a/rally/plugins/openstack/scenarios/glance/images.py +++ b/rally_openstack/scenarios/glance/images.py @@ -15,10 +15,10 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils as nova_utils -from rally.plugins.openstack.services.image import glance_v2 -from rally.plugins.openstack.services.image import image +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils as nova_utils +from rally_openstack.services.image import glance_v2 +from rally_openstack.services.image import image from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/glance/utils.py b/rally_openstack/scenarios/glance/utils.py similarity index 96% rename from rally/plugins/openstack/scenarios/glance/utils.py rename to rally_openstack/scenarios/glance/utils.py index 1c10af68..e35e7b3f 100644 --- a/rally/plugins/openstack/scenarios/glance/utils.py +++ b/rally_openstack/scenarios/glance/utils.py @@ -15,8 +15,8 @@ from rally.common import cfg from rally.common import logging -from rally.plugins.openstack import scenario -from rally.plugins.openstack.wrappers import glance as glance_wrapper +from rally_openstack import scenario +from rally_openstack.wrappers import glance as glance_wrapper from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/glance/__init__.py b/rally_openstack/scenarios/gnocchi/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/glance/__init__.py rename to rally_openstack/scenarios/gnocchi/__init__.py diff --git a/rally/plugins/openstack/scenarios/gnocchi/capabilities.py b/rally_openstack/scenarios/gnocchi/capabilities.py similarity index 90% rename from rally/plugins/openstack/scenarios/gnocchi/capabilities.py rename to rally_openstack/scenarios/gnocchi/capabilities.py index 1f88fb4e..38b272ff 100644 --- a/rally/plugins/openstack/scenarios/gnocchi/capabilities.py +++ b/rally_openstack/scenarios/gnocchi/capabilities.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.gnocchi import utils as gnocchiutils +from rally_openstack import scenario +from rally_openstack.scenarios.gnocchi import utils as gnocchiutils from rally.task import validation """Scenarios for Gnocchi capabilities.""" diff --git a/rally/plugins/openstack/scenarios/gnocchi/status.py b/rally_openstack/scenarios/gnocchi/status.py similarity index 90% rename from rally/plugins/openstack/scenarios/gnocchi/status.py rename to rally_openstack/scenarios/gnocchi/status.py index 39357c4b..d63d84ad 100644 --- a/rally/plugins/openstack/scenarios/gnocchi/status.py +++ b/rally_openstack/scenarios/gnocchi/status.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.gnocchi import utils as gnocchiutils +from rally_openstack import scenario +from rally_openstack.scenarios.gnocchi import utils as gnocchiutils from rally.task import validation """Scenarios for Gnocchi status.""" diff --git a/rally/plugins/openstack/scenarios/gnocchi/utils.py b/rally_openstack/scenarios/gnocchi/utils.py similarity index 92% rename from rally/plugins/openstack/scenarios/gnocchi/utils.py rename to rally_openstack/scenarios/gnocchi/utils.py index 60e91a31..059efb08 100644 --- a/rally/plugins/openstack/scenarios/gnocchi/utils.py +++ b/rally_openstack/scenarios/gnocchi/utils.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack import scenario -from rally.plugins.openstack.services.gnocchi import metric +from rally_openstack import scenario +from rally_openstack.services.gnocchi import metric class GnocchiBase(scenario.OpenStackScenario): diff --git a/rally/plugins/openstack/scenarios/gnocchi/__init__.py b/rally_openstack/scenarios/heat/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/gnocchi/__init__.py rename to rally_openstack/scenarios/heat/__init__.py diff --git a/rally/plugins/openstack/scenarios/heat/stacks.py b/rally_openstack/scenarios/heat/stacks.py similarity index 99% rename from rally/plugins/openstack/scenarios/heat/stacks.py rename to rally_openstack/scenarios/heat/stacks.py index d4b40b8f..462ccc26 100644 --- a/rally/plugins/openstack/scenarios/heat/stacks.py +++ b/rally_openstack/scenarios/heat/stacks.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.heat import utils +from rally_openstack import scenario +from rally_openstack.scenarios.heat import utils from rally.task import atomic from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/heat/utils.py b/rally_openstack/scenarios/heat/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/heat/utils.py rename to rally_openstack/scenarios/heat/utils.py index 5f083f46..eb10183a 100644 --- a/rally/plugins/openstack/scenarios/heat/utils.py +++ b/rally_openstack/scenarios/heat/utils.py @@ -18,7 +18,7 @@ import requests from rally.common import cfg from rally.common import logging from rally import exceptions -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/heat/__init__.py b/rally_openstack/scenarios/ironic/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/heat/__init__.py rename to rally_openstack/scenarios/ironic/__init__.py diff --git a/rally/plugins/openstack/scenarios/ironic/nodes.py b/rally_openstack/scenarios/ironic/nodes.py similarity index 97% rename from rally/plugins/openstack/scenarios/ironic/nodes.py rename to rally_openstack/scenarios/ironic/nodes.py index 2fcfd5fe..ecc84b8d 100644 --- a/rally/plugins/openstack/scenarios/ironic/nodes.py +++ b/rally_openstack/scenarios/ironic/nodes.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.ironic import utils +from rally_openstack import scenario +from rally_openstack.scenarios.ironic import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/ironic/utils.py b/rally_openstack/scenarios/ironic/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/ironic/utils.py rename to rally_openstack/scenarios/ironic/utils.py index ae45893a..ecffdbd7 100644 --- a/rally/plugins/openstack/scenarios/ironic/utils.py +++ b/rally_openstack/scenarios/ironic/utils.py @@ -16,7 +16,7 @@ import string from rally.common import cfg -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/ironic/__init__.py b/rally_openstack/scenarios/keystone/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/ironic/__init__.py rename to rally_openstack/scenarios/keystone/__init__.py diff --git a/rally/plugins/openstack/scenarios/keystone/basic.py b/rally_openstack/scenarios/keystone/basic.py similarity index 99% rename from rally/plugins/openstack/scenarios/keystone/basic.py rename to rally_openstack/scenarios/keystone/basic.py index 2e43d5bc..1783a9cf 100755 --- a/rally/plugins/openstack/scenarios/keystone/basic.py +++ b/rally_openstack/scenarios/keystone/basic.py @@ -14,8 +14,8 @@ # under the License. from rally.common import logging -from rally.plugins.openstack import scenario -from rally.plugins.openstack.services.identity import identity +from rally_openstack import scenario +from rally_openstack.services.identity import identity from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/keystone/utils.py b/rally_openstack/scenarios/keystone/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/keystone/utils.py rename to rally_openstack/scenarios/keystone/utils.py index b5fa4d63..c9abb7f6 100644 --- a/rally/plugins/openstack/scenarios/keystone/utils.py +++ b/rally_openstack/scenarios/keystone/utils.py @@ -16,8 +16,8 @@ import uuid from rally.common import logging -from rally.plugins.openstack import scenario -from rally.plugins.openstack.wrappers import keystone as keystone_wrapper +from rally_openstack import scenario +from rally_openstack.wrappers import keystone as keystone_wrapper from rally.task import atomic diff --git a/rally/plugins/openstack/scenarios/keystone/__init__.py b/rally_openstack/scenarios/magnum/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/keystone/__init__.py rename to rally_openstack/scenarios/magnum/__init__.py diff --git a/rally/plugins/openstack/scenarios/magnum/cluster_templates.py b/rally_openstack/scenarios/magnum/cluster_templates.py similarity index 94% rename from rally/plugins/openstack/scenarios/magnum/cluster_templates.py rename to rally_openstack/scenarios/magnum/cluster_templates.py index 58399d54..cc30ec4e 100644 --- a/rally/plugins/openstack/scenarios/magnum/cluster_templates.py +++ b/rally_openstack/scenarios/magnum/cluster_templates.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.magnum import utils +from rally_openstack import scenario +from rally_openstack.scenarios.magnum import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/magnum/clusters.py b/rally_openstack/scenarios/magnum/clusters.py similarity index 95% rename from rally/plugins/openstack/scenarios/magnum/clusters.py rename to rally_openstack/scenarios/magnum/clusters.py index 1738ff17..992b2bfb 100644 --- a/rally/plugins/openstack/scenarios/magnum/clusters.py +++ b/rally_openstack/scenarios/magnum/clusters.py @@ -13,9 +13,9 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.magnum import utils -from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally_openstack import scenario +from rally_openstack.scenarios.magnum import utils +from rally_openstack.scenarios.nova import utils as nova_utils from rally.task import validation """Scenarios for Magnum clusters.""" diff --git a/rally/plugins/openstack/scenarios/magnum/k8s_pods.py b/rally_openstack/scenarios/magnum/k8s_pods.py similarity index 95% rename from rally/plugins/openstack/scenarios/magnum/k8s_pods.py rename to rally_openstack/scenarios/magnum/k8s_pods.py index d3a9dbf8..66227a61 100644 --- a/rally/plugins/openstack/scenarios/magnum/k8s_pods.py +++ b/rally_openstack/scenarios/magnum/k8s_pods.py @@ -15,8 +15,8 @@ import yaml from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.magnum import utils +from rally_openstack import scenario +from rally_openstack.scenarios.magnum import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/magnum/utils.py b/rally_openstack/scenarios/magnum/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/magnum/utils.py rename to rally_openstack/scenarios/magnum/utils.py index d1e76d7f..aea9bfc4 100644 --- a/rally/plugins/openstack/scenarios/magnum/utils.py +++ b/rally_openstack/scenarios/magnum/utils.py @@ -25,7 +25,7 @@ from kubernetes.client.rest import ApiException from rally.common import cfg from rally.common import utils as common_utils from rally import exceptions -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/magnum/__init__.py b/rally_openstack/scenarios/manila/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/magnum/__init__.py rename to rally_openstack/scenarios/manila/__init__.py diff --git a/rally/plugins/openstack/scenarios/manila/shares.py b/rally_openstack/scenarios/manila/shares.py similarity index 99% rename from rally/plugins/openstack/scenarios/manila/shares.py rename to rally_openstack/scenarios/manila/shares.py index cb525ef1..9482a58e 100644 --- a/rally/plugins/openstack/scenarios/manila/shares.py +++ b/rally_openstack/scenarios/manila/shares.py @@ -15,9 +15,9 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack.context.manila import consts as manila_consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.manila import utils +from rally_openstack.contexts.manila import consts as manila_consts +from rally_openstack import scenario +from rally_openstack.scenarios.manila import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/manila/utils.py b/rally_openstack/scenarios/manila/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/manila/utils.py rename to rally_openstack/scenarios/manila/utils.py index 73b00c75..2eefc76d 100644 --- a/rally/plugins/openstack/scenarios/manila/utils.py +++ b/rally_openstack/scenarios/manila/utils.py @@ -17,8 +17,8 @@ import random from rally.common import cfg from rally import exceptions -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack import scenario +from rally_openstack.contexts.manila import consts +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/manila/__init__.py b/rally_openstack/scenarios/mistral/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/manila/__init__.py rename to rally_openstack/scenarios/mistral/__init__.py diff --git a/rally/plugins/openstack/scenarios/mistral/executions.py b/rally_openstack/scenarios/mistral/executions.py similarity index 97% rename from rally/plugins/openstack/scenarios/mistral/executions.py rename to rally_openstack/scenarios/mistral/executions.py index 5c9a400b..290aa57a 100644 --- a/rally/plugins/openstack/scenarios/mistral/executions.py +++ b/rally_openstack/scenarios/mistral/executions.py @@ -18,8 +18,8 @@ import six import yaml from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.mistral import utils +from rally_openstack import scenario +from rally_openstack.scenarios.mistral import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/mistral/utils.py b/rally_openstack/scenarios/mistral/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/mistral/utils.py rename to rally_openstack/scenarios/mistral/utils.py index 147c414c..5b6de77f 100644 --- a/rally/plugins/openstack/scenarios/mistral/utils.py +++ b/rally_openstack/scenarios/mistral/utils.py @@ -17,7 +17,7 @@ import yaml from rally.common import cfg -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/mistral/workbooks.py b/rally_openstack/scenarios/mistral/workbooks.py similarity index 95% rename from rally/plugins/openstack/scenarios/mistral/workbooks.py rename to rally_openstack/scenarios/mistral/workbooks.py index 5028837a..aaa1e672 100644 --- a/rally/plugins/openstack/scenarios/mistral/workbooks.py +++ b/rally_openstack/scenarios/mistral/workbooks.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.mistral import utils +from rally_openstack import scenario +from rally_openstack.scenarios.mistral import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/mistral/__init__.py b/rally_openstack/scenarios/monasca/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/mistral/__init__.py rename to rally_openstack/scenarios/monasca/__init__.py diff --git a/rally/plugins/openstack/scenarios/monasca/metrics.py b/rally_openstack/scenarios/monasca/metrics.py similarity index 90% rename from rally/plugins/openstack/scenarios/monasca/metrics.py rename to rally_openstack/scenarios/monasca/metrics.py index 2430c5d5..1ecf6803 100644 --- a/rally/plugins/openstack/scenarios/monasca/metrics.py +++ b/rally_openstack/scenarios/monasca/metrics.py @@ -13,8 +13,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.monasca import utils as monascautils +from rally_openstack import scenario +from rally_openstack.scenarios.monasca import utils as monascautils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/monasca/utils.py b/rally_openstack/scenarios/monasca/utils.py similarity index 97% rename from rally/plugins/openstack/scenarios/monasca/utils.py rename to rally_openstack/scenarios/monasca/utils.py index 8b609a11..9ac2dbd4 100644 --- a/rally/plugins/openstack/scenarios/monasca/utils.py +++ b/rally_openstack/scenarios/monasca/utils.py @@ -17,7 +17,7 @@ import time import uuid from rally.common import cfg -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic diff --git a/rally/plugins/openstack/scenarios/monasca/__init__.py b/rally_openstack/scenarios/murano/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/monasca/__init__.py rename to rally_openstack/scenarios/murano/__init__.py diff --git a/rally/plugins/openstack/scenarios/murano/environments.py b/rally_openstack/scenarios/murano/environments.py similarity index 96% rename from rally/plugins/openstack/scenarios/murano/environments.py rename to rally_openstack/scenarios/murano/environments.py index 46763068..b426c57b 100644 --- a/rally/plugins/openstack/scenarios/murano/environments.py +++ b/rally_openstack/scenarios/murano/environments.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.murano import utils +from rally_openstack import scenario +from rally_openstack.scenarios.murano import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/murano/packages.py b/rally_openstack/scenarios/murano/packages.py similarity index 98% rename from rally/plugins/openstack/scenarios/murano/packages.py rename to rally_openstack/scenarios/murano/packages.py index d74ba37a..17dbeaa1 100644 --- a/rally/plugins/openstack/scenarios/murano/packages.py +++ b/rally_openstack/scenarios/murano/packages.py @@ -17,8 +17,8 @@ import os from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.murano import utils +from rally_openstack import scenario +from rally_openstack.scenarios.murano import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/murano/utils.py b/rally_openstack/scenarios/murano/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/murano/utils.py rename to rally_openstack/scenarios/murano/utils.py index 84ca3c5f..eeff7723 100644 --- a/rally/plugins/openstack/scenarios/murano/utils.py +++ b/rally_openstack/scenarios/murano/utils.py @@ -24,7 +24,7 @@ import yaml from rally.common import cfg from rally.common import fileutils from rally.common import utils as common_utils -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/murano/__init__.py b/rally_openstack/scenarios/neutron/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/murano/__init__.py rename to rally_openstack/scenarios/neutron/__init__.py diff --git a/rally/plugins/openstack/scenarios/neutron/bgpvpn.py b/rally_openstack/scenarios/neutron/bgpvpn.py similarity index 99% rename from rally/plugins/openstack/scenarios/neutron/bgpvpn.py rename to rally_openstack/scenarios/neutron/bgpvpn.py index f3e5a593..2d1e9be8 100644 --- a/rally/plugins/openstack/scenarios/neutron/bgpvpn.py +++ b/rally_openstack/scenarios/neutron/bgpvpn.py @@ -12,8 +12,8 @@ import random from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack import scenario +from rally_openstack.scenarios.neutron import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py b/rally_openstack/scenarios/neutron/loadbalancer_v1.py similarity index 99% rename from rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py rename to rally_openstack/scenarios/neutron/loadbalancer_v1.py index ec7fbc46..7187daae 100644 --- a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v1.py +++ b/rally_openstack/scenarios/neutron/loadbalancer_v1.py @@ -13,8 +13,8 @@ import random from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack import scenario +from rally_openstack.scenarios.neutron import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v2.py b/rally_openstack/scenarios/neutron/loadbalancer_v2.py similarity index 95% rename from rally/plugins/openstack/scenarios/neutron/loadbalancer_v2.py rename to rally_openstack/scenarios/neutron/loadbalancer_v2.py index c81e6b92..fc2993f9 100755 --- a/rally/plugins/openstack/scenarios/neutron/loadbalancer_v2.py +++ b/rally_openstack/scenarios/neutron/loadbalancer_v2.py @@ -11,8 +11,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack import scenario +from rally_openstack.scenarios.neutron import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/neutron/network.py b/rally_openstack/scenarios/neutron/network.py similarity index 99% rename from rally/plugins/openstack/scenarios/neutron/network.py rename to rally_openstack/scenarios/neutron/network.py index 04d2f3ec..e95d5636 100644 --- a/rally/plugins/openstack/scenarios/neutron/network.py +++ b/rally_openstack/scenarios/neutron/network.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack import scenario +from rally_openstack.scenarios.neutron import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/neutron/security_groups.py b/rally_openstack/scenarios/neutron/security_groups.py similarity index 98% rename from rally/plugins/openstack/scenarios/neutron/security_groups.py rename to rally_openstack/scenarios/neutron/security_groups.py index 86f65d71..6807cf6b 100644 --- a/rally/plugins/openstack/scenarios/neutron/security_groups.py +++ b/rally_openstack/scenarios/neutron/security_groups.py @@ -11,8 +11,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack import scenario +from rally_openstack.scenarios.neutron import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/neutron/utils.py b/rally_openstack/scenarios/neutron/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/neutron/utils.py rename to rally_openstack/scenarios/neutron/utils.py index e0532e2f..e306bc4f 100644 --- a/rally/plugins/openstack/scenarios/neutron/utils.py +++ b/rally_openstack/scenarios/neutron/utils.py @@ -18,8 +18,8 @@ import random from rally.common import cfg from rally.common import logging from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack import scenario +from rally_openstack.wrappers import network as network_wrapper from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/neutron/__init__.py b/rally_openstack/scenarios/nova/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/neutron/__init__.py rename to rally_openstack/scenarios/nova/__init__.py diff --git a/rally/plugins/openstack/scenarios/nova/agents.py b/rally_openstack/scenarios/nova/agents.py similarity index 92% rename from rally/plugins/openstack/scenarios/nova/agents.py rename to rally_openstack/scenarios/nova/agents.py index 25a9c71d..31626ad7 100644 --- a/rally/plugins/openstack/scenarios/nova/agents.py +++ b/rally_openstack/scenarios/nova/agents.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/aggregates.py b/rally_openstack/scenarios/nova/aggregates.py similarity index 98% rename from rally/plugins/openstack/scenarios/nova/aggregates.py rename to rally_openstack/scenarios/nova/aggregates.py index 4c9cee83..a89b4701 100644 --- a/rally/plugins/openstack/scenarios/nova/aggregates.py +++ b/rally_openstack/scenarios/nova/aggregates.py @@ -15,8 +15,8 @@ from rally import consts from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/availability_zones.py b/rally_openstack/scenarios/nova/availability_zones.py similarity index 93% rename from rally/plugins/openstack/scenarios/nova/availability_zones.py rename to rally_openstack/scenarios/nova/availability_zones.py index 92397da1..430929ba 100644 --- a/rally/plugins/openstack/scenarios/nova/availability_zones.py +++ b/rally_openstack/scenarios/nova/availability_zones.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/flavors.py b/rally_openstack/scenarios/nova/flavors.py similarity index 99% rename from rally/plugins/openstack/scenarios/nova/flavors.py rename to rally_openstack/scenarios/nova/flavors.py index bb382bca..24a3b09a 100644 --- a/rally/plugins/openstack/scenarios/nova/flavors.py +++ b/rally_openstack/scenarios/nova/flavors.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/hosts.py b/rally_openstack/scenarios/nova/hosts.py similarity index 95% rename from rally/plugins/openstack/scenarios/nova/hosts.py rename to rally_openstack/scenarios/nova/hosts.py index c414da49..94f06db1 100644 --- a/rally/plugins/openstack/scenarios/nova/hosts.py +++ b/rally_openstack/scenarios/nova/hosts.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/hypervisors.py b/rally_openstack/scenarios/nova/hypervisors.py similarity index 97% rename from rally/plugins/openstack/scenarios/nova/hypervisors.py rename to rally_openstack/scenarios/nova/hypervisors.py index ac50ea21..bb8769fb 100644 --- a/rally/plugins/openstack/scenarios/nova/hypervisors.py +++ b/rally_openstack/scenarios/nova/hypervisors.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/images.py b/rally_openstack/scenarios/nova/images.py similarity index 94% rename from rally/plugins/openstack/scenarios/nova/images.py rename to rally_openstack/scenarios/nova/images.py index 51c24435..b87f9d2d 100644 --- a/rally/plugins/openstack/scenarios/nova/images.py +++ b/rally_openstack/scenarios/nova/images.py @@ -15,8 +15,8 @@ from rally.common.plugin import plugin from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/keypairs.py b/rally_openstack/scenarios/nova/keypairs.py similarity index 97% rename from rally/plugins/openstack/scenarios/nova/keypairs.py rename to rally_openstack/scenarios/nova/keypairs.py index f71244b6..72fd7eb0 100644 --- a/rally/plugins/openstack/scenarios/nova/keypairs.py +++ b/rally_openstack/scenarios/nova/keypairs.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/server_groups.py b/rally_openstack/scenarios/nova/server_groups.py similarity index 98% rename from rally/plugins/openstack/scenarios/nova/server_groups.py rename to rally_openstack/scenarios/nova/server_groups.py index 5f792ef6..0ad6d8f8 100755 --- a/rally/plugins/openstack/scenarios/nova/server_groups.py +++ b/rally_openstack/scenarios/nova/server_groups.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/servers.py b/rally_openstack/scenarios/nova/servers.py similarity index 99% rename from rally/plugins/openstack/scenarios/nova/servers.py rename to rally_openstack/scenarios/nova/servers.py index 91ed0646..dc09556c 100644 --- a/rally/plugins/openstack/scenarios/nova/servers.py +++ b/rally_openstack/scenarios/nova/servers.py @@ -18,11 +18,11 @@ import jsonschema from rally.common import logging from rally import consts from rally import exceptions as rally_exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils -from rally.plugins.openstack.scenarios.nova import utils -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack.scenarios.nova import utils +from rally_openstack.wrappers import network as network_wrapper from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/services.py b/rally_openstack/scenarios/nova/services.py similarity index 92% rename from rally/plugins/openstack/scenarios/nova/services.py rename to rally_openstack/scenarios/nova/services.py index 859afdee..29b21f63 100644 --- a/rally/plugins/openstack/scenarios/nova/services.py +++ b/rally_openstack/scenarios/nova/services.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack import scenario +from rally_openstack.scenarios.nova import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/nova/utils.py b/rally_openstack/scenarios/nova/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/nova/utils.py rename to rally_openstack/scenarios/nova/utils.py index 40bec27a..b2d74f26 100644 --- a/rally/plugins/openstack/scenarios/nova/utils.py +++ b/rally_openstack/scenarios/nova/utils.py @@ -17,9 +17,9 @@ from rally.common import cfg from rally.common import logging from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.services.image import image as image_service +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.services.image import image as image_service from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/nova/__init__.py b/rally_openstack/scenarios/quotas/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/nova/__init__.py rename to rally_openstack/scenarios/quotas/__init__.py diff --git a/rally/plugins/openstack/scenarios/quotas/quotas.py b/rally_openstack/scenarios/quotas/quotas.py similarity index 98% rename from rally/plugins/openstack/scenarios/quotas/quotas.py rename to rally_openstack/scenarios/quotas/quotas.py index 742eadc9..4b858bfd 100644 --- a/rally/plugins/openstack/scenarios/quotas/quotas.py +++ b/rally_openstack/scenarios/quotas/quotas.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.quotas import utils +from rally_openstack import scenario +from rally_openstack.scenarios.quotas import utils from rally.task import validation """Scenarios for quotas.""" diff --git a/rally/plugins/openstack/scenarios/quotas/utils.py b/rally_openstack/scenarios/quotas/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/quotas/utils.py rename to rally_openstack/scenarios/quotas/utils.py index 5c687bdf..f2d8f72b 100644 --- a/rally/plugins/openstack/scenarios/quotas/utils.py +++ b/rally_openstack/scenarios/quotas/utils.py @@ -15,7 +15,7 @@ import random -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic diff --git a/rally/plugins/openstack/scenarios/quotas/__init__.py b/rally_openstack/scenarios/sahara/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/quotas/__init__.py rename to rally_openstack/scenarios/sahara/__init__.py diff --git a/rally/plugins/openstack/scenarios/sahara/clusters.py b/rally_openstack/scenarios/sahara/clusters.py similarity index 99% rename from rally/plugins/openstack/scenarios/sahara/clusters.py rename to rally_openstack/scenarios/sahara/clusters.py index 08e8ba2e..9c90b78d 100644 --- a/rally/plugins/openstack/scenarios/sahara/clusters.py +++ b/rally_openstack/scenarios/sahara/clusters.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack import scenario +from rally_openstack.scenarios.sahara import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/sahara/consts.py b/rally_openstack/scenarios/sahara/consts.py similarity index 100% rename from rally/plugins/openstack/scenarios/sahara/consts.py rename to rally_openstack/scenarios/sahara/consts.py diff --git a/rally/plugins/openstack/scenarios/sahara/jobs.py b/rally_openstack/scenarios/sahara/jobs.py similarity index 98% rename from rally/plugins/openstack/scenarios/sahara/jobs.py rename to rally_openstack/scenarios/sahara/jobs.py index dc9d7dc6..1faac12d 100644 --- a/rally/plugins/openstack/scenarios/sahara/jobs.py +++ b/rally_openstack/scenarios/sahara/jobs.py @@ -15,8 +15,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack import scenario +from rally_openstack.scenarios.sahara import utils from rally.task import validation LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/scenarios/sahara/node_group_templates.py b/rally_openstack/scenarios/sahara/node_group_templates.py similarity index 97% rename from rally/plugins/openstack/scenarios/sahara/node_group_templates.py rename to rally_openstack/scenarios/sahara/node_group_templates.py index ceb3d6bc..ae8f9619 100644 --- a/rally/plugins/openstack/scenarios/sahara/node_group_templates.py +++ b/rally_openstack/scenarios/sahara/node_group_templates.py @@ -14,8 +14,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack import scenario +from rally_openstack.scenarios.sahara import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/sahara/utils.py b/rally_openstack/scenarios/sahara/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/sahara/utils.py rename to rally_openstack/scenarios/sahara/utils.py index 4ca8e408..0fa703d8 100644 --- a/rally/plugins/openstack/scenarios/sahara/utils.py +++ b/rally_openstack/scenarios/sahara/utils.py @@ -23,8 +23,8 @@ from rally.common import logging from rally.common import utils as rutils from rally import consts from rally import exceptions -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.sahara import consts as sahara_consts +from rally_openstack import scenario +from rally_openstack.scenarios.sahara import consts as sahara_consts from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/sahara/__init__.py b/rally_openstack/scenarios/senlin/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/sahara/__init__.py rename to rally_openstack/scenarios/senlin/__init__.py diff --git a/rally/plugins/openstack/scenarios/senlin/clusters.py b/rally_openstack/scenarios/senlin/clusters.py similarity index 95% rename from rally/plugins/openstack/scenarios/senlin/clusters.py rename to rally_openstack/scenarios/senlin/clusters.py index 8fb5daa6..5f074772 100644 --- a/rally/plugins/openstack/scenarios/senlin/clusters.py +++ b/rally_openstack/scenarios/senlin/clusters.py @@ -11,8 +11,8 @@ # under the License. from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.senlin import utils +from rally_openstack import scenario +from rally_openstack.scenarios.senlin import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/senlin/utils.py b/rally_openstack/scenarios/senlin/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/senlin/utils.py rename to rally_openstack/scenarios/senlin/utils.py index fd905fbe..b452f388 100644 --- a/rally/plugins/openstack/scenarios/senlin/utils.py +++ b/rally_openstack/scenarios/senlin/utils.py @@ -12,7 +12,7 @@ from rally.common import cfg from rally import exceptions -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/senlin/__init__.py b/rally_openstack/scenarios/swift/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/senlin/__init__.py rename to rally_openstack/scenarios/swift/__init__.py diff --git a/rally/plugins/openstack/scenarios/swift/objects.py b/rally_openstack/scenarios/swift/objects.py similarity index 98% rename from rally/plugins/openstack/scenarios/swift/objects.py rename to rally_openstack/scenarios/swift/objects.py index c48d4cb6..27dea127 100644 --- a/rally/plugins/openstack/scenarios/swift/objects.py +++ b/rally_openstack/scenarios/swift/objects.py @@ -16,8 +16,8 @@ import tempfile from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.swift import utils +from rally_openstack import scenario +from rally_openstack.scenarios.swift import utils from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/swift/utils.py b/rally_openstack/scenarios/swift/utils.py similarity index 99% rename from rally/plugins/openstack/scenarios/swift/utils.py rename to rally_openstack/scenarios/swift/utils.py index 536e4564..9eaca1b8 100644 --- a/rally/plugins/openstack/scenarios/swift/utils.py +++ b/rally_openstack/scenarios/swift/utils.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic diff --git a/rally/plugins/openstack/scenarios/swift/__init__.py b/rally_openstack/scenarios/vm/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/swift/__init__.py rename to rally_openstack/scenarios/vm/__init__.py diff --git a/rally/plugins/openstack/scenarios/vm/utils.py b/rally_openstack/scenarios/vm/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/vm/utils.py rename to rally_openstack/scenarios/vm/utils.py index 536bc0ee..04838e46 100644 --- a/rally/plugins/openstack/scenarios/vm/utils.py +++ b/rally_openstack/scenarios/vm/utils.py @@ -23,8 +23,8 @@ import six from rally.common import cfg from rally.common import logging from rally.common import sshutils -from rally.plugins.openstack.scenarios.nova import utils as nova_utils -from rally.plugins.openstack.wrappers import network as network_wrapper +from rally_openstack.scenarios.nova import utils as nova_utils +from rally_openstack.wrappers import network as network_wrapper from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/vm/vmtasks.py b/rally_openstack/scenarios/vm/vmtasks.py similarity index 98% rename from rally/plugins/openstack/scenarios/vm/vmtasks.py rename to rally_openstack/scenarios/vm/vmtasks.py index 823e1b92..05110c3a 100644 --- a/rally/plugins/openstack/scenarios/vm/vmtasks.py +++ b/rally_openstack/scenarios/vm/vmtasks.py @@ -23,10 +23,10 @@ from rally.common import validation from rally import consts from rally import exceptions from rally.plugins.common import validators -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils -from rally.plugins.openstack.scenarios.vm import utils as vm_utils -from rally.plugins.openstack.services import heat +from rally_openstack import scenario +from rally_openstack.scenarios.cinder import utils as cinder_utils +from rally_openstack.scenarios.vm import utils as vm_utils +from rally_openstack.services import heat from rally.task import atomic from rally.task import types diff --git a/rally/plugins/openstack/scenarios/vm/__init__.py b/rally_openstack/scenarios/watcher/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/vm/__init__.py rename to rally_openstack/scenarios/watcher/__init__.py diff --git a/rally/plugins/openstack/scenarios/watcher/basic.py b/rally_openstack/scenarios/watcher/basic.py similarity index 97% rename from rally/plugins/openstack/scenarios/watcher/basic.py rename to rally_openstack/scenarios/watcher/basic.py index 20819964..2991530b 100644 --- a/rally/plugins/openstack/scenarios/watcher/basic.py +++ b/rally_openstack/scenarios/watcher/basic.py @@ -12,8 +12,8 @@ from rally.common import logging from rally import consts -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.watcher import utils +from rally_openstack import scenario +from rally_openstack.scenarios.watcher import utils from rally.task import types from rally.task import validation diff --git a/rally/plugins/openstack/scenarios/watcher/utils.py b/rally_openstack/scenarios/watcher/utils.py similarity index 98% rename from rally/plugins/openstack/scenarios/watcher/utils.py rename to rally_openstack/scenarios/watcher/utils.py index ce29d3e7..0e626d73 100644 --- a/rally/plugins/openstack/scenarios/watcher/utils.py +++ b/rally_openstack/scenarios/watcher/utils.py @@ -11,7 +11,7 @@ # under the License. from rally.common import cfg -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/scenarios/watcher/__init__.py b/rally_openstack/scenarios/zaqar/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/watcher/__init__.py rename to rally_openstack/scenarios/zaqar/__init__.py diff --git a/rally/plugins/openstack/scenarios/zaqar/basic.py b/rally_openstack/scenarios/zaqar/basic.py similarity index 95% rename from rally/plugins/openstack/scenarios/zaqar/basic.py rename to rally_openstack/scenarios/zaqar/basic.py index 4e6ae291..728d719f 100644 --- a/rally/plugins/openstack/scenarios/zaqar/basic.py +++ b/rally_openstack/scenarios/zaqar/basic.py @@ -15,8 +15,8 @@ import random from rally.common import logging -from rally.plugins.openstack import scenario -from rally.plugins.openstack.scenarios.zaqar import utils as zutils +from rally_openstack import scenario +from rally_openstack.scenarios.zaqar import utils as zutils """Scenarios for Zaqar.""" diff --git a/rally/plugins/openstack/scenarios/zaqar/utils.py b/rally_openstack/scenarios/zaqar/utils.py similarity index 97% rename from rally/plugins/openstack/scenarios/zaqar/utils.py rename to rally_openstack/scenarios/zaqar/utils.py index eb680239..715d2d05 100644 --- a/rally/plugins/openstack/scenarios/zaqar/utils.py +++ b/rally_openstack/scenarios/zaqar/utils.py @@ -12,7 +12,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack import scenario +from rally_openstack import scenario from rally.task import atomic diff --git a/rally/plugins/openstack/service.py b/rally_openstack/service.py similarity index 100% rename from rally/plugins/openstack/service.py rename to rally_openstack/service.py diff --git a/rally/plugins/openstack/scenarios/zaqar/__init__.py b/rally_openstack/services/__init__.py similarity index 100% rename from rally/plugins/openstack/scenarios/zaqar/__init__.py rename to rally_openstack/services/__init__.py diff --git a/rally/plugins/openstack/services/__init__.py b/rally_openstack/services/gnocchi/__init__.py similarity index 100% rename from rally/plugins/openstack/services/__init__.py rename to rally_openstack/services/gnocchi/__init__.py diff --git a/rally/plugins/openstack/services/gnocchi/metric.py b/rally_openstack/services/gnocchi/metric.py similarity index 100% rename from rally/plugins/openstack/services/gnocchi/metric.py rename to rally_openstack/services/gnocchi/metric.py diff --git a/rally/plugins/openstack/services/gnocchi/__init__.py b/rally_openstack/services/heat/__init__.py similarity index 100% rename from rally/plugins/openstack/services/gnocchi/__init__.py rename to rally_openstack/services/heat/__init__.py diff --git a/rally/plugins/openstack/services/heat/main.py b/rally_openstack/services/heat/main.py similarity index 100% rename from rally/plugins/openstack/services/heat/main.py rename to rally_openstack/services/heat/main.py diff --git a/rally/plugins/openstack/services/heat/__init__.py b/rally_openstack/services/identity/__init__.py similarity index 100% rename from rally/plugins/openstack/services/heat/__init__.py rename to rally_openstack/services/identity/__init__.py diff --git a/rally/plugins/openstack/services/identity/identity.py b/rally_openstack/services/identity/identity.py similarity index 100% rename from rally/plugins/openstack/services/identity/identity.py rename to rally_openstack/services/identity/identity.py diff --git a/rally/plugins/openstack/services/identity/keystone_common.py b/rally_openstack/services/identity/keystone_common.py similarity index 98% rename from rally/plugins/openstack/services/identity/keystone_common.py rename to rally_openstack/services/identity/keystone_common.py index 2c2b2e9c..113a0421 100644 --- a/rally/plugins/openstack/services/identity/keystone_common.py +++ b/rally_openstack/services/identity/keystone_common.py @@ -12,8 +12,8 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack import osclients -from rally.plugins.openstack.services.identity import identity +from rally_openstack import osclients +from rally_openstack.services.identity import identity from rally.task import atomic diff --git a/rally/plugins/openstack/services/identity/keystone_v2.py b/rally_openstack/services/identity/keystone_v2.py similarity index 98% rename from rally/plugins/openstack/services/identity/keystone_v2.py rename to rally_openstack/services/identity/keystone_v2.py index 6212560e..ef649c0a 100644 --- a/rally/plugins/openstack/services/identity/keystone_v2.py +++ b/rally_openstack/services/identity/keystone_v2.py @@ -14,9 +14,9 @@ import uuid -from rally.plugins.openstack import service -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.identity import keystone_common +from rally_openstack import service +from rally_openstack.services.identity import identity +from rally_openstack.services.identity import keystone_common from rally.task import atomic diff --git a/rally/plugins/openstack/services/identity/keystone_v3.py b/rally_openstack/services/identity/keystone_v3.py similarity index 98% rename from rally/plugins/openstack/services/identity/keystone_v3.py rename to rally_openstack/services/identity/keystone_v3.py index e2bce658..434ed232 100644 --- a/rally/plugins/openstack/services/identity/keystone_v3.py +++ b/rally_openstack/services/identity/keystone_v3.py @@ -14,9 +14,9 @@ from rally.common import logging from rally import exceptions -from rally.plugins.openstack import service -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.identity import keystone_common +from rally_openstack import service +from rally_openstack.services.identity import identity +from rally_openstack.services.identity import keystone_common from rally.task import atomic diff --git a/rally/plugins/openstack/services/identity/__init__.py b/rally_openstack/services/image/__init__.py similarity index 100% rename from rally/plugins/openstack/services/identity/__init__.py rename to rally_openstack/services/image/__init__.py diff --git a/rally/plugins/openstack/services/image/glance_common.py b/rally_openstack/services/image/glance_common.py similarity index 97% rename from rally/plugins/openstack/services/image/glance_common.py rename to rally_openstack/services/image/glance_common.py index c41ca63f..14406a3d 100644 --- a/rally/plugins/openstack/services/image/glance_common.py +++ b/rally_openstack/services/image/glance_common.py @@ -15,7 +15,7 @@ from glanceclient import exc as glance_exc from rally import exceptions -from rally.plugins.openstack.services.image import image as image_service +from rally_openstack.services.image import image as image_service from rally.task import atomic diff --git a/rally/plugins/openstack/services/image/glance_v1.py b/rally_openstack/services/image/glance_v1.py similarity index 97% rename from rally/plugins/openstack/services/image/glance_v1.py rename to rally_openstack/services/image/glance_v1.py index a7f979ed..26a627ca 100644 --- a/rally/plugins/openstack/services/image/glance_v1.py +++ b/rally_openstack/services/image/glance_v1.py @@ -16,9 +16,9 @@ import os from rally.common import cfg from rally.common import utils as rutils -from rally.plugins.openstack import service -from rally.plugins.openstack.services.image import glance_common -from rally.plugins.openstack.services.image import image +from rally_openstack import service +from rally_openstack.services.image import glance_common +from rally_openstack.services.image import image from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/services/image/glance_v2.py b/rally_openstack/services/image/glance_v2.py similarity index 98% rename from rally/plugins/openstack/services/image/glance_v2.py rename to rally_openstack/services/image/glance_v2.py index 575e2c36..bc7e644d 100644 --- a/rally/plugins/openstack/services/image/glance_v2.py +++ b/rally_openstack/services/image/glance_v2.py @@ -19,9 +19,9 @@ import requests from rally.common import cfg from rally.common import utils as rutils -from rally.plugins.openstack import service -from rally.plugins.openstack.services.image import glance_common -from rally.plugins.openstack.services.image import image +from rally_openstack import service +from rally_openstack.services.image import glance_common +from rally_openstack.services.image import image from rally.task import atomic from rally.task import utils diff --git a/rally/plugins/openstack/services/image/image.py b/rally_openstack/services/image/image.py similarity index 100% rename from rally/plugins/openstack/services/image/image.py rename to rally_openstack/services/image/image.py diff --git a/rally/plugins/openstack/services/image/__init__.py b/rally_openstack/services/storage/__init__.py similarity index 100% rename from rally/plugins/openstack/services/image/__init__.py rename to rally_openstack/services/storage/__init__.py diff --git a/rally/plugins/openstack/services/storage/block.py b/rally_openstack/services/storage/block.py similarity index 100% rename from rally/plugins/openstack/services/storage/block.py rename to rally_openstack/services/storage/block.py diff --git a/rally/plugins/openstack/services/storage/cinder_common.py b/rally_openstack/services/storage/cinder_common.py similarity index 99% rename from rally/plugins/openstack/services/storage/cinder_common.py rename to rally_openstack/services/storage/cinder_common.py index 05273fa1..86265c07 100644 --- a/rally/plugins/openstack/services/storage/cinder_common.py +++ b/rally_openstack/services/storage/cinder_common.py @@ -15,8 +15,8 @@ import random from rally import exceptions -from rally.plugins.openstack.services.image import image -from rally.plugins.openstack.services.storage import block +from rally_openstack.services.image import image +from rally_openstack.services.storage import block from rally.task import atomic from rally.task import utils as bench_utils diff --git a/rally/plugins/openstack/services/storage/cinder_v1.py b/rally_openstack/services/storage/cinder_v1.py similarity index 98% rename from rally/plugins/openstack/services/storage/cinder_v1.py rename to rally_openstack/services/storage/cinder_v1.py index d97fa6b1..7f7b9f4d 100644 --- a/rally/plugins/openstack/services/storage/cinder_v1.py +++ b/rally_openstack/services/storage/cinder_v1.py @@ -15,9 +15,9 @@ import random from rally.common import utils as rutils -from rally.plugins.openstack import service -from rally.plugins.openstack.services.storage import block -from rally.plugins.openstack.services.storage import cinder_common +from rally_openstack import service +from rally_openstack.services.storage import block +from rally_openstack.services.storage import cinder_common from rally.task import atomic CONF = block.CONF diff --git a/rally/plugins/openstack/services/storage/cinder_v2.py b/rally_openstack/services/storage/cinder_v2.py similarity index 98% rename from rally/plugins/openstack/services/storage/cinder_v2.py rename to rally_openstack/services/storage/cinder_v2.py index f5a55052..3ccef8d8 100644 --- a/rally/plugins/openstack/services/storage/cinder_v2.py +++ b/rally_openstack/services/storage/cinder_v2.py @@ -15,9 +15,9 @@ import random from rally.common import utils as rutils -from rally.plugins.openstack import service -from rally.plugins.openstack.services.storage import block -from rally.plugins.openstack.services.storage import cinder_common +from rally_openstack import service +from rally_openstack.services.storage import block +from rally_openstack.services.storage import cinder_common from rally.task import atomic CONF = block.CONF diff --git a/rally/plugins/openstack/types.py b/rally_openstack/types.py similarity index 99% rename from rally/plugins/openstack/types.py rename to rally_openstack/types.py index 35e598dc..f8395528 100644 --- a/rally/plugins/openstack/types.py +++ b/rally_openstack/types.py @@ -16,7 +16,7 @@ import copy from rally.common.plugin import plugin from rally import exceptions -from rally.plugins.openstack.services.image import image +from rally_openstack.services.image import image from rally.task import types diff --git a/rally/plugins/openstack/validators.py b/rally_openstack/validators.py similarity index 99% rename from rally/plugins/openstack/validators.py rename to rally_openstack/validators.py index 41d9217a..b0c50464 100644 --- a/rally/plugins/openstack/validators.py +++ b/rally_openstack/validators.py @@ -28,9 +28,9 @@ from rally.common import yamlutils as yaml from rally import consts from rally import exceptions from rally.plugins.common import validators -from rally.plugins.openstack.context.keystone import roles -from rally.plugins.openstack.context.nova import flavors as flavors_ctx -from rally.plugins.openstack import types as openstack_types +from rally_openstack.contexts.keystone import roles +from rally_openstack.contexts.nova import flavors as flavors_ctx +from rally_openstack import types as openstack_types LOG = logging.getLogger(__name__) diff --git a/rally/plugins/openstack/services/storage/__init__.py b/rally_openstack/verification/__init__.py similarity index 100% rename from rally/plugins/openstack/services/storage/__init__.py rename to rally_openstack/verification/__init__.py diff --git a/rally/plugins/openstack/verification/__init__.py b/rally_openstack/verification/tempest/__init__.py similarity index 100% rename from rally/plugins/openstack/verification/__init__.py rename to rally_openstack/verification/tempest/__init__.py diff --git a/rally/plugins/openstack/verification/tempest/config.ini b/rally_openstack/verification/tempest/config.ini similarity index 100% rename from rally/plugins/openstack/verification/tempest/config.ini rename to rally_openstack/verification/tempest/config.ini diff --git a/rally/plugins/openstack/verification/tempest/config.py b/rally_openstack/verification/tempest/config.py similarity index 100% rename from rally/plugins/openstack/verification/tempest/config.py rename to rally_openstack/verification/tempest/config.py diff --git a/rally/plugins/openstack/verification/tempest/consts.py b/rally_openstack/verification/tempest/consts.py similarity index 100% rename from rally/plugins/openstack/verification/tempest/consts.py rename to rally_openstack/verification/tempest/consts.py diff --git a/rally/plugins/openstack/verification/tempest/context.py b/rally_openstack/verification/tempest/context.py similarity index 98% rename from rally/plugins/openstack/verification/tempest/context.py rename to rally_openstack/verification/tempest/context.py index 755a3240..199ed09c 100644 --- a/rally/plugins/openstack/verification/tempest/context.py +++ b/rally_openstack/verification/tempest/context.py @@ -21,9 +21,9 @@ from six.moves import configparser from rally.common import logging from rally import exceptions -from rally.plugins.openstack.services.image import image -from rally.plugins.openstack.verification.tempest import config as conf -from rally.plugins.openstack.wrappers import network +from rally_openstack.services.image import image +from rally_openstack.verification.tempest import config as conf +from rally_openstack.wrappers import network from rally.task import utils as task_utils from rally.verification import context from rally.verification import utils diff --git a/rally/plugins/openstack/verification/tempest/manager.py b/rally_openstack/verification/tempest/manager.py similarity index 98% rename from rally/plugins/openstack/verification/tempest/manager.py rename to rally_openstack/verification/tempest/manager.py index 8e9df5c2..dbf97970 100644 --- a/rally/plugins/openstack/verification/tempest/manager.py +++ b/rally_openstack/verification/tempest/manager.py @@ -20,8 +20,8 @@ import subprocess from rally.common import yamlutils as yaml from rally import exceptions from rally.plugins.common.verification import testr -from rally.plugins.openstack.verification.tempest import config -from rally.plugins.openstack.verification.tempest import consts +from rally_openstack.verification.tempest import config +from rally_openstack.verification.tempest import consts from rally.verification import manager from rally.verification import utils diff --git a/rally/plugins/openstack/verification/tempest/__init__.py b/rally_openstack/workload/__init__.py similarity index 100% rename from rally/plugins/openstack/verification/tempest/__init__.py rename to rally_openstack/workload/__init__.py diff --git a/rally/plugins/workload/siege.py b/rally_openstack/workload/siege.py similarity index 100% rename from rally/plugins/workload/siege.py rename to rally_openstack/workload/siege.py diff --git a/rally/plugins/openstack/wrappers/__init__.py b/rally_openstack/wrappers/__init__.py similarity index 100% rename from rally/plugins/openstack/wrappers/__init__.py rename to rally_openstack/wrappers/__init__.py diff --git a/rally/plugins/openstack/wrappers/cinder.py b/rally_openstack/wrappers/cinder.py similarity index 100% rename from rally/plugins/openstack/wrappers/cinder.py rename to rally_openstack/wrappers/cinder.py diff --git a/rally/plugins/openstack/wrappers/glance.py b/rally_openstack/wrappers/glance.py similarity index 100% rename from rally/plugins/openstack/wrappers/glance.py rename to rally_openstack/wrappers/glance.py diff --git a/rally/plugins/openstack/wrappers/keystone.py b/rally_openstack/wrappers/keystone.py similarity index 100% rename from rally/plugins/openstack/wrappers/keystone.py rename to rally_openstack/wrappers/keystone.py diff --git a/rally/plugins/openstack/wrappers/network.py b/rally_openstack/wrappers/network.py similarity index 100% rename from rally/plugins/openstack/wrappers/network.py rename to rally_openstack/wrappers/network.py diff --git a/requirements.txt b/requirements.txt index c555570d..decb9b58 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,27 +2,7 @@ # of appearance. Changing the order has an impact on the overall integration # process, which may cause wedges in the gate later. -# Rally core dependencies -alembic>=0.8.10 # MIT -decorator>=3.4.0 # new BSD License -Jinja2>=2.8,!=2.9.0,!=2.9.1,!=2.9.2,!=2.9.3,!=2.9.4 # BSD -jsonschema>=2.6.0,<3.0.0 # MIT -morph # GPLv3+ -netaddr>=0.7.18 # BSD -oslo.config>=5.1.0 # Apache Software License -oslo.db>=4.27.0 # Apache Software License -oslo.log>=3.36.0 # Apache Software License -oslo.utils>=3.33.0 # Apache Software License -paramiko>=2.0.0 # LGPL -pbr>=2.0.0,!=2.1.0 # Apache Software License -PrettyTable>=0.7.1,<0.8 # BSD -pyOpenSSL>=16.2.0 # Apache License, Version 2.0 -PyYAML>=3.10 # MIT -python-subunit>=1.0.0 # UNKNOWN -requests>=2.14.2 # Apache License, Version 2.0 -SQLAlchemy>=1.0.10,!=1.1.5,!=1.1.6,!=1.1.7,!=1.1.8 # MIT -six>=1.10.0 # MIT -virtualenv>=14.0.6 # MIT +rally>=0.11.0 # OpenStack related boto>=2.32.1 # MIT diff --git a/setup.cfg b/setup.cfg index a5dff1f7..c8804c0f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = rally -summary = Generic Testing Framework & Tool that unifies all types of testing. +name = rally-openstack +summary = Rally plugins for OpenStack platform description-file = README.rst author = OpenStack @@ -22,25 +22,20 @@ classifier = [files] packages = - rally + rally_openstack data_files = etc/bash_completion.d = etc/rally.bash_completion -[entry_points] -console_scripts = - rally = rally.cli.main:main - rally-manage = rally.cli.manage:main -oslo.config.opts = - rally = rally.common.opts:list_opts -oslo.config.opts.defaults = - rally = rally.common.opts:update_opt_defaults - [global] setup-hooks = pbr.hooks.setup_hook +[entry_points] +rally_plugins = + path = rally_openstack + [extras] mysql = PyMySQL>=0.7.6 # MIT diff --git a/rally/plugins/workload/__init__.py b/tests/unit/cleanup/__init__.py similarity index 100% rename from rally/plugins/workload/__init__.py rename to tests/unit/cleanup/__init__.py diff --git a/tests/unit/plugins/openstack/cleanup/test_base.py b/tests/unit/cleanup/test_base.py similarity index 97% rename from tests/unit/plugins/openstack/cleanup/test_base.py rename to tests/unit/cleanup/test_base.py index aa451f46..d629dee9 100644 --- a/tests/unit/plugins/openstack/cleanup/test_base.py +++ b/tests/unit/cleanup/test_base.py @@ -15,11 +15,11 @@ import mock -from rally.plugins.openstack.cleanup import base +from rally_openstack.cleanup import base from tests.unit import test -BASE = "rally.plugins.openstack.cleanup.base" +BASE = "rally_openstack.cleanup.base" class ResourceDecoratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/cleanup/test_manager.py b/tests/unit/cleanup/test_manager.py similarity index 99% rename from tests/unit/plugins/openstack/cleanup/test_manager.py rename to tests/unit/cleanup/test_manager.py index bcff7209..d30e4e55 100644 --- a/tests/unit/plugins/openstack/cleanup/test_manager.py +++ b/tests/unit/cleanup/test_manager.py @@ -16,12 +16,12 @@ import mock from rally.common import utils -from rally.plugins.openstack.cleanup import base -from rally.plugins.openstack.cleanup import manager +from rally_openstack.cleanup import base +from rally_openstack.cleanup import manager from tests.unit import test -BASE = "rally.plugins.openstack.cleanup.manager" +BASE = "rally_openstack.cleanup.manager" class SeekAndDestroyTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/cleanup/test_resources.py b/tests/unit/cleanup/test_resources.py similarity index 98% rename from tests/unit/plugins/openstack/cleanup/test_resources.py rename to tests/unit/cleanup/test_resources.py index 5fde041f..b6b08f3b 100644 --- a/tests/unit/plugins/openstack/cleanup/test_resources.py +++ b/tests/unit/cleanup/test_resources.py @@ -22,11 +22,11 @@ from neutronclient.common import exceptions as neutron_exceptions from novaclient import exceptions as nova_exc from watcherclient.common.apiclient import exceptions as watcher_exceptions -from rally.plugins.openstack.cleanup import resources +from rally_openstack.cleanup import resources from tests.unit import test -BASE = "rally.plugins.openstack.cleanup.resources" -GLANCE_V2_PATH = ("rally.plugins.openstack.services.image.glance_v2." +BASE = "rally_openstack.cleanup.resources" +GLANCE_V2_PATH = ("rally_openstack.services.image.glance_v2." "GlanceV2Service") @@ -588,7 +588,7 @@ class NeutronQuotaTestCase(test.TestCase): @ddt.ddt class GlanceImageTestCase(test.TestCase): - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__client_admin(self, mock_image): admin = mock.Mock() glance = resources.GlanceImage(admin=admin) @@ -597,7 +597,7 @@ class GlanceImageTestCase(test.TestCase): mock_image.assert_called_once_with(admin) self.assertEqual(client, mock_image.return_value) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__client_user(self, mock_image): user = mock.Mock() glance = resources.GlanceImage(user=user) @@ -606,7 +606,7 @@ class GlanceImageTestCase(test.TestCase): mock_image.assert_called_once_with(user) self.assertEqual(wrapper, mock_image.return_value) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__client_admin_preferred(self, mock_image): admin = mock.Mock() user = mock.Mock() @@ -1065,7 +1065,7 @@ class CinderImageVolumeCacheTestCase(test.TestCase): self.id = id self.name = name - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test_list(self, mock_image): admin = mock.Mock() diff --git a/tests/unit/plugins/__init__.py b/tests/unit/contexts/__init__.py similarity index 100% rename from tests/unit/plugins/__init__.py rename to tests/unit/contexts/__init__.py diff --git a/tests/unit/plugins/openstack/__init__.py b/tests/unit/contexts/ceilometer/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/__init__.py rename to tests/unit/contexts/ceilometer/__init__.py diff --git a/tests/unit/plugins/openstack/context/ceilometer/test_samples.py b/tests/unit/contexts/ceilometer/test_samples.py similarity index 96% rename from tests/unit/plugins/openstack/context/ceilometer/test_samples.py rename to tests/unit/contexts/ceilometer/test_samples.py index 23ff6ae8..a324b5e2 100644 --- a/tests/unit/plugins/openstack/context/ceilometer/test_samples.py +++ b/tests/unit/contexts/ceilometer/test_samples.py @@ -18,11 +18,11 @@ import mock import six from rally import exceptions -from rally.plugins.openstack.context.ceilometer import samples -from rally.plugins.openstack.scenarios.ceilometer import utils as ceilo_utils +from rally_openstack.contexts.ceilometer import samples +from rally_openstack.scenarios.ceilometer import utils as ceilo_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.ceilometer" +CTX = "rally_openstack.contexts.ceilometer" class CeilometerSampleGeneratorTestCase(test.TestCase): @@ -123,7 +123,7 @@ class CeilometerSampleGeneratorTestCase(test.TestCase): @mock.patch("%s.samples.ceilo_utils.CeilometerScenario._create_samples" % CTX) @mock.patch( - "rally.plugins.openstack.scenarios.ceilometer.utils.uuid") + "rally_openstack.scenarios.ceilometer.utils.uuid") def test_setup(self, mock_uuid, mock_create_samples, mock_get_resource): mock_uuid.uuid4.return_value = "fake_resource-id" tenants_count = 2 diff --git a/tests/unit/plugins/openstack/cleanup/__init__.py b/tests/unit/contexts/cinder/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/cleanup/__init__.py rename to tests/unit/contexts/cinder/__init__.py diff --git a/tests/unit/plugins/openstack/context/cinder/test_volume_types.py b/tests/unit/contexts/cinder/test_volume_types.py similarity index 93% rename from tests/unit/plugins/openstack/context/cinder/test_volume_types.py rename to tests/unit/contexts/cinder/test_volume_types.py index 7ec1ba29..faec0f3a 100644 --- a/tests/unit/plugins/openstack/context/cinder/test_volume_types.py +++ b/tests/unit/contexts/cinder/test_volume_types.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.context.cinder import volume_types +from rally_openstack.contexts.cinder import volume_types from tests.unit import test -CTX = "rally.plugins.openstack.context.cinder.volume_types" -SERVICE = "rally.plugins.openstack.services.storage" +CTX = "rally_openstack.contexts.cinder.volume_types" +SERVICE = "rally_openstack.services.storage" class VolumeTypeGeneratorTestCase(test.ContextTestCase): diff --git a/tests/unit/plugins/openstack/context/cinder/test_volumes.py b/tests/unit/contexts/cinder/test_volumes.py similarity index 96% rename from tests/unit/plugins/openstack/context/cinder/test_volumes.py rename to tests/unit/contexts/cinder/test_volumes.py index 4bcd3284..ed359e01 100644 --- a/tests/unit/plugins/openstack/context/cinder/test_volumes.py +++ b/tests/unit/contexts/cinder/test_volumes.py @@ -17,12 +17,12 @@ import copy import ddt import mock -from rally.plugins.openstack.context.cinder import volumes +from rally_openstack.contexts.cinder import volumes from rally.task import context from tests.unit import test -CTX = "rally.plugins.openstack.context" -SERVICE = "rally.plugins.openstack.services.storage" +CTX = "rally_openstack.contexts" +SERVICE = "rally_openstack.services.storage" @ddt.ddt @@ -60,7 +60,7 @@ class VolumeGeneratorTestCase(test.ScenarioTestCase): else: self.assertEqual(1, len(results)) - from rally.plugins.openstack.services.storage import block + from rally_openstack.services.storage import block created_volume = block.Volume(id="uuid", size=config["size"], name="vol", status="avaiable") diff --git a/tests/unit/plugins/openstack/context/__init__.py b/tests/unit/contexts/cleanup/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/__init__.py rename to tests/unit/contexts/cleanup/__init__.py diff --git a/tests/unit/plugins/openstack/context/cleanup/test_admin.py b/tests/unit/contexts/cleanup/test_admin.py similarity index 95% rename from tests/unit/plugins/openstack/context/cleanup/test_admin.py rename to tests/unit/contexts/cleanup/test_admin.py index 692662ce..6332d2b8 100644 --- a/tests/unit/plugins/openstack/context/cleanup/test_admin.py +++ b/tests/unit/contexts/cleanup/test_admin.py @@ -17,14 +17,14 @@ import ddt import mock from rally.common import utils -from rally.plugins.openstack.context.cleanup import admin -from rally.plugins.openstack import scenario +from rally_openstack.contexts.cleanup import admin +from rally_openstack import scenario from rally.task import context from tests.unit import test -ADMIN = "rally.plugins.openstack.context.cleanup.admin" -BASE = "rally.plugins.openstack.context.cleanup.base" +ADMIN = "rally_openstack.contexts.cleanup.admin" +BASE = "rally_openstack.contexts.cleanup.base" @ddt.ddt diff --git a/tests/unit/plugins/openstack/context/cleanup/test_user.py b/tests/unit/contexts/cleanup/test_user.py similarity index 95% rename from tests/unit/plugins/openstack/context/cleanup/test_user.py rename to tests/unit/contexts/cleanup/test_user.py index 95baf3e7..cddb285d 100644 --- a/tests/unit/plugins/openstack/context/cleanup/test_user.py +++ b/tests/unit/contexts/cleanup/test_user.py @@ -17,14 +17,14 @@ import ddt import mock from rally.common import utils -from rally.plugins.openstack.context.cleanup import user -from rally.plugins.openstack import scenario +from rally_openstack.contexts.cleanup import user +from rally_openstack import scenario from rally.task import context from tests.unit import test -ADMIN = "rally.plugins.openstack.context.cleanup.admin" -BASE = "rally.plugins.openstack.context.cleanup.base" +ADMIN = "rally_openstack.contexts.cleanup.admin" +BASE = "rally_openstack.contexts.cleanup.base" @ddt.ddt diff --git a/tests/unit/plugins/openstack/context/ceilometer/__init__.py b/tests/unit/contexts/dataplane/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/ceilometer/__init__.py rename to tests/unit/contexts/dataplane/__init__.py diff --git a/tests/unit/plugins/openstack/context/dataplane/test_heat.py b/tests/unit/contexts/dataplane/test_heat.py similarity index 97% rename from tests/unit/plugins/openstack/context/dataplane/test_heat.py rename to tests/unit/contexts/dataplane/test_heat.py index 9a549a2e..dee4d5bf 100644 --- a/tests/unit/plugins/openstack/context/dataplane/test_heat.py +++ b/tests/unit/contexts/dataplane/test_heat.py @@ -17,10 +17,10 @@ import functools import mock -from rally.plugins.openstack.context import dataplane +from rally_openstack.contexts import dataplane from tests.unit import test -MOD = "rally.plugins.openstack.context.dataplane.heat." +MOD = "rally_openstack.contexts.dataplane.heat." class TestHeatWorkload(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/cinder/__init__.py b/tests/unit/contexts/designate/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/cinder/__init__.py rename to tests/unit/contexts/designate/__init__.py diff --git a/tests/unit/plugins/openstack/context/designate/test_zones.py b/tests/unit/contexts/designate/test_zones.py similarity index 95% rename from tests/unit/plugins/openstack/context/designate/test_zones.py rename to tests/unit/contexts/designate/test_zones.py index 76b2b218..e18c9da6 100644 --- a/tests/unit/plugins/openstack/context/designate/test_zones.py +++ b/tests/unit/contexts/designate/test_zones.py @@ -17,12 +17,12 @@ import copy import mock -from rally.plugins.openstack.context.designate import zones -from rally.plugins.openstack.scenarios.designate import utils +from rally_openstack.contexts.designate import zones +from rally_openstack.scenarios.designate import utils from tests.unit import test -CTX = "rally.plugins.openstack.context" -SCN = "rally.plugins.openstack.scenarios" +CTX = "rally_openstack.contexts" +SCN = "rally_openstack.scenarios" class ZoneGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/cleanup/__init__.py b/tests/unit/contexts/ec2/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/cleanup/__init__.py rename to tests/unit/contexts/ec2/__init__.py diff --git a/tests/unit/plugins/openstack/context/ec2/test_servers.py b/tests/unit/contexts/ec2/test_servers.py similarity index 94% rename from tests/unit/plugins/openstack/context/ec2/test_servers.py rename to tests/unit/contexts/ec2/test_servers.py index 0ed471df..95e151b0 100644 --- a/tests/unit/plugins/openstack/context/ec2/test_servers.py +++ b/tests/unit/contexts/ec2/test_servers.py @@ -16,14 +16,14 @@ import copy import mock -from rally.plugins.openstack.context.ec2 import servers -from rally.plugins.openstack.scenarios.ec2 import utils as ec2_utils +from rally_openstack.contexts.ec2 import servers +from rally_openstack.scenarios.ec2 import utils as ec2_utils from tests.unit import fakes from tests.unit import test -CTX = "rally.plugins.openstack.context.ec2" -SCN = "rally.plugins.openstack.scenarios" -TYP = "rally.plugins.openstack.types" +CTX = "rally_openstack.contexts.ec2" +SCN = "rally_openstack.scenarios" +TYP = "rally_openstack.types" class EC2ServerGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/dataplane/__init__.py b/tests/unit/contexts/glance/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/dataplane/__init__.py rename to tests/unit/contexts/glance/__init__.py diff --git a/tests/unit/plugins/openstack/context/glance/test_images.py b/tests/unit/contexts/glance/test_images.py similarity index 97% rename from tests/unit/plugins/openstack/context/glance/test_images.py rename to tests/unit/contexts/glance/test_images.py index 1fc0af92..44d4ef88 100644 --- a/tests/unit/plugins/openstack/context/glance/test_images.py +++ b/tests/unit/contexts/glance/test_images.py @@ -18,11 +18,11 @@ import copy import ddt import mock -from rally.plugins.openstack.context.glance import images +from rally_openstack.contexts.glance import images from tests.unit import test -CTX = "rally.plugins.openstack.context.glance.images" -SCN = "rally.plugins.openstack.scenarios.glance" +CTX = "rally_openstack.contexts.glance.images" +SCN = "rally_openstack.scenarios.glance" @ddt.ddt @@ -48,7 +48,7 @@ class ImageGeneratorTestCase(test.ScenarioTestCase): "task": {"uuid": "task_id"} }) patch = mock.patch( - "rally.plugins.openstack.services.image.image.Image") + "rally_openstack.services.image.image.Image") self.addCleanup(patch.stop) self.mock_image = patch.start() @@ -65,7 +65,7 @@ class ImageGeneratorTestCase(test.ScenarioTestCase): {"tenants": 3, "users_per_tenant": 2, "images_per_tenant": 5}, {"api_versions": {"glance": {"version": 2, "service_type": "image"}}}) @ddt.unpack - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_setup(self, mock_clients, container_format="bare", disk_format="qcow2", image_url="http://example.com/fake/url", diff --git a/tests/unit/plugins/openstack/context/designate/__init__.py b/tests/unit/contexts/heat/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/designate/__init__.py rename to tests/unit/contexts/heat/__init__.py diff --git a/tests/unit/plugins/openstack/context/heat/test_stacks.py b/tests/unit/contexts/heat/test_stacks.py similarity index 93% rename from tests/unit/plugins/openstack/context/heat/test_stacks.py rename to tests/unit/contexts/heat/test_stacks.py index 1a5e1c7a..d708d7a2 100644 --- a/tests/unit/plugins/openstack/context/heat/test_stacks.py +++ b/tests/unit/contexts/heat/test_stacks.py @@ -15,13 +15,13 @@ import mock -from rally.plugins.openstack.context.heat import stacks -from rally.plugins.openstack.scenarios.heat import utils as heat_utils +from rally_openstack.contexts.heat import stacks +from rally_openstack.scenarios.heat import utils as heat_utils from tests.unit import fakes from tests.unit import test -CTX = "rally.plugins.openstack.context" -SCN = "rally.plugins.openstack.scenarios" +CTX = "rally_openstack.contexts" +SCN = "rally_openstack.scenarios" class TestStackGenerator(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/ec2/__init__.py b/tests/unit/contexts/keystone/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/ec2/__init__.py rename to tests/unit/contexts/keystone/__init__.py diff --git a/tests/unit/plugins/openstack/context/keystone/test_roles.py b/tests/unit/contexts/keystone/test_roles.py similarity index 98% rename from tests/unit/plugins/openstack/context/keystone/test_roles.py rename to tests/unit/contexts/keystone/test_roles.py index 0272a865..02cfe544 100644 --- a/tests/unit/plugins/openstack/context/keystone/test_roles.py +++ b/tests/unit/contexts/keystone/test_roles.py @@ -16,11 +16,11 @@ import mock from rally import exceptions -from rally.plugins.openstack.context.keystone import roles +from rally_openstack.contexts.keystone import roles from tests.unit import fakes from tests.unit import test -CTX = "rally.plugins.openstack.context.keystone.roles" +CTX = "rally_openstack.contexts.keystone.roles" class RoleGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/keystone/test_users.py b/tests/unit/contexts/keystone/test_users.py similarity index 99% rename from tests/unit/plugins/openstack/context/keystone/test_users.py rename to tests/unit/contexts/keystone/test_users.py index eb21dbfb..0f91a024 100644 --- a/tests/unit/plugins/openstack/context/keystone/test_users.py +++ b/tests/unit/contexts/keystone/test_users.py @@ -17,11 +17,11 @@ import mock from rally import consts from rally import exceptions -from rally.plugins.openstack.context.keystone import users -from rally.plugins.openstack import credential as oscredential +from rally_openstack.contexts.keystone import users +from rally_openstack import credential as oscredential from tests.unit import test -CTX = "rally.plugins.openstack.context.keystone.users" +CTX = "rally_openstack.contexts.keystone.users" class UserGeneratorBaseTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/glance/__init__.py b/tests/unit/contexts/magnum/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/glance/__init__.py rename to tests/unit/contexts/magnum/__init__.py diff --git a/tests/unit/plugins/openstack/context/magnum/test_ca_certs.py b/tests/unit/contexts/magnum/test_ca_certs.py similarity index 98% rename from tests/unit/plugins/openstack/context/magnum/test_ca_certs.py rename to tests/unit/contexts/magnum/test_ca_certs.py index 34e5e07c..32781e18 100644 --- a/tests/unit/plugins/openstack/context/magnum/test_ca_certs.py +++ b/tests/unit/contexts/magnum/test_ca_certs.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.context.magnum import ca_certs +from rally_openstack.contexts.magnum import ca_certs from tests.unit import test -CTX = "rally.plugins.openstack.context.magnum" -SCN = "rally.plugins.openstack.scenarios" +CTX = "rally_openstack.contexts.magnum" +SCN = "rally_openstack.scenarios" class CaCertsGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/magnum/test_cluster_templates.py b/tests/unit/contexts/magnum/test_cluster_templates.py similarity index 94% rename from tests/unit/plugins/openstack/context/magnum/test_cluster_templates.py rename to tests/unit/contexts/magnum/test_cluster_templates.py index 89e0bc3d..e3733680 100644 --- a/tests/unit/plugins/openstack/context/magnum/test_cluster_templates.py +++ b/tests/unit/contexts/magnum/test_cluster_templates.py @@ -12,16 +12,16 @@ import mock -from rally.plugins.openstack.context.magnum import cluster_templates -from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils +from rally_openstack.contexts.magnum import cluster_templates +from rally_openstack.scenarios.magnum import utils as magnum_utils from tests.unit import fakes from tests.unit import test BASE_CTX = "rally.task.context" -CTX = "rally.plugins.openstack.context" +CTX = "rally_openstack.contexts" BASE_SCN = "rally.task.scenarios" -SCN = "rally.plugins.openstack.scenarios" +SCN = "rally_openstack.scenarios" class ClusterTemplatesGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/magnum/test_clusters.py b/tests/unit/contexts/magnum/test_clusters.py similarity index 96% rename from tests/unit/plugins/openstack/context/magnum/test_clusters.py rename to tests/unit/contexts/magnum/test_clusters.py index cd927bf1..676afacc 100644 --- a/tests/unit/plugins/openstack/context/magnum/test_clusters.py +++ b/tests/unit/contexts/magnum/test_clusters.py @@ -17,12 +17,12 @@ import copy import mock -from rally.plugins.openstack.context.magnum import clusters -from rally.plugins.openstack.scenarios.magnum import utils as magnum_utils +from rally_openstack.contexts.magnum import clusters +from rally_openstack.scenarios.magnum import utils as magnum_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.magnum" -SCN = "rally.plugins.openstack.scenarios" +CTX = "rally_openstack.contexts.magnum" +SCN = "rally_openstack.scenarios" class ClustersGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/heat/__init__.py b/tests/unit/contexts/manila/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/heat/__init__.py rename to tests/unit/contexts/manila/__init__.py diff --git a/tests/unit/plugins/openstack/context/manila/test_manila_security_services.py b/tests/unit/contexts/manila/test_manila_security_services.py similarity index 96% rename from tests/unit/plugins/openstack/context/manila/test_manila_security_services.py rename to tests/unit/contexts/manila/test_manila_security_services.py index fed16d4d..c3c7c6c3 100644 --- a/tests/unit/plugins/openstack/context/manila/test_manila_security_services.py +++ b/tests/unit/contexts/manila/test_manila_security_services.py @@ -17,9 +17,9 @@ import ddt import mock import six -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.context.manila import manila_security_services -from rally.plugins.openstack.scenarios.manila import utils as manila_utils +from rally_openstack.contexts.manila import consts +from rally_openstack.contexts.manila import manila_security_services +from rally_openstack.scenarios.manila import utils as manila_utils from tests.unit import test CONTEXT_NAME = consts.SECURITY_SERVICES_CONTEXT_NAME diff --git a/tests/unit/plugins/openstack/context/manila/test_manila_share_networks.py b/tests/unit/contexts/manila/test_manila_share_networks.py similarity index 95% rename from tests/unit/plugins/openstack/context/manila/test_manila_share_networks.py rename to tests/unit/contexts/manila/test_manila_share_networks.py index ec5423fe..6dac9a8a 100644 --- a/tests/unit/plugins/openstack/context/manila/test_manila_share_networks.py +++ b/tests/unit/contexts/manila/test_manila_share_networks.py @@ -20,12 +20,12 @@ import mock import six from rally import exceptions -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.context.manila import manila_share_networks +from rally_openstack.contexts.manila import consts +from rally_openstack.contexts.manila import manila_share_networks from tests.unit import test MANILA_UTILS_PATH = ( - "rally.plugins.openstack.scenarios.manila.utils.ManilaScenario.") + "rally_openstack.scenarios.manila.utils.ManilaScenario.") MOCK_USER_CREDENTIAL = mock.MagicMock() @@ -167,7 +167,7 @@ class ShareNetworksTestCase(test.TestCase): self.assertEqual(expected_ctxt, inst.context) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_list_share_networks") def test_setup_use_existing_share_networks( self, mock_manila_scenario__list_share_networks, mock_clients): @@ -215,7 +215,7 @@ class ShareNetworksTestCase(test.TestCase): self.assertRaises(exceptions.ContextSetupFailure, inst.setup) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_list_share_networks") def test_setup_use_existing_share_networks_sn_not_found( self, mock_manila_scenario__list_share_networks, mock_clients): @@ -237,7 +237,7 @@ class ShareNetworksTestCase(test.TestCase): self.assertRaises(exceptions.ContextSetupFailure, inst.setup) @ddt.data(True, False) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_create_share_network") @mock.patch(MANILA_UTILS_PATH + "_add_security_service_to_share_network") def test_setup_autocreate_share_networks_with_security_services( @@ -295,7 +295,7 @@ class ShareNetworksTestCase(test.TestCase): for i in range(self.TENANTS_AMOUNT)]) @ddt.data(True, False) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_create_share_network") @mock.patch(MANILA_UTILS_PATH + "_add_security_service_to_share_network") def test_setup_autocreate_share_networks_wo_security_services( @@ -332,7 +332,7 @@ class ShareNetworksTestCase(test.TestCase): mock_clients.assert_has_calls([mock.call(MOCK_USER_CREDENTIAL, {}) for i in range(self.TENANTS_AMOUNT)]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_create_share_network") @mock.patch(MANILA_UTILS_PATH + "_add_security_service_to_share_network") def test_setup_autocreate_share_networks_wo_networks( @@ -357,7 +357,7 @@ class ShareNetworksTestCase(test.TestCase): mock_clients.assert_has_calls([mock.call(MOCK_USER_CREDENTIAL, {}) for i in range(self.TENANTS_AMOUNT)]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(MANILA_UTILS_PATH + "_delete_share_network") @mock.patch(MANILA_UTILS_PATH + "_list_share_servers") @mock.patch(MANILA_UTILS_PATH + "_list_share_networks") @@ -381,7 +381,7 @@ class ShareNetworksTestCase(test.TestCase): self.assertIn(mock.call(user["credential"], {}), mock_clients.mock_calls) - @mock.patch("rally.plugins.openstack.context.manila.manila_share_networks." + @mock.patch("rally_openstack.contexts.manila.manila_share_networks." "resource_manager.cleanup") def test_cleanup_autocreated_share_networks(self, mock_cleanup): task_id = "task" diff --git a/tests/unit/plugins/openstack/context/manila/test_manila_shares.py b/tests/unit/contexts/manila/test_manila_shares.py similarity index 95% rename from tests/unit/plugins/openstack/context/manila/test_manila_shares.py rename to tests/unit/contexts/manila/test_manila_shares.py index 24afa2f2..dc834e04 100644 --- a/tests/unit/plugins/openstack/context/manila/test_manila_shares.py +++ b/tests/unit/contexts/manila/test_manila_shares.py @@ -20,13 +20,13 @@ import mock import six from rally import consts as rally_consts -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.context.manila import manila_shares -from rally.plugins.openstack.scenarios.manila import utils as manila_utils +from rally_openstack.contexts.manila import consts +from rally_openstack.contexts.manila import manila_shares +from rally_openstack.scenarios.manila import utils as manila_utils from tests.unit import test MANILA_UTILS_PATH = ( - "rally.plugins.openstack.scenarios.manila.utils.ManilaScenario.") + "rally_openstack.scenarios.manila.utils.ManilaScenario.") class Fake(object): @@ -183,7 +183,7 @@ class SharesTestCase(test.TestCase): mock_calls, any_order=True) @mock.patch(MANILA_UTILS_PATH + "_create_share") - @mock.patch("rally.plugins.openstack.cleanup.manager.cleanup") + @mock.patch("rally_openstack.cleanup.manager.cleanup") def test_cleanup( self, mock_cleanup_manager_cleanup, diff --git a/tests/unit/plugins/openstack/context/keystone/__init__.py b/tests/unit/contexts/monasca/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/keystone/__init__.py rename to tests/unit/contexts/monasca/__init__.py diff --git a/tests/unit/plugins/openstack/context/monasca/test_metrics.py b/tests/unit/contexts/monasca/test_metrics.py similarity index 95% rename from tests/unit/plugins/openstack/context/monasca/test_metrics.py rename to tests/unit/contexts/monasca/test_metrics.py index 2717b25c..10ec3740 100644 --- a/tests/unit/plugins/openstack/context/monasca/test_metrics.py +++ b/tests/unit/contexts/monasca/test_metrics.py @@ -15,11 +15,11 @@ import mock import six -from rally.plugins.openstack.context.monasca import metrics -from rally.plugins.openstack.scenarios.monasca import utils as monasca_utils +from rally_openstack.contexts.monasca import metrics +from rally_openstack.scenarios.monasca import utils as monasca_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.monasca" +CTX = "rally_openstack.contexts.monasca" class MonascaMetricGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/magnum/__init__.py b/tests/unit/contexts/murano/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/magnum/__init__.py rename to tests/unit/contexts/murano/__init__.py diff --git a/tests/unit/plugins/openstack/context/murano/test_murano_environments.py b/tests/unit/contexts/murano/test_murano_environments.py similarity index 92% rename from tests/unit/plugins/openstack/context/murano/test_murano_environments.py rename to tests/unit/contexts/murano/test_murano_environments.py index 4ea04bee..f5b1151e 100644 --- a/tests/unit/plugins/openstack/context/murano/test_murano_environments.py +++ b/tests/unit/contexts/murano/test_murano_environments.py @@ -15,12 +15,12 @@ import mock -from rally.plugins.openstack.context.murano import murano_environments -from rally.plugins.openstack.scenarios.murano import utils as murano_utils +from rally_openstack.contexts.murano import murano_environments +from rally_openstack.scenarios.murano import utils as murano_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.murano.murano_environments" -SCN = "rally.plugins.openstack.scenarios" +CTX = "rally_openstack.contexts.murano.murano_environments" +SCN = "rally_openstack.scenarios" class MuranoEnvironmentGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/murano/test_murano_packages.py b/tests/unit/contexts/murano/test_murano_packages.py similarity index 96% rename from tests/unit/plugins/openstack/context/murano/test_murano_packages.py rename to tests/unit/contexts/murano/test_murano_packages.py index 200c7c60..8805b88f 100644 --- a/tests/unit/plugins/openstack/context/murano/test_murano_packages.py +++ b/tests/unit/contexts/murano/test_murano_packages.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.context.murano import murano_packages +from rally_openstack.contexts.murano import murano_packages from tests.unit import test -CTX = "rally.plugins.openstack.context.murano.murano_packages" +CTX = "rally_openstack.contexts.murano.murano_packages" class MuranoPackageGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/manila/__init__.py b/tests/unit/contexts/network/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/manila/__init__.py rename to tests/unit/contexts/network/__init__.py diff --git a/tests/unit/plugins/openstack/context/network/test_allow_ssh.py b/tests/unit/contexts/network/test_allow_ssh.py similarity index 94% rename from tests/unit/plugins/openstack/context/network/test_allow_ssh.py rename to tests/unit/contexts/network/test_allow_ssh.py index 86ae0424..9ef6804d 100644 --- a/tests/unit/plugins/openstack/context/network/test_allow_ssh.py +++ b/tests/unit/contexts/network/test_allow_ssh.py @@ -15,11 +15,11 @@ import mock -from rally.plugins.openstack.context.network import allow_ssh +from rally_openstack.contexts.network import allow_ssh from tests.unit import test -CTX = "rally.plugins.openstack.context.network.allow_ssh" +CTX = "rally_openstack.contexts.network.allow_ssh" class AllowSSHContextTestCase(test.TestCase): @@ -63,7 +63,7 @@ class AllowSSHContextTestCase(test.TestCase): @mock.patch("%s.osclients.Clients" % CTX) @mock.patch("%s._prepare_open_secgroup" % CTX) - @mock.patch("rally.plugins.openstack.wrappers.network.wrap") + @mock.patch("rally_openstack.wrappers.network.wrap") def test_secgroup_setup_cleanup_with_secgroup_supported( self, mock_network_wrap, mock__prepare_open_secgroup, mock_clients): @@ -93,7 +93,7 @@ class AllowSSHContextTestCase(test.TestCase): mock_clients.return_value, secgrp_ctx, config={}) @mock.patch("%s.osclients.Clients" % CTX) - @mock.patch("rally.plugins.openstack.wrappers.network.wrap") + @mock.patch("rally_openstack.wrappers.network.wrap") def test_secgroup_setup_with_secgroup_unsupported( self, mock_network_wrap, mock_clients): mock_network_wrapper = mock.MagicMock() diff --git a/tests/unit/plugins/openstack/context/network/test_network.py b/tests/unit/contexts/network/test_network.py similarity index 91% rename from tests/unit/plugins/openstack/context/network/test_network.py rename to tests/unit/contexts/network/test_network.py index 93020939..2fc6e97c 100644 --- a/tests/unit/plugins/openstack/context/network/test_network.py +++ b/tests/unit/contexts/network/test_network.py @@ -17,10 +17,10 @@ import ddt import mock import netaddr -from rally.plugins.openstack.context.network import networks as network_context +from rally_openstack.contexts.network import networks as network_context from tests.unit import test -NET = "rally.plugins.openstack.wrappers.network." +NET = "rally_openstack.wrappers.network." @ddt.ddt @@ -37,7 +37,7 @@ class NetworkTestCase(test.TestCase): def test_START_CIDR_DFLT(self): netaddr.IPNetwork(network_context.Network.DEFAULT_CONFIG["start_cidr"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap", return_value="foo_service") def test__init__default(self, mock_wrap, mock_clients): context = network_context.Network(self.get_context()) @@ -46,7 +46,7 @@ class NetworkTestCase(test.TestCase): context.config["start_cidr"]) self.assertIsNone(context.config["dns_nameservers"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap", return_value="foo_service") def test__init__explicit(self, mock_wrap, mock_clients): context = network_context.Network( @@ -65,8 +65,8 @@ class NetworkTestCase(test.TestCase): {"dns_nameservers": ["1.2.3.4", "5.6.7.8"]}) @ddt.unpack @mock.patch(NET + "wrap") - @mock.patch("rally.plugins.openstack.context.network.networks.utils") - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.contexts.network.networks.utils") + @mock.patch("rally_openstack.osclients.Clients") def test_setup(self, mock_clients, mock_utils, mock_wrap, **dns_kwargs): mock_utils.iterate_per_tenants.return_value = [ ("foo_user", "foo_tenant"), @@ -103,7 +103,7 @@ class NetworkTestCase(test.TestCase): self.assertSequenceEqual(sorted(expected_networks), sorted(actual_networks)) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap") def test_cleanup(self, mock_wrap, mock_clients): net_context = network_context.Network(self.get_context()) diff --git a/tests/unit/plugins/openstack/context/network/test_routers.py b/tests/unit/contexts/network/test_routers.py similarity index 92% rename from tests/unit/plugins/openstack/context/network/test_routers.py rename to tests/unit/contexts/network/test_routers.py index fec83b36..034b7060 100644 --- a/tests/unit/plugins/openstack/context/network/test_routers.py +++ b/tests/unit/contexts/network/test_routers.py @@ -16,13 +16,13 @@ import copy import mock -from rally.plugins.openstack.context.network import routers as router_context -from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils +from rally_openstack.contexts.network import routers as router_context +from rally_openstack.scenarios.neutron import utils as neutron_utils from tests.unit import test -SCN = "rally.plugins.openstack.scenarios" -CTX = "rally.plugins.openstack.context.network.routers" +SCN = "rally_openstack.scenarios" +CTX = "rally_openstack.contexts.network.routers" class RouterTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/monasca/__init__.py b/tests/unit/contexts/neutron/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/monasca/__init__.py rename to tests/unit/contexts/neutron/__init__.py diff --git a/tests/unit/plugins/openstack/context/neutron/test_existing_network.py b/tests/unit/contexts/neutron/test_existing_network.py similarity index 91% rename from tests/unit/plugins/openstack/context/neutron/test_existing_network.py rename to tests/unit/contexts/neutron/test_existing_network.py index 48268de8..96b51c1e 100644 --- a/tests/unit/plugins/openstack/context/neutron/test_existing_network.py +++ b/tests/unit/contexts/neutron/test_existing_network.py @@ -14,10 +14,10 @@ import mock -from rally.plugins.openstack.context.network import existing_network +from rally_openstack.contexts.network import existing_network from tests.unit import test -CTX = "rally.plugins.openstack.context.network" +CTX = "rally_openstack.contexts.network" class ExistingNetworkTestCase(test.TestCase): @@ -45,8 +45,8 @@ class ExistingNetworkTestCase(test.TestCase): }, }) - @mock.patch("rally.plugins.openstack.osclients.Clients") - @mock.patch("rally.plugins.openstack.wrappers.network.wrap") + @mock.patch("rally_openstack.osclients.Clients") + @mock.patch("rally_openstack.wrappers.network.wrap") def test_setup(self, mock_network_wrap, mock_clients): networks = [mock.Mock(), mock.Mock(), mock.Mock()] net_wrappers = { diff --git a/tests/unit/plugins/openstack/context/neutron/test_lbaas.py b/tests/unit/contexts/neutron/test_lbaas.py similarity index 90% rename from tests/unit/plugins/openstack/context/neutron/test_lbaas.py rename to tests/unit/contexts/neutron/test_lbaas.py index 3700113a..bc35fdc3 100644 --- a/tests/unit/plugins/openstack/context/neutron/test_lbaas.py +++ b/tests/unit/contexts/neutron/test_lbaas.py @@ -12,10 +12,10 @@ import mock -from rally.plugins.openstack.context.neutron import lbaas as lbaas_context +from rally_openstack.contexts.neutron import lbaas as lbaas_context from tests.unit import test -NET = "rally.plugins.openstack.wrappers.network." +NET = "rally_openstack.wrappers.network." class LbaasTestCase(test.TestCase): @@ -34,7 +34,7 @@ class LbaasTestCase(test.TestCase): "tenants": {"foo_tenant": foo_tenant, "bar_tenant": bar_tenant}} - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap", return_value="foo_service") def test__init__default(self, mock_wrap, mock_clients): context = lbaas_context.Lbaas(self.get_context()) @@ -48,7 +48,7 @@ class LbaasTestCase(test.TestCase): context.config["lbaas_version"], lbaas_context.Lbaas.DEFAULT_CONFIG["lbaas_version"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap", return_value="foo_service") def test__init__explicit(self, mock_wrap, mock_clients): context = lbaas_context.Lbaas( @@ -57,8 +57,8 @@ class LbaasTestCase(test.TestCase): "LEAST_CONNECTIONS") @mock.patch(NET + "wrap") - @mock.patch("rally.plugins.openstack.context.neutron.lbaas.utils") - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.contexts.neutron.lbaas.utils") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_with_lbaas(self, mock_clients, mock_utils, mock_wrap): mock_utils.iterate_per_tenants.return_value = [ ("foo_user", "foo_tenant"), @@ -95,8 +95,8 @@ class LbaasTestCase(test.TestCase): self.assertEqual(expected_net, actual_net) @mock.patch(NET + "wrap") - @mock.patch("rally.plugins.openstack.context.neutron.lbaas.utils") - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.contexts.neutron.lbaas.utils") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_with_no_lbaas(self, mock_clients, mock_utils, mock_wrap): mock_utils.iterate_per_tenants.return_value = [ ("bar_user", "bar_tenant")] @@ -112,8 +112,8 @@ class LbaasTestCase(test.TestCase): assert not net_wrapper.create_v1_pool.called @mock.patch(NET + "wrap") - @mock.patch("rally.plugins.openstack.context.neutron.lbaas.utils") - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.contexts.neutron.lbaas.utils") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_with_lbaas_version_not_one(self, mock_clients, mock_utils, mock_wrap): mock_utils.iterate_per_tenants.return_value = [ @@ -126,7 +126,7 @@ class LbaasTestCase(test.TestCase): net_wrapper.supports_extension.return_value = (True, None) self.assertRaises(NotImplementedError, lb_context.setup) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap") def test_cleanup(self, mock_wrap, mock_clients): net_wrapper = mock_wrap(mock_clients.return_value) @@ -143,7 +143,7 @@ class LbaasTestCase(test.TestCase): net_wrapper.delete_v1_pool.assert_has_calls( [mock.call(pool["pool"]["id"]) for pool in expected_pools]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") @mock.patch(NET + "wrap") def test_cleanup_lbaas_version_not_one(self, mock_wrap, mock_clients): fakeargs = {"lbaas_version": 2} diff --git a/tests/unit/plugins/openstack/context/murano/__init__.py b/tests/unit/contexts/nova/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/murano/__init__.py rename to tests/unit/contexts/nova/__init__.py diff --git a/tests/unit/plugins/openstack/context/nova/test_flavors.py b/tests/unit/contexts/nova/test_flavors.py similarity index 97% rename from tests/unit/plugins/openstack/context/nova/test_flavors.py rename to tests/unit/contexts/nova/test_flavors.py index e0e406ee..5898e320 100644 --- a/tests/unit/plugins/openstack/context/nova/test_flavors.py +++ b/tests/unit/contexts/nova/test_flavors.py @@ -18,10 +18,10 @@ import copy import mock from novaclient import exceptions as nova_exceptions -from rally.plugins.openstack.context.nova import flavors +from rally_openstack.contexts.nova import flavors from tests.unit import test -CTX = "rally.plugins.openstack.context.nova" +CTX = "rally_openstack.contexts.nova" class FlavorsGeneratorTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/nova/test_keypairs.py b/tests/unit/contexts/nova/test_keypairs.py similarity index 95% rename from tests/unit/plugins/openstack/context/nova/test_keypairs.py rename to tests/unit/contexts/nova/test_keypairs.py index 94c5e377..0b612cf2 100644 --- a/tests/unit/plugins/openstack/context/nova/test_keypairs.py +++ b/tests/unit/contexts/nova/test_keypairs.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.context.nova import keypairs +from rally_openstack.contexts.nova import keypairs from tests.unit import test -CTX = "rally.plugins.openstack.context.nova" +CTX = "rally_openstack.contexts.nova" class KeyPairContextTestCase(test.TestCase): @@ -78,7 +78,7 @@ class KeyPairContextTestCase(test.TestCase): superclass=keypairs.Keypair, task_id=self.ctx_with_keys["task"]["uuid"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_keypair_generate(self, mock_clients): mock_keypairs = mock_clients.return_value.nova.return_value.keypairs mock_keypair = mock_keypairs.create.return_value diff --git a/tests/unit/plugins/openstack/context/nova/test_servers.py b/tests/unit/contexts/nova/test_servers.py similarity index 96% rename from tests/unit/plugins/openstack/context/nova/test_servers.py rename to tests/unit/contexts/nova/test_servers.py index f8675041..966d613b 100755 --- a/tests/unit/plugins/openstack/context/nova/test_servers.py +++ b/tests/unit/contexts/nova/test_servers.py @@ -17,14 +17,14 @@ import copy import mock -from rally.plugins.openstack.context.nova import servers -from rally.plugins.openstack.scenarios.nova import utils as nova_utils +from rally_openstack.contexts.nova import servers +from rally_openstack.scenarios.nova import utils as nova_utils from tests.unit import fakes from tests.unit import test -CTX = "rally.plugins.openstack.context.nova" -SCN = "rally.plugins.openstack.scenarios" -TYP = "rally.plugins.openstack.types" +CTX = "rally_openstack.contexts.nova" +SCN = "rally_openstack.scenarios" +TYP = "rally_openstack.types" class ServerGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/network/__init__.py b/tests/unit/contexts/quotas/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/network/__init__.py rename to tests/unit/contexts/quotas/__init__.py diff --git a/tests/unit/plugins/openstack/context/quotas/test_cinder_quotas.py b/tests/unit/contexts/quotas/test_cinder_quotas.py similarity index 96% rename from tests/unit/plugins/openstack/context/quotas/test_cinder_quotas.py rename to tests/unit/contexts/quotas/test_cinder_quotas.py index 80632a50..3bdcb700 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_cinder_quotas.py +++ b/tests/unit/contexts/quotas/test_cinder_quotas.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.context.quotas import cinder_quotas +from rally_openstack.contexts.quotas import cinder_quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/quotas/test_designate_quotas.py b/tests/unit/contexts/quotas/test_designate_quotas.py similarity index 96% rename from tests/unit/plugins/openstack/context/quotas/test_designate_quotas.py rename to tests/unit/contexts/quotas/test_designate_quotas.py index 9780dcd2..4d2feb5d 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_designate_quotas.py +++ b/tests/unit/contexts/quotas/test_designate_quotas.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.context.quotas import designate_quotas +from rally_openstack.contexts.quotas import designate_quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/quotas/test_manila_quotas.py b/tests/unit/contexts/quotas/test_manila_quotas.py similarity index 96% rename from tests/unit/plugins/openstack/context/quotas/test_manila_quotas.py rename to tests/unit/contexts/quotas/test_manila_quotas.py index 224ad75b..9c7c4087 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_manila_quotas.py +++ b/tests/unit/contexts/quotas/test_manila_quotas.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.context.quotas import manila_quotas +from rally_openstack.contexts.quotas import manila_quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/quotas/test_neutron_quotas.py b/tests/unit/contexts/quotas/test_neutron_quotas.py similarity index 96% rename from tests/unit/plugins/openstack/context/quotas/test_neutron_quotas.py rename to tests/unit/contexts/quotas/test_neutron_quotas.py index 9a57c0e0..c24acb74 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_neutron_quotas.py +++ b/tests/unit/contexts/quotas/test_neutron_quotas.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.context.quotas import neutron_quotas +from rally_openstack.contexts.quotas import neutron_quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/quotas/test_nova_quotas.py b/tests/unit/contexts/quotas/test_nova_quotas.py similarity index 97% rename from tests/unit/plugins/openstack/context/quotas/test_nova_quotas.py rename to tests/unit/contexts/quotas/test_nova_quotas.py index f32fb217..2c3f13a3 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_nova_quotas.py +++ b/tests/unit/contexts/quotas/test_nova_quotas.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.context.quotas import nova_quotas +from rally_openstack.contexts.quotas import nova_quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/quotas/test_quotas.py b/tests/unit/contexts/quotas/test_quotas.py similarity index 97% rename from tests/unit/plugins/openstack/context/quotas/test_quotas.py rename to tests/unit/contexts/quotas/test_quotas.py index a484c8b7..0d092235 100644 --- a/tests/unit/plugins/openstack/context/quotas/test_quotas.py +++ b/tests/unit/contexts/quotas/test_quotas.py @@ -19,11 +19,11 @@ import ddt import mock from rally.common import logging -from rally.plugins.openstack.context.quotas import quotas +from rally_openstack.contexts.quotas import quotas from rally.task import context from tests.unit import test -QUOTAS_PATH = "rally.plugins.openstack.context.quotas" +QUOTAS_PATH = "rally_openstack.contexts.quotas" @ddt.ddt @@ -220,13 +220,13 @@ class QuotasTestCase(test.TestCase): self.assertEqual([mock.call(tenant) for tenant in tenants], neutron_quo.delete.call_args_list) - @mock.patch("rally.plugins.openstack.context." + @mock.patch("rally_openstack.contexts." "quotas.quotas.osclients.Clients") - @mock.patch("rally.plugins.openstack.context." + @mock.patch("rally_openstack.contexts." "quotas.nova_quotas.NovaQuotas") - @mock.patch("rally.plugins.openstack.context." + @mock.patch("rally_openstack.contexts." "quotas.cinder_quotas.CinderQuotas") - @mock.patch("rally.plugins.openstack.context." + @mock.patch("rally_openstack.contexts." "quotas.neutron_quotas.NeutronQuotas") def test_no_quotas(self, mock_neutron_quotas, mock_cinder_quotas, mock_nova_quotas, mock_clients): diff --git a/tests/unit/plugins/openstack/context/neutron/__init__.py b/tests/unit/contexts/sahara/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/neutron/__init__.py rename to tests/unit/contexts/sahara/__init__.py diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_cluster.py b/tests/unit/contexts/sahara/test_sahara_cluster.py similarity index 96% rename from tests/unit/plugins/openstack/context/sahara/test_sahara_cluster.py rename to tests/unit/contexts/sahara/test_sahara_cluster.py index 3ed20e49..1fe354d1 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_cluster.py +++ b/tests/unit/contexts/sahara/test_sahara_cluster.py @@ -16,13 +16,13 @@ import mock from rally.common import cfg from rally import exceptions -from rally.plugins.openstack.context.sahara import sahara_cluster -from rally.plugins.openstack.scenarios.sahara import utils as sahara_utils +from rally_openstack.contexts.sahara import sahara_cluster +from rally_openstack.scenarios.sahara import utils as sahara_utils from tests.unit import test CONF = cfg.CONF -CTX = "rally.plugins.openstack.context.sahara" +CTX = "rally_openstack.contexts.sahara" class SaharaClusterTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py b/tests/unit/contexts/sahara/test_sahara_image.py similarity index 95% rename from tests/unit/plugins/openstack/context/sahara/test_sahara_image.py rename to tests/unit/contexts/sahara/test_sahara_image.py index df512af8..2de90a5b 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_image.py +++ b/tests/unit/contexts/sahara/test_sahara_image.py @@ -15,14 +15,14 @@ import mock from rally import exceptions -from rally.plugins.openstack.context.sahara import sahara_image +from rally_openstack.contexts.sahara import sahara_image from tests.unit import test BASE_CTX = "rally.task.context" -CTX = "rally.plugins.openstack.context.sahara.sahara_image" +CTX = "rally_openstack.contexts.sahara.sahara_image" BASE_SCN = "rally.task.scenarios" -SCN = "rally.plugins.openstack.scenarios" +SCN = "rally_openstack.scenarios" class SaharaImageTestCase(test.ScenarioTestCase): @@ -84,10 +84,10 @@ class SaharaImageTestCase(test.ScenarioTestCase): }) return self.context - @mock.patch("rally.plugins.openstack.services." + @mock.patch("rally_openstack.services." "image.image.Image") @mock.patch("%s.resource_manager.cleanup" % CTX) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_and_cleanup_url_image(self, mock_clients, mock_cleanup, mock_image): diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_input_data_sources.py b/tests/unit/contexts/sahara/test_sahara_input_data_sources.py similarity index 97% rename from tests/unit/plugins/openstack/context/sahara/test_sahara_input_data_sources.py rename to tests/unit/contexts/sahara/test_sahara_input_data_sources.py index 9bad8706..db3cd26a 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_input_data_sources.py +++ b/tests/unit/contexts/sahara/test_sahara_input_data_sources.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.context.sahara import sahara_input_data_sources -from rally.plugins.openstack.scenarios.swift import utils as swift_utils +from rally_openstack.contexts.sahara import sahara_input_data_sources +from rally_openstack.scenarios.swift import utils as swift_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.sahara" +CTX = "rally_openstack.contexts.sahara" class SaharaInputDataSourcesTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_job_binaries.py b/tests/unit/contexts/sahara/test_sahara_job_binaries.py similarity index 96% rename from tests/unit/plugins/openstack/context/sahara/test_sahara_job_binaries.py rename to tests/unit/contexts/sahara/test_sahara_job_binaries.py index 5e38c70e..206768aa 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_job_binaries.py +++ b/tests/unit/contexts/sahara/test_sahara_job_binaries.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.context.sahara import sahara_job_binaries -from rally.plugins.openstack.scenarios.sahara import utils as sahara_utils +from rally_openstack.contexts.sahara import sahara_job_binaries +from rally_openstack.scenarios.sahara import utils as sahara_utils from tests.unit import test -CTX = "rally.plugins.openstack.context.sahara" +CTX = "rally_openstack.contexts.sahara" class SaharaJobBinariesTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/sahara/test_sahara_output_data_sources.py b/tests/unit/contexts/sahara/test_sahara_output_data_sources.py similarity index 96% rename from tests/unit/plugins/openstack/context/sahara/test_sahara_output_data_sources.py rename to tests/unit/contexts/sahara/test_sahara_output_data_sources.py index e4839000..d5b4b4be 100644 --- a/tests/unit/plugins/openstack/context/sahara/test_sahara_output_data_sources.py +++ b/tests/unit/contexts/sahara/test_sahara_output_data_sources.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.context.sahara import sahara_output_data_sources -from rally.plugins.openstack import credential as oscredential +from rally_openstack.contexts.sahara import sahara_output_data_sources +from rally_openstack import credential as oscredential from tests.unit import test -CTX = "rally.plugins.openstack.context.sahara" +CTX = "rally_openstack.contexts.sahara" class SaharaOutputDataSourcesTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/nova/__init__.py b/tests/unit/contexts/senlin/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/nova/__init__.py rename to tests/unit/contexts/senlin/__init__.py diff --git a/tests/unit/plugins/openstack/context/senlin/test_profiles.py b/tests/unit/contexts/senlin/test_profiles.py similarity index 95% rename from tests/unit/plugins/openstack/context/senlin/test_profiles.py rename to tests/unit/contexts/senlin/test_profiles.py index 4cbb7da8..c7a57263 100644 --- a/tests/unit/plugins/openstack/context/senlin/test_profiles.py +++ b/tests/unit/contexts/senlin/test_profiles.py @@ -12,14 +12,14 @@ import mock -from rally.plugins.openstack.context.senlin import profiles +from rally_openstack.contexts.senlin import profiles from tests.unit import test BASE_CTX = "rally.task.context" -CTX = "rally.plugins.openstack.context" +CTX = "rally_openstack.context" BASE_SCN = "rally.task.scenarios" -SCN = "rally.plugins.openstack.scenarios" +SCN = "rally_openstack.scenarios" class ProfilesGeneratorTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/context/quotas/__init__.py b/tests/unit/contexts/swift/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/quotas/__init__.py rename to tests/unit/contexts/swift/__init__.py diff --git a/tests/unit/plugins/openstack/context/swift/test_objects.py b/tests/unit/contexts/swift/test_objects.py similarity index 94% rename from tests/unit/plugins/openstack/context/swift/test_objects.py rename to tests/unit/contexts/swift/test_objects.py index f1b48971..9b7f47b6 100644 --- a/tests/unit/plugins/openstack/context/swift/test_objects.py +++ b/tests/unit/contexts/swift/test_objects.py @@ -16,13 +16,13 @@ import mock from rally import exceptions -from rally.plugins.openstack.context.swift import objects +from rally_openstack.contexts.swift import objects from tests.unit import test class SwiftObjectGeneratorTestCase(test.TestCase): - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_setup(self, mock_clients): containers_per_tenant = 2 objects_per_container = 7 @@ -64,8 +64,8 @@ class SwiftObjectGeneratorTestCase(test.TestCase): self.assertEqual(objects_per_container, len(container["objects"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") - @mock.patch("rally.plugins.openstack.context.swift.utils." + @mock.patch("rally_openstack.osclients.Clients") + @mock.patch("rally_openstack.contexts.swift.utils." "swift_utils.SwiftScenario") def test_cleanup(self, mock_swift_scenario, mock_clients): context = test.get_test_context() @@ -114,7 +114,7 @@ class SwiftObjectGeneratorTestCase(test.TestCase): self.assertEqual(0, len(context["tenants"][tenant_id]["containers"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_failure_clients_put_container(self, mock_clients): context = test.get_test_context() context.update({ @@ -150,7 +150,7 @@ class SwiftObjectGeneratorTestCase(test.TestCase): "containers, expected 4 but got 1", objects_ctx.setup) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_setup_failure_clients_put_object(self, mock_clients): context = test.get_test_context() context.update({ @@ -178,7 +178,7 @@ class SwiftObjectGeneratorTestCase(test.TestCase): "objects, expected 2 but got 1", objects_ctx.setup) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_cleanup_failure_clients_delete_container(self, mock_clients): context = test.get_test_context() context.update({ @@ -199,7 +199,7 @@ class SwiftObjectGeneratorTestCase(test.TestCase): objects_ctx.cleanup() self.assertEqual(1, len(context["tenants"]["t1"]["containers"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_cleanup_failure_clients_delete_object(self, mock_clients): context = test.get_test_context() context.update({ diff --git a/tests/unit/plugins/openstack/context/swift/test_utils.py b/tests/unit/contexts/swift/test_utils.py similarity index 95% rename from tests/unit/plugins/openstack/context/swift/test_utils.py rename to tests/unit/contexts/swift/test_utils.py index 49143524..d4e827d0 100644 --- a/tests/unit/plugins/openstack/context/swift/test_utils.py +++ b/tests/unit/contexts/swift/test_utils.py @@ -15,13 +15,13 @@ import mock -from rally.plugins.openstack.context.swift import utils +from rally_openstack.contexts.swift import utils from tests.unit import test class SwiftObjectMixinTestCase(test.TestCase): - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test__create_containers(self, mock_clients): tenants = 2 containers_per_tenant = 2 @@ -56,7 +56,7 @@ class SwiftObjectMixinTestCase(test.TestCase): container["user"]["credential"]) self.assertEqual(0, len(container["objects"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test__create_objects(self, mock_clients): tenants = 2 containers_per_tenant = 1 @@ -105,7 +105,7 @@ class SwiftObjectMixinTestCase(test.TestCase): self.assertEqual(objects_per_container, len(container["objects"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test__delete_containers(self, mock_clients): context = test.get_test_context() context.update({ @@ -145,7 +145,7 @@ class SwiftObjectMixinTestCase(test.TestCase): self.assertEqual(0, len(context["tenants"][tenant_id]["containers"])) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test__delete_objects(self, mock_clients): context = test.get_test_context() context.update({ diff --git a/tests/unit/plugins/openstack/context/test_api_versions.py b/tests/unit/contexts/test_api_versions.py similarity index 97% rename from tests/unit/plugins/openstack/context/test_api_versions.py rename to tests/unit/contexts/test_api_versions.py index dab771f4..7b665f0e 100644 --- a/tests/unit/plugins/openstack/context/test_api_versions.py +++ b/tests/unit/contexts/test_api_versions.py @@ -15,7 +15,7 @@ import mock from rally.common import utils from rally import exceptions -from rally.plugins.openstack.context import api_versions +from rally_openstack.contexts import api_versions from rally.task import context from tests.unit import test @@ -26,7 +26,7 @@ class OpenStackServicesTestCase(test.TestCase): def setUp(self): super(OpenStackServicesTestCase, self).setUp() self.mock_clients = mock.patch( - "rally.plugins.openstack.osclients.Clients").start() + "rally_openstack.osclients.Clients").start() osclient_kc = self.mock_clients.return_value.keystone self.mock_kc = osclient_kc.return_value self.service_catalog = osclient_kc.service_catalog diff --git a/tests/unit/plugins/openstack/context/sahara/__init__.py b/tests/unit/contexts/vm/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/sahara/__init__.py rename to tests/unit/contexts/vm/__init__.py diff --git a/tests/unit/plugins/openstack/context/vm/test_custom_image.py b/tests/unit/contexts/vm/test_custom_image.py similarity index 98% rename from tests/unit/plugins/openstack/context/vm/test_custom_image.py rename to tests/unit/contexts/vm/test_custom_image.py index d3369162..5f355dec 100644 --- a/tests/unit/plugins/openstack/context/vm/test_custom_image.py +++ b/tests/unit/contexts/vm/test_custom_image.py @@ -15,12 +15,12 @@ import mock -from rally.plugins.openstack.context.vm import custom_image +from rally_openstack.contexts.vm import custom_image from rally.task import context from tests.unit import test -BASE = "rally.plugins.openstack.context.vm.custom_image" +BASE = "rally_openstack.contexts.vm.custom_image" @context.configure(name="test_custom_image", order=500) diff --git a/tests/unit/plugins/openstack/context/vm/test_image_command_customizer.py b/tests/unit/contexts/vm/test_image_command_customizer.py similarity index 96% rename from tests/unit/plugins/openstack/context/vm/test_image_command_customizer.py rename to tests/unit/contexts/vm/test_image_command_customizer.py index e6c4d2e0..ac98ab0d 100644 --- a/tests/unit/plugins/openstack/context/vm/test_image_command_customizer.py +++ b/tests/unit/contexts/vm/test_image_command_customizer.py @@ -18,10 +18,10 @@ import mock from rally import exceptions -from rally.plugins.openstack.context.vm import image_command_customizer +from rally_openstack.contexts.vm import image_command_customizer from tests.unit import test -BASE = "rally.plugins.openstack.context.vm.image_command_customizer" +BASE = "rally_openstack.contexts.vm.image_command_customizer" class ImageCommandCustomizerContextVMTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/context/senlin/__init__.py b/tests/unit/contexts/watcher/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/senlin/__init__.py rename to tests/unit/contexts/watcher/__init__.py diff --git a/tests/unit/plugins/openstack/context/watcher/test_audit_templates.py b/tests/unit/contexts/watcher/test_audit_templates.py similarity index 92% rename from tests/unit/plugins/openstack/context/watcher/test_audit_templates.py rename to tests/unit/contexts/watcher/test_audit_templates.py index 751373c0..d008c8f1 100644 --- a/tests/unit/plugins/openstack/context/watcher/test_audit_templates.py +++ b/tests/unit/contexts/watcher/test_audit_templates.py @@ -14,15 +14,15 @@ import mock -from rally.plugins.openstack.context.watcher import audit_templates -from rally.plugins.openstack.scenarios.watcher import utils as watcher_utils +from rally_openstack.contexts.watcher import audit_templates +from rally_openstack.scenarios.watcher import utils as watcher_utils from tests.unit import fakes from tests.unit import test -CTX = "rally.plugins.openstack.context.watcher" -SCN = "rally.plugins.openstack.scenarios.watcher" -TYP = "rally.plugins.openstack.types" +CTX = "rally_openstack.contexts.watcher" +SCN = "rally_openstack.scenarios.watcher" +TYP = "rally_openstack.types" class AuditTemplateTestCase(test.ScenarioTestCase): diff --git a/tests/unit/doc/test_format.py b/tests/unit/doc/test_format.py index dafb4c68..6d038404 100644 --- a/tests/unit/doc/test_format.py +++ b/tests/unit/doc/test_format.py @@ -15,6 +15,7 @@ import io import os import re +import rally_openstack import testtools @@ -66,8 +67,8 @@ class TestFormat(testtools.TestCase): def test_lines(self): files = [] - docs_dir = os.path.join(os.path.dirname(__file__), os.pardir, - os.pardir, os.pardir, "doc") + docs_dir = os.path.join( + os.path.dirname(rally_openstack.__file__), "doc") for root, dirnames, filenames in os.walk(docs_dir): for filename in fnmatch.filter(filenames, "*.rst"): files.append(os.path.join(root, filename)) diff --git a/tests/unit/doc/test_specs.py b/tests/unit/doc/test_specs.py index 496d0044..77f04373 100644 --- a/tests/unit/doc/test_specs.py +++ b/tests/unit/doc/test_specs.py @@ -16,7 +16,7 @@ import re import docutils.core -import rally +import rally_openstack from tests.unit import test @@ -25,7 +25,7 @@ class TitlesTestCase(test.TestCase): OPTIONAL_SECTIONS = ["References"] specs_path = os.path.join( - os.path.dirname(rally.__file__), os.pardir, "doc", "specs") + os.path.dirname(rally_openstack.__file__), os.pardir, "doc", "specs") def _get_title(self, section_tree): section = {"subtitles": []} diff --git a/tests/unit/doc/test_task_samples.py b/tests/unit/doc/test_task_samples.py index 4786c892..5faaaf83 100644 --- a/tests/unit/doc/test_task_samples.py +++ b/tests/unit/doc/test_task_samples.py @@ -20,15 +20,16 @@ import traceback import mock import yaml - -import rally from rally import api from rally.task import context from rally.task import engine from rally.task import scenario from tests.unit import test -RALLY_PATH = os.path.dirname(os.path.dirname(rally.__file__)) +import rally_openstack + + +RALLY_PATH = os.path.dirname(os.path.dirname(rally_openstack.__file__)) class TaskSampleTestCase(test.TestCase): @@ -168,7 +169,7 @@ class TaskSampleTestCase(test.TestCase): for p in all_plugins: # except contexts which belongs to tests module if not inspect.getfile(p).startswith( - os.path.dirname(rally.__file__)): + os.path.dirname(rally_openstack.__file__)): continue file_name = p.get_name().replace("_", "-") file_path = os.path.join(context_samples_path, file_name) diff --git a/tests/unit/plugins/openstack/embedcharts/test_osprofilerchart.py b/tests/unit/embedcharts/test_osprofilerchart.py similarity index 93% rename from tests/unit/plugins/openstack/embedcharts/test_osprofilerchart.py rename to tests/unit/embedcharts/test_osprofilerchart.py index d2357a48..6239d6a0 100644 --- a/tests/unit/plugins/openstack/embedcharts/test_osprofilerchart.py +++ b/tests/unit/embedcharts/test_osprofilerchart.py @@ -13,7 +13,7 @@ # under the License. import mock -from rally.plugins.openstack.embedcharts.osprofilerchart import OSProfilerChart +from rally_openstack.embedcharts.osprofilerchart import OSProfilerChart from tests.unit import test @@ -48,7 +48,7 @@ class OSProfilerChartTestCase(test.TestCase): self.assertEqual("a", return_data["title"]) def test_datetime_json_serialize(self): - from rally.plugins.openstack.embedcharts.osprofilerchart \ + from rally_openstack.embedcharts.osprofilerchart \ import _datetime_json_serialize A = mock.Mock() B = A.isoformat() diff --git a/tests/unit/plugins/openstack/context/swift/__init__.py b/tests/unit/hook/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/swift/__init__.py rename to tests/unit/hook/__init__.py diff --git a/tests/unit/plugins/openstack/hook/test_fault_injection.py b/tests/unit/hook/test_fault_injection.py similarity index 98% rename from tests/unit/plugins/openstack/hook/test_fault_injection.py rename to tests/unit/hook/test_fault_injection.py index a53d7ed6..21189772 100644 --- a/tests/unit/plugins/openstack/hook/test_fault_injection.py +++ b/tests/unit/hook/test_fault_injection.py @@ -20,7 +20,7 @@ import os_faults from os_faults.api import error from rally import consts -from rally.plugins.openstack.hook import fault_injection +from rally_openstack.hook import fault_injection from rally.task import hook from tests.unit import fakes from tests.unit import test diff --git a/tests/unit/plugins/openstack/context/vm/__init__.py b/tests/unit/platforms/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/vm/__init__.py rename to tests/unit/platforms/__init__.py diff --git a/tests/unit/plugins/openstack/platforms/test_existing.py b/tests/unit/platforms/test_existing.py similarity index 90% rename from tests/unit/plugins/openstack/platforms/test_existing.py rename to tests/unit/platforms/test_existing.py index f40613db..92c46c6b 100644 --- a/tests/unit/plugins/openstack/platforms/test_existing.py +++ b/tests/unit/platforms/test_existing.py @@ -14,14 +14,31 @@ import json +import jsonschema import mock - +from rally.env import env_mgr from rally.env import platform -from rally.plugins.openstack.platforms import existing -from tests.unit.env import test_platform + +from rally_openstack.platforms import existing +from tests.unit import test -class ExistingPlatformTestCase(test_platform.PlatformBaseTestCase): +class PlatformBaseTestCase(test.TestCase): + + def _check_schema(self, schema, obj): + jsonschema.validate(obj, schema) + + def _check_health_schema(self, obj): + self._check_schema(env_mgr.EnvManager._HEALTH_FORMAT, obj) + + def _check_cleanup_schema(self, obj): + self._check_schema(env_mgr.EnvManager._CLEANUP_FORMAT, obj) + + def _check_info_schema(self, obj): + self._check_schema(env_mgr.EnvManager._INFO_FORMAT, obj) + + +class ExistingPlatformTestCase(PlatformBaseTestCase): def test_validate_spec_schema(self): spec = { @@ -147,7 +164,7 @@ class ExistingPlatformTestCase(test_platform.PlatformBaseTestCase): ) self._check_cleanup_schema(result1) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_check_health(self, mock_clients): pdata = { "admin": mock.MagicMock(), @@ -161,7 +178,7 @@ class ExistingPlatformTestCase(test_platform.PlatformBaseTestCase): mock.call(pdata["users"][0]), mock.call().keystone(), mock.call(pdata["users"][1]), mock.call().keystone()]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_check_failed_admin(self, mock_clients): mock_clients.return_value.verified_keystone.side_effect = Exception pdata = {"admin": {"username": "balbab", "password": "12345"}} @@ -177,7 +194,7 @@ class ExistingPlatformTestCase(test_platform.PlatformBaseTestCase): result) self.assertIn("Traceback (most recent call last)", result["traceback"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_check_failed_users(self, mock_clients): mock_clients.return_value.keystone.side_effect = Exception pdata = {"admin": None, @@ -194,7 +211,7 @@ class ExistingPlatformTestCase(test_platform.PlatformBaseTestCase): result) self.assertIn("Traceback (most recent call last)", result["traceback"]) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_info(self, mock_clients): mock_clients.return_value.services.return_value = { "foo": "bar", diff --git a/tests/unit/plugins/openstack/verification/tempest/__init__.py b/tests/unit/plugins/openstack/verification/tempest/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/plugins/openstack/wrappers/__init__.py b/tests/unit/plugins/openstack/wrappers/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/plugins/workload/__init__.py b/tests/unit/plugins/workload/__init__.py deleted file mode 100644 index e69de29b..00000000 diff --git a/tests/unit/rally_jobs/test_jobs.py b/tests/unit/rally_jobs/test_jobs.py index 3fa8a042..726cb19a 100644 --- a/tests/unit/rally_jobs/test_jobs.py +++ b/tests/unit/rally_jobs/test_jobs.py @@ -18,8 +18,6 @@ import tempfile import traceback import mock - -import rally from rally import api from rally.common.plugin import discover from rally.common import yamlutils as yaml @@ -28,9 +26,12 @@ from tests.unit import fakes from tests.unit import test +import rally_openstack + + class RallyJobsTestCase(test.TestCase): rally_jobs_path = os.path.join( - os.path.dirname(rally.__file__), "..", "rally-jobs") + os.path.dirname(rally_openstack.__file__), "..", "rally-jobs") def setUp(self): super(RallyJobsTestCase, self).setUp() diff --git a/tests/unit/plugins/openstack/context/watcher/__init__.py b/tests/unit/scenarios/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/context/watcher/__init__.py rename to tests/unit/scenarios/__init__.py diff --git a/tests/unit/plugins/openstack/hook/__init__.py b/tests/unit/scenarios/authenticate/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/hook/__init__.py rename to tests/unit/scenarios/authenticate/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py b/tests/unit/scenarios/authenticate/test_authenticate.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py rename to tests/unit/scenarios/authenticate/test_authenticate.py index ec064607..634ab6f1 100644 --- a/tests/unit/plugins/openstack/scenarios/authenticate/test_authenticate.py +++ b/tests/unit/scenarios/authenticate/test_authenticate.py @@ -13,7 +13,7 @@ # License for the specific language governing permissions and limitations # under the License. -from rally.plugins.openstack.scenarios.authenticate import authenticate +from rally_openstack.scenarios.authenticate import authenticate from tests.unit import test import mock diff --git a/tests/unit/plugins/openstack/platforms/__init__.py b/tests/unit/scenarios/ceilometer/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/platforms/__init__.py rename to tests/unit/scenarios/ceilometer/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_alarms.py b/tests/unit/scenarios/ceilometer/test_alarms.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_alarms.py rename to tests/unit/scenarios/ceilometer/test_alarms.py index 81d8c3aa..435c5207 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_alarms.py +++ b/tests/unit/scenarios/ceilometer/test_alarms.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.ceilometer import alarms +from rally_openstack.scenarios.ceilometer import alarms from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_events.py b/tests/unit/scenarios/ceilometer/test_events.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_events.py rename to tests/unit/scenarios/ceilometer/test_events.py index 8ff74d4b..c253941d 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_events.py +++ b/tests/unit/scenarios/ceilometer/test_events.py @@ -15,7 +15,7 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.ceilometer import events +from rally_openstack.scenarios.ceilometer import events from tests.unit import test @@ -24,7 +24,7 @@ class CeilometerEventsTestCase(test.ScenarioTestCase): def setUp(self): super(CeilometerEventsTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.identity.identity.Identity") + "rally_openstack.services.identity.identity.Identity") self.addCleanup(patch.stop) self.mock_identity = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_meters.py b/tests/unit/scenarios/ceilometer/test_meters.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_meters.py rename to tests/unit/scenarios/ceilometer/test_meters.py index a5634e45..1ed83684 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_meters.py +++ b/tests/unit/scenarios/ceilometer/test_meters.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.scenarios.ceilometer import meters +from rally_openstack.scenarios.ceilometer import meters from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.ceilometer" +BASE = "rally_openstack.scenarios.ceilometer" class CeilometerMetersTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_queries.py b/tests/unit/scenarios/ceilometer/test_queries.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_queries.py rename to tests/unit/scenarios/ceilometer/test_queries.py index 825fa8c7..ce2a9960 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_queries.py +++ b/tests/unit/scenarios/ceilometer/test_queries.py @@ -16,7 +16,7 @@ import json import mock -from rally.plugins.openstack.scenarios.ceilometer import queries +from rally_openstack.scenarios.ceilometer import queries from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_resources.py b/tests/unit/scenarios/ceilometer/test_resources.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_resources.py rename to tests/unit/scenarios/ceilometer/test_resources.py index 506f4cac..ea021f83 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_resources.py +++ b/tests/unit/scenarios/ceilometer/test_resources.py @@ -15,11 +15,11 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.ceilometer import resources +from rally_openstack.scenarios.ceilometer import resources from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.ceilometer" +BASE = "rally_openstack.scenarios.ceilometer" class CeilometerResourcesTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_samples.py b/tests/unit/scenarios/ceilometer/test_samples.py similarity index 95% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_samples.py rename to tests/unit/scenarios/ceilometer/test_samples.py index 366a88cc..06e9d4e7 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_samples.py +++ b/tests/unit/scenarios/ceilometer/test_samples.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.scenarios.ceilometer import samples +from rally_openstack.scenarios.ceilometer import samples from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.ceilometer" +BASE = "rally_openstack.scenarios.ceilometer" class CeilometerSamplesTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_stats.py b/tests/unit/scenarios/ceilometer/test_stats.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_stats.py rename to tests/unit/scenarios/ceilometer/test_stats.py index b5f0a974..04dc2970 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_stats.py +++ b/tests/unit/scenarios/ceilometer/test_stats.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.ceilometer import stats +from rally_openstack.scenarios.ceilometer import stats from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_traits.py b/tests/unit/scenarios/ceilometer/test_traits.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_traits.py rename to tests/unit/scenarios/ceilometer/test_traits.py index 35344da6..33ec636e 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_traits.py +++ b/tests/unit/scenarios/ceilometer/test_traits.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.ceilometer import traits +from rally_openstack.scenarios.ceilometer import traits from tests.unit import test @@ -23,7 +23,7 @@ class CeilometerTraitsTestCase(test.ScenarioTestCase): def setUp(self): super(CeilometerTraitsTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.identity.identity.Identity") + "rally_openstack.services.identity.identity.Identity") self.addCleanup(patch.stop) self.mock_identity = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py b/tests/unit/scenarios/ceilometer/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py rename to tests/unit/scenarios/ceilometer/test_utils.py index bf1e76fe..1b681d79 100644 --- a/tests/unit/plugins/openstack/scenarios/ceilometer/test_utils.py +++ b/tests/unit/scenarios/ceilometer/test_utils.py @@ -19,10 +19,10 @@ from dateutil import parser import mock from rally import exceptions -from rally.plugins.openstack.scenarios.ceilometer import utils +from rally_openstack.scenarios.ceilometer import utils from tests.unit import test -CEILOMETER_UTILS = "rally.plugins.openstack.scenarios.ceilometer.utils" +CEILOMETER_UTILS = "rally_openstack.scenarios.ceilometer.utils" class CeilometerScenarioTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/__init__.py b/tests/unit/scenarios/cinder/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/__init__.py rename to tests/unit/scenarios/cinder/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_qos_specs.py b/tests/unit/scenarios/cinder/test_qos_specs.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/cinder/test_qos_specs.py rename to tests/unit/scenarios/cinder/test_qos_specs.py index 0e975ecb..7f946599 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_qos_specs.py +++ b/tests/unit/scenarios/cinder/test_qos_specs.py @@ -15,7 +15,7 @@ import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.cinder import qos_specs +from rally_openstack.scenarios.cinder import qos_specs from tests.unit import test @@ -24,7 +24,7 @@ class CinderQosTestCase(test.ScenarioTestCase): def setUp(self): super(CinderQosTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.storage.block.BlockStorage") + "rally_openstack.services.storage.block.BlockStorage") self.addCleanup(patch.stop) self.mock_cinder = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py b/tests/unit/scenarios/cinder/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/cinder/test_utils.py rename to tests/unit/scenarios/cinder/test_utils.py index 63d4f7b1..33cbbc82 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_utils.py +++ b/tests/unit/scenarios/cinder/test_utils.py @@ -17,12 +17,12 @@ import mock from rally.common import cfg from rally import exceptions -from rally.plugins.openstack import osclients -from rally.plugins.openstack.scenarios.cinder import utils +from rally_openstack import osclients +from rally_openstack.scenarios.cinder import utils from tests.unit import fakes from tests.unit import test -CINDER_UTILS = "rally.plugins.openstack.scenarios.cinder.utils" +CINDER_UTILS = "rally_openstack.scenarios.cinder.utils" CONF = cfg.CONF @@ -59,7 +59,7 @@ class CinderScenarioTestCase(test.ScenarioTestCase): def setUp(self): super(CinderScenarioTestCase, self).setUp() - wrap = mock.patch("rally.plugins.openstack.wrappers.cinder.wrap") + wrap = mock.patch("rally_openstack.wrappers.cinder.wrap") self.mock_wrap = wrap.start() self.addCleanup(self.mock_wrap.stop) self.scenario = utils.CinderScenario( @@ -161,7 +161,7 @@ class CinderScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(self.scenario.atomic_actions(), "cinder.create_volume") - @mock.patch("rally.plugins.openstack.scenarios.cinder.utils.random") + @mock.patch("rally_openstack.scenarios.cinder.utils.random") def test__create_volume_with_size_range(self, mock_random): mock_random.randint.return_value = 3 @@ -223,7 +223,7 @@ class CinderScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(self.scenario.atomic_actions(), "cinder.delete_volume") - @mock.patch("rally.plugins.openstack.scenarios.cinder.utils.random") + @mock.patch("rally_openstack.scenarios.cinder.utils.random") def test__extend_volume_with_size_range(self, mock_random): volume = mock.Mock() mock_random.randint.return_value = 3 @@ -258,7 +258,7 @@ class CinderScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(self.scenario.atomic_actions(), "cinder.extend_volume") - @mock.patch("rally.plugins.openstack.wrappers.glance.wrap") + @mock.patch("rally_openstack.wrappers.glance.wrap") def test__upload_volume_to_image(self, mock_wrap): volume = mock.Mock() image = {"os-volume_upload_image": {"image_id": 1}} diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_volume_backups.py b/tests/unit/scenarios/cinder/test_volume_backups.py similarity index 93% rename from tests/unit/plugins/openstack/scenarios/cinder/test_volume_backups.py rename to tests/unit/scenarios/cinder/test_volume_backups.py index f49daa81..9d9f82a1 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_volume_backups.py +++ b/tests/unit/scenarios/cinder/test_volume_backups.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.cinder import volume_backups +from rally_openstack.scenarios.cinder import volume_backups from tests.unit import test @@ -23,7 +23,7 @@ class CinderBackupTestCase(test.ScenarioTestCase): def setUp(self): super(CinderBackupTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.storage.block.BlockStorage") + "rally_openstack.services.storage.block.BlockStorage") self.addCleanup(patch.stop) self.mock_cinder = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_volume_types.py b/tests/unit/scenarios/cinder/test_volume_types.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/cinder/test_volume_types.py rename to tests/unit/scenarios/cinder/test_volume_types.py index f881ce88..305e0327 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_volume_types.py +++ b/tests/unit/scenarios/cinder/test_volume_types.py @@ -15,10 +15,10 @@ import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.cinder import volume_types +from rally_openstack.scenarios.cinder import volume_types from tests.unit import test -CINDER_V2_PATH = ("rally.plugins.openstack.services.storage" +CINDER_V2_PATH = ("rally_openstack.services.storage" ".cinder_v2.CinderV2Service") @@ -27,7 +27,7 @@ class CinderVolumeTypesTestCase(test.ScenarioTestCase): def setUp(self): super(CinderVolumeTypesTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.storage.block.BlockStorage") + "rally_openstack.services.storage.block.BlockStorage") self.addCleanup(patch.stop) self.mock_cinder = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py b/tests/unit/scenarios/cinder/test_volumes.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py rename to tests/unit/scenarios/cinder/test_volumes.py index a3a49329..c9789065 100644 --- a/tests/unit/plugins/openstack/scenarios/cinder/test_volumes.py +++ b/tests/unit/scenarios/cinder/test_volumes.py @@ -16,10 +16,10 @@ import ddt import mock -from rally.plugins.openstack.scenarios.cinder import volumes +from rally_openstack.scenarios.cinder import volumes from tests.unit import test -CINDER_VOLUMES = ("rally.plugins.openstack.scenarios.cinder.volumes") +CINDER_VOLUMES = ("rally_openstack.scenarios.cinder.volumes") @ddt.ddt @@ -42,7 +42,7 @@ class CinderServersTestCase(test.ScenarioTestCase): def setUp(self): super(CinderServersTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.storage.block.BlockStorage") + "rally_openstack.services.storage.block.BlockStorage") self.addCleanup(patch.stop) self.mock_cinder = patch.start() @@ -235,7 +235,7 @@ class CinderServersTestCase(test.ScenarioTestCase): mock_service.create_volume.return_value) scenario._delete_server.assert_called_once_with(fake_server) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test_create_and_upload_volume_to_image(self, mock_image): mock_volume_service = self.mock_cinder.return_value mock_image_service = mock_image.return_value diff --git a/tests/unit/plugins/openstack/scenarios/authenticate/__init__.py b/tests/unit/scenarios/designate/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/authenticate/__init__.py rename to tests/unit/scenarios/designate/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/designate/test_basic.py b/tests/unit/scenarios/designate/test_basic.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/designate/test_basic.py rename to tests/unit/scenarios/designate/test_basic.py index 68b66193..ba07cb64 100644 --- a/tests/unit/plugins/openstack/scenarios/designate/test_basic.py +++ b/tests/unit/scenarios/designate/test_basic.py @@ -17,10 +17,10 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.designate import basic +from rally_openstack.scenarios.designate import basic from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.designate.basic" +BASE = "rally_openstack.scenarios.designate.basic" class DesignateBasicTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/designate/test_utils.py b/tests/unit/scenarios/designate/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/designate/test_utils.py rename to tests/unit/scenarios/designate/test_utils.py index bb5f6386..7c97aaa0 100644 --- a/tests/unit/plugins/openstack/scenarios/designate/test_utils.py +++ b/tests/unit/scenarios/designate/test_utils.py @@ -17,10 +17,10 @@ import ddt import mock -from rally.plugins.openstack.scenarios.designate import utils +from rally_openstack.scenarios.designate import utils from tests.unit import test -DESIGNATE_UTILS = "rally.plugins.openstack.scenarios.designate.utils." +DESIGNATE_UTILS = "rally_openstack.scenarios.designate.utils." @ddt.ddt diff --git a/tests/unit/plugins/openstack/scenarios/ceilometer/__init__.py b/tests/unit/scenarios/ec2/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/ceilometer/__init__.py rename to tests/unit/scenarios/ec2/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py b/tests/unit/scenarios/ec2/test_servers.py similarity index 95% rename from tests/unit/plugins/openstack/scenarios/ec2/test_servers.py rename to tests/unit/scenarios/ec2/test_servers.py index c80f0543..a34864c3 100644 --- a/tests/unit/plugins/openstack/scenarios/ec2/test_servers.py +++ b/tests/unit/scenarios/ec2/test_servers.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.ec2 import servers +from rally_openstack.scenarios.ec2 import servers from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py b/tests/unit/scenarios/ec2/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/ec2/test_utils.py rename to tests/unit/scenarios/ec2/test_utils.py index 69a241bf..a2bcb3fa 100644 --- a/tests/unit/plugins/openstack/scenarios/ec2/test_utils.py +++ b/tests/unit/scenarios/ec2/test_utils.py @@ -15,7 +15,7 @@ import mock from rally.common import cfg -from rally.plugins.openstack.scenarios.ec2 import utils +from rally_openstack.scenarios.ec2 import utils from tests.unit import test CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/scenarios/cinder/__init__.py b/tests/unit/scenarios/glance/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/cinder/__init__.py rename to tests/unit/scenarios/glance/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/glance/test_images.py b/tests/unit/scenarios/glance/test_images.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/glance/test_images.py rename to tests/unit/scenarios/glance/test_images.py index 9b90c3a8..7eac045b 100644 --- a/tests/unit/plugins/openstack/scenarios/glance/test_images.py +++ b/tests/unit/scenarios/glance/test_images.py @@ -16,12 +16,12 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.glance import images +from rally_openstack.scenarios.glance import images from tests.unit import fakes from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.glance.images" -GLANCE_V2_PATH = ("rally.plugins.openstack.services.image.glance_v2." +BASE = "rally_openstack.scenarios.glance.images" +GLANCE_V2_PATH = ("rally_openstack.services.image.glance_v2." "GlanceV2Service") @@ -46,7 +46,7 @@ class GlanceBasicTestCase(test.ScenarioTestCase): def setUp(self): super(GlanceBasicTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.image.image.Image") + "rally_openstack.services.image.image.Image") self.addCleanup(patch.stop) self.mock_image = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py b/tests/unit/scenarios/glance/test_utils.py similarity index 93% rename from tests/unit/plugins/openstack/scenarios/glance/test_utils.py rename to tests/unit/scenarios/glance/test_utils.py index 8824386e..da1d8c3b 100644 --- a/tests/unit/plugins/openstack/scenarios/glance/test_utils.py +++ b/tests/unit/scenarios/glance/test_utils.py @@ -17,10 +17,10 @@ import tempfile import ddt import mock -from rally.plugins.openstack.scenarios.glance import utils +from rally_openstack.scenarios.glance import utils from tests.unit import test -GLANCE_UTILS = "rally.plugins.openstack.scenarios.glance.utils" +GLANCE_UTILS = "rally_openstack.scenarios.glance.utils" @ddt.ddt @@ -48,7 +48,7 @@ class GlanceScenarioTestCase(test.ScenarioTestCase): {"name": ""}, {"name": "bar", "fakearg": "fakearg"}, {"fakearg": "fakearg"}) - @mock.patch("rally.plugins.openstack.wrappers.glance.wrap") + @mock.patch("rally_openstack.wrappers.glance.wrap") def test_create_image(self, create_args, mock_wrap): image_location = tempfile.NamedTemporaryFile() mock_wrap.return_value.create_image.return_value = self.image @@ -73,7 +73,7 @@ class GlanceScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(scenario.atomic_actions(), "glance.create_image") - @mock.patch("rally.plugins.openstack.wrappers.glance.wrap") + @mock.patch("rally_openstack.wrappers.glance.wrap") def test_delete_image(self, mock_wrap): deleted_image = mock.Mock(status="DELETED") wrapper = mock_wrap.return_value diff --git a/tests/unit/plugins/openstack/scenarios/designate/__init__.py b/tests/unit/scenarios/gnocchi/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/designate/__init__.py rename to tests/unit/scenarios/gnocchi/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/gnocchi/test_capabilities.py b/tests/unit/scenarios/gnocchi/test_capabilities.py similarity index 90% rename from tests/unit/plugins/openstack/scenarios/gnocchi/test_capabilities.py rename to tests/unit/scenarios/gnocchi/test_capabilities.py index bd25162b..21782f08 100644 --- a/tests/unit/plugins/openstack/scenarios/gnocchi/test_capabilities.py +++ b/tests/unit/scenarios/gnocchi/test_capabilities.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.gnocchi import capabilities +from rally_openstack.scenarios.gnocchi import capabilities from tests.unit import test @@ -34,7 +34,7 @@ class GnocchiCapabilitiesTestCase(test.ScenarioTestCase): def setUp(self): super(GnocchiCapabilitiesTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.gnocchi.metric.GnocchiService") + "rally_openstack.services.gnocchi.metric.GnocchiService") self.addCleanup(patch.stop) self.mock_metric = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/gnocchi/test_status.py b/tests/unit/scenarios/gnocchi/test_status.py similarity index 90% rename from tests/unit/plugins/openstack/scenarios/gnocchi/test_status.py rename to tests/unit/scenarios/gnocchi/test_status.py index 11bc3305..64dcd365 100644 --- a/tests/unit/plugins/openstack/scenarios/gnocchi/test_status.py +++ b/tests/unit/scenarios/gnocchi/test_status.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.gnocchi import status +from rally_openstack.scenarios.gnocchi import status from tests.unit import test @@ -33,7 +33,7 @@ class GnocchiStatusTestCase(test.ScenarioTestCase): def setUp(self): super(GnocchiStatusTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.gnocchi.metric.GnocchiService") + "rally_openstack.services.gnocchi.metric.GnocchiService") self.addCleanup(patch.stop) self.mock_metric = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/gnocchi/test_utils.py b/tests/unit/scenarios/gnocchi/test_utils.py similarity index 92% rename from tests/unit/plugins/openstack/scenarios/gnocchi/test_utils.py rename to tests/unit/scenarios/gnocchi/test_utils.py index 901935c4..7d0e366c 100644 --- a/tests/unit/plugins/openstack/scenarios/gnocchi/test_utils.py +++ b/tests/unit/scenarios/gnocchi/test_utils.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.scenarios.gnocchi import utils +from rally_openstack.scenarios.gnocchi import utils from tests.unit import test @@ -36,7 +36,7 @@ class GnocchiBaseTestCase(test.ScenarioTestCase): "name": "fake_tenant_name"} }) patch = mock.patch( - "rally.plugins.openstack.services.gnocchi.metric.GnocchiService") + "rally_openstack.services.gnocchi.metric.GnocchiService") self.addCleanup(patch.stop) self.mock_service = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/ec2/__init__.py b/tests/unit/scenarios/heat/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/ec2/__init__.py rename to tests/unit/scenarios/heat/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/heat/test_stacks.py b/tests/unit/scenarios/heat/test_stacks.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/heat/test_stacks.py rename to tests/unit/scenarios/heat/test_stacks.py index b877599b..3c40855e 100644 --- a/tests/unit/plugins/openstack/scenarios/heat/test_stacks.py +++ b/tests/unit/scenarios/heat/test_stacks.py @@ -16,10 +16,10 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.heat import stacks +from rally_openstack.scenarios.heat import stacks from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.heat.stacks" +BASE = "rally_openstack.scenarios.heat.stacks" class HeatStacksTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/heat/test_utils.py b/tests/unit/scenarios/heat/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/heat/test_utils.py rename to tests/unit/scenarios/heat/test_utils.py index 0bc7e30f..6fd0f1e4 100644 --- a/tests/unit/plugins/openstack/scenarios/heat/test_utils.py +++ b/tests/unit/scenarios/heat/test_utils.py @@ -16,10 +16,10 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.heat import utils +from rally_openstack.scenarios.heat import utils from tests.unit import test -HEAT_UTILS = "rally.plugins.openstack.scenarios.heat.utils" +HEAT_UTILS = "rally_openstack.scenarios.heat.utils" CONF = utils.CONF diff --git a/tests/unit/plugins/openstack/scenarios/glance/__init__.py b/tests/unit/scenarios/ironic/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/glance/__init__.py rename to tests/unit/scenarios/ironic/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/ironic/test_nodes.py b/tests/unit/scenarios/ironic/test_nodes.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/ironic/test_nodes.py rename to tests/unit/scenarios/ironic/test_nodes.py index 76096525..1c31e28c 100644 --- a/tests/unit/plugins/openstack/scenarios/ironic/test_nodes.py +++ b/tests/unit/scenarios/ironic/test_nodes.py @@ -16,7 +16,7 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.ironic import nodes +from rally_openstack.scenarios.ironic import nodes from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/ironic/test_utils.py b/tests/unit/scenarios/ironic/test_utils.py similarity index 95% rename from tests/unit/plugins/openstack/scenarios/ironic/test_utils.py rename to tests/unit/scenarios/ironic/test_utils.py index 609fe9fe..1ddddcd8 100644 --- a/tests/unit/plugins/openstack/scenarios/ironic/test_utils.py +++ b/tests/unit/scenarios/ironic/test_utils.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.ironic import utils +from rally_openstack.scenarios.ironic import utils from tests.unit import test -IRONIC_UTILS = "rally.plugins.openstack.scenarios.ironic.utils" +IRONIC_UTILS = "rally_openstack.scenarios.ironic.utils" class IronicScenarioTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/gnocchi/__init__.py b/tests/unit/scenarios/keystone/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/gnocchi/__init__.py rename to tests/unit/scenarios/keystone/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/keystone/test_basic.py b/tests/unit/scenarios/keystone/test_basic.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/keystone/test_basic.py rename to tests/unit/scenarios/keystone/test_basic.py index fe1f9b9b..9ea76f1c 100755 --- a/tests/unit/plugins/openstack/scenarios/keystone/test_basic.py +++ b/tests/unit/scenarios/keystone/test_basic.py @@ -17,7 +17,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.scenarios.keystone import basic +from rally_openstack.scenarios.keystone import basic from tests.unit import test @@ -43,7 +43,7 @@ class KeystoneBasicTestCase(test.ScenarioTestCase): def setUp(self): super(KeystoneBasicTestCase, self).setUp() patch = mock.patch( - "rally.plugins.openstack.services.identity.identity.Identity") + "rally_openstack.services.identity.identity.Identity") self.addCleanup(patch.stop) self.mock_identity = patch.start() diff --git a/tests/unit/plugins/openstack/scenarios/keystone/test_utils.py b/tests/unit/scenarios/keystone/test_utils.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/keystone/test_utils.py rename to tests/unit/scenarios/keystone/test_utils.py index b0c10baa..5061b5b9 100644 --- a/tests/unit/plugins/openstack/scenarios/keystone/test_utils.py +++ b/tests/unit/scenarios/keystone/test_utils.py @@ -16,11 +16,11 @@ import ddt import mock -from rally.plugins.openstack.scenarios.keystone import utils +from rally_openstack.scenarios.keystone import utils from tests.unit import fakes from tests.unit import test -UTILS = "rally.plugins.openstack.scenarios.keystone.utils." +UTILS = "rally_openstack.scenarios.keystone.utils." @ddt.ddt @@ -81,7 +81,7 @@ class KeystoneScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(scenario.atomic_actions(), "keystone.token_authenticate") - @mock.patch("rally.plugins.openstack.wrappers.keystone.wrap") + @mock.patch("rally_openstack.wrappers.keystone.wrap") def test_role_create(self, mock_wrap, **kwargs): role = mock.MagicMock() mock_wrap.return_value.create_role.return_value = role @@ -97,7 +97,7 @@ class KeystoneScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(scenario.atomic_actions(), "keystone.create_role") - @mock.patch("rally.plugins.openstack.wrappers.keystone.wrap") + @mock.patch("rally_openstack.wrappers.keystone.wrap") def test_role_delete(self, mock_wrap): role = mock.MagicMock() scenario = utils.KeystoneScenario(self.context) @@ -312,7 +312,7 @@ class KeystoneScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(scenario.atomic_actions(), "keystone.update_user_password") - @mock.patch("rally.plugins.openstack.scenario.OpenStackScenario." + @mock.patch("rally_openstack.scenario.OpenStackScenario." "admin_clients") def test_update_user_password_v3(self, mock_open_stack_scenario_admin_clients): diff --git a/tests/unit/plugins/openstack/scenarios/heat/__init__.py b/tests/unit/scenarios/magnum/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/heat/__init__.py rename to tests/unit/scenarios/magnum/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/magnum/test_cluster_templates.py b/tests/unit/scenarios/magnum/test_cluster_templates.py similarity index 93% rename from tests/unit/plugins/openstack/scenarios/magnum/test_cluster_templates.py rename to tests/unit/scenarios/magnum/test_cluster_templates.py index b837c0c3..279ed874 100644 --- a/tests/unit/plugins/openstack/scenarios/magnum/test_cluster_templates.py +++ b/tests/unit/scenarios/magnum/test_cluster_templates.py @@ -15,7 +15,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.magnum import cluster_templates +from rally_openstack.scenarios.magnum import cluster_templates from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/magnum/test_clusters.py b/tests/unit/scenarios/magnum/test_clusters.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/magnum/test_clusters.py rename to tests/unit/scenarios/magnum/test_clusters.py index 62f380c4..b8e3ab22 100644 --- a/tests/unit/plugins/openstack/scenarios/magnum/test_clusters.py +++ b/tests/unit/scenarios/magnum/test_clusters.py @@ -16,7 +16,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.scenarios.magnum import clusters +from rally_openstack.scenarios.magnum import clusters from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/magnum/test_k8s_pods.py b/tests/unit/scenarios/magnum/test_k8s_pods.py similarity index 90% rename from tests/unit/plugins/openstack/scenarios/magnum/test_k8s_pods.py rename to tests/unit/scenarios/magnum/test_k8s_pods.py index 236557ef..037e7cf6 100644 --- a/tests/unit/plugins/openstack/scenarios/magnum/test_k8s_pods.py +++ b/tests/unit/scenarios/magnum/test_k8s_pods.py @@ -16,7 +16,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.scenarios.magnum import k8s_pods +from rally_openstack.scenarios.magnum import k8s_pods from tests.unit import test @@ -43,7 +43,7 @@ class K8sPodsTestCase(test.ScenarioTestCase): scenario._create_v1pod = mock.MagicMock(return_value=fake_pod) with mock.patch( - "rally.plugins.openstack.scenarios.magnum.k8s_pods.open", + "rally_openstack.scenarios.magnum.k8s_pods.open", file_mock, create=True) as m: scenario.run(manifests) @@ -57,7 +57,7 @@ class K8sPodsTestCase(test.ScenarioTestCase): scenario._create_v1pod = mock.MagicMock(return_value=None) with mock.patch( - "rally.plugins.openstack.scenarios.magnum.k8s_pods.open", + "rally_openstack.scenarios.magnum.k8s_pods.open", file_mock, create=True) as m: self.assertRaises( exceptions.RallyAssertionError, @@ -80,7 +80,7 @@ class K8sPodsTestCase(test.ScenarioTestCase): scenario._create_v1rc = mock.MagicMock(return_value=fake_rc) with mock.patch( - "rally.plugins.openstack.scenarios.magnum.k8s_pods.open", + "rally_openstack.scenarios.magnum.k8s_pods.open", file_mock, create=True) as m: scenario.run(manifests) @@ -93,7 +93,7 @@ class K8sPodsTestCase(test.ScenarioTestCase): scenario._create_v1rc = mock.MagicMock(return_value=None) with mock.patch( - "rally.plugins.openstack.scenarios.magnum.k8s_pods.open", + "rally_openstack.scenarios.magnum.k8s_pods.open", file_mock, create=True) as m: self.assertRaises( exceptions.RallyAssertionError, diff --git a/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py b/tests/unit/scenarios/magnum/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/magnum/test_utils.py rename to tests/unit/scenarios/magnum/test_utils.py index f4ea362e..10e2b6d8 100644 --- a/tests/unit/plugins/openstack/scenarios/magnum/test_utils.py +++ b/tests/unit/scenarios/magnum/test_utils.py @@ -19,10 +19,10 @@ import mock from kubernetes.client import api_client from kubernetes.client.rest import ApiException from rally import exceptions -from rally.plugins.openstack.scenarios.magnum import utils +from rally_openstack.scenarios.magnum import utils from tests.unit import test -MAGNUM_UTILS = "rally.plugins.openstack.scenarios.magnum.utils" +MAGNUM_UTILS = "rally_openstack.scenarios.magnum.utils" CONF = utils.CONF diff --git a/tests/unit/plugins/openstack/scenarios/ironic/__init__.py b/tests/unit/scenarios/manila/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/ironic/__init__.py rename to tests/unit/scenarios/manila/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/manila/test_shares.py b/tests/unit/scenarios/manila/test_shares.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/manila/test_shares.py rename to tests/unit/scenarios/manila/test_shares.py index a2d32cc5..2945939a 100644 --- a/tests/unit/plugins/openstack/scenarios/manila/test_shares.py +++ b/tests/unit/scenarios/manila/test_shares.py @@ -16,7 +16,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.manila import shares +from rally_openstack.scenarios.manila import shares from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py b/tests/unit/scenarios/manila/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/manila/test_utils.py rename to tests/unit/scenarios/manila/test_utils.py index 573f5c3b..6482c3bc 100644 --- a/tests/unit/plugins/openstack/scenarios/manila/test_utils.py +++ b/tests/unit/scenarios/manila/test_utils.py @@ -17,8 +17,8 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.context.manila import consts -from rally.plugins.openstack.scenarios.manila import utils +from rally_openstack.contexts.manila import consts +from rally_openstack.scenarios.manila import utils from tests.unit import test BM_UTILS = "rally.task.utils." diff --git a/tests/unit/plugins/openstack/scenarios/keystone/__init__.py b/tests/unit/scenarios/mistral/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/keystone/__init__.py rename to tests/unit/scenarios/mistral/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/mistral/test_executions.py b/tests/unit/scenarios/mistral/test_executions.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/mistral/test_executions.py rename to tests/unit/scenarios/mistral/test_executions.py index dbd49fa6..6c99d626 100644 --- a/tests/unit/plugins/openstack/scenarios/mistral/test_executions.py +++ b/tests/unit/scenarios/mistral/test_executions.py @@ -15,11 +15,11 @@ import mock -from rally.plugins.openstack.scenarios.mistral import executions +from rally_openstack.scenarios.mistral import executions from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.mistral.executions" -MISTRAL_WBS_BASE = "rally.plugins.openstack.scenarios.mistral.workbooks" +BASE = "rally_openstack.scenarios.mistral.executions" +MISTRAL_WBS_BASE = "rally_openstack.scenarios.mistral.workbooks" WB_DEFINITION = """--- diff --git a/tests/unit/plugins/openstack/scenarios/mistral/test_utils.py b/tests/unit/scenarios/mistral/test_utils.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/mistral/test_utils.py rename to tests/unit/scenarios/mistral/test_utils.py index 0b9a5a96..d660622d 100644 --- a/tests/unit/plugins/openstack/scenarios/mistral/test_utils.py +++ b/tests/unit/scenarios/mistral/test_utils.py @@ -14,11 +14,11 @@ # under the License. -from rally.plugins.openstack.scenarios.mistral import utils +from rally_openstack.scenarios.mistral import utils from tests.unit import fakes from tests.unit import test -MISTRAL_UTILS = "rally.plugins.openstack.scenarios.mistral.utils" +MISTRAL_UTILS = "rally_openstack.scenarios.mistral.utils" PARAMS_EXAMPLE = {"env": {"env_param": "param_value"}} INPUT_EXAMPLE = """{"input1": "value1", "some_json_input": {"a": "b"}}""" diff --git a/tests/unit/plugins/openstack/scenarios/mistral/test_workbooks.py b/tests/unit/scenarios/mistral/test_workbooks.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/mistral/test_workbooks.py rename to tests/unit/scenarios/mistral/test_workbooks.py index 4309c735..2b543858 100644 --- a/tests/unit/plugins/openstack/scenarios/mistral/test_workbooks.py +++ b/tests/unit/scenarios/mistral/test_workbooks.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.mistral import workbooks +from rally_openstack.scenarios.mistral import workbooks from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.mistral.workbooks" +BASE = "rally_openstack.scenarios.mistral.workbooks" class MistralWorkbooksTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/magnum/__init__.py b/tests/unit/scenarios/monasca/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/magnum/__init__.py rename to tests/unit/scenarios/monasca/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/monasca/test_metrics.py b/tests/unit/scenarios/monasca/test_metrics.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/monasca/test_metrics.py rename to tests/unit/scenarios/monasca/test_metrics.py index 2c407ae4..814e69ce 100644 --- a/tests/unit/plugins/openstack/scenarios/monasca/test_metrics.py +++ b/tests/unit/scenarios/monasca/test_metrics.py @@ -15,7 +15,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.monasca import metrics +from rally_openstack.scenarios.monasca import metrics from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/monasca/test_utils.py b/tests/unit/scenarios/monasca/test_utils.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/monasca/test_utils.py rename to tests/unit/scenarios/monasca/test_utils.py index 18891b8e..77c09732 100644 --- a/tests/unit/plugins/openstack/scenarios/monasca/test_utils.py +++ b/tests/unit/scenarios/monasca/test_utils.py @@ -14,7 +14,7 @@ import ddt -from rally.plugins.openstack.scenarios.monasca import utils +from rally_openstack.scenarios.monasca import utils from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/manila/__init__.py b/tests/unit/scenarios/murano/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/manila/__init__.py rename to tests/unit/scenarios/murano/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/murano/test_environments.py b/tests/unit/scenarios/murano/test_environments.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/murano/test_environments.py rename to tests/unit/scenarios/murano/test_environments.py index 4b3933a6..bc12897b 100644 --- a/tests/unit/plugins/openstack/scenarios/murano/test_environments.py +++ b/tests/unit/scenarios/murano/test_environments.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.murano import environments +from rally_openstack.scenarios.murano import environments from tests.unit import test -MURANO_SCENARIO = ("rally.plugins.openstack.scenarios.murano." +MURANO_SCENARIO = ("rally_openstack.scenarios.murano." "environments") diff --git a/tests/unit/plugins/openstack/scenarios/murano/test_packages.py b/tests/unit/scenarios/murano/test_packages.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/murano/test_packages.py rename to tests/unit/scenarios/murano/test_packages.py index 160dc349..65a462c5 100644 --- a/tests/unit/plugins/openstack/scenarios/murano/test_packages.py +++ b/tests/unit/scenarios/murano/test_packages.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.murano import packages +from rally_openstack.scenarios.murano import packages from tests.unit import test -MURANO_SCENARIO = ("rally.plugins.openstack.scenarios.murano." +MURANO_SCENARIO = ("rally_openstack.scenarios.murano." "packages.MuranoPackages") diff --git a/tests/unit/plugins/openstack/scenarios/murano/test_utils.py b/tests/unit/scenarios/murano/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/murano/test_utils.py rename to tests/unit/scenarios/murano/test_utils.py index 311dd69c..bf81be0d 100644 --- a/tests/unit/plugins/openstack/scenarios/murano/test_utils.py +++ b/tests/unit/scenarios/murano/test_utils.py @@ -16,10 +16,10 @@ import mock from rally.common import cfg -from rally.plugins.openstack.scenarios.murano import utils +from rally_openstack.scenarios.murano import utils from tests.unit import test -MRN_UTILS = "rally.plugins.openstack.scenarios.murano.utils" +MRN_UTILS = "rally_openstack.scenarios.murano.utils" CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/scenarios/mistral/__init__.py b/tests/unit/scenarios/neutron/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/mistral/__init__.py rename to tests/unit/scenarios/neutron/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_bgpvpn.py b/tests/unit/scenarios/neutron/test_bgpvpn.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/neutron/test_bgpvpn.py rename to tests/unit/scenarios/neutron/test_bgpvpn.py index 31e7ddb0..2fb75943 100644 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_bgpvpn.py +++ b/tests/unit/scenarios/neutron/test_bgpvpn.py @@ -13,7 +13,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.neutron import bgpvpn +from rally_openstack.scenarios.neutron import bgpvpn from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v1.py b/tests/unit/scenarios/neutron/test_loadbalancer_v1.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v1.py rename to tests/unit/scenarios/neutron/test_loadbalancer_v1.py index d1581905..227f20c5 100644 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v1.py +++ b/tests/unit/scenarios/neutron/test_loadbalancer_v1.py @@ -13,7 +13,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.neutron import loadbalancer_v1 +from rally_openstack.scenarios.neutron import loadbalancer_v1 from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v2.py b/tests/unit/scenarios/neutron/test_loadbalancer_v2.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v2.py rename to tests/unit/scenarios/neutron/test_loadbalancer_v2.py index 565f8595..7d6f3779 100755 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_loadbalancer_v2.py +++ b/tests/unit/scenarios/neutron/test_loadbalancer_v2.py @@ -13,7 +13,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.neutron import loadbalancer_v2 +from rally_openstack.scenarios.neutron import loadbalancer_v2 from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_network.py b/tests/unit/scenarios/neutron/test_network.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/neutron/test_network.py rename to tests/unit/scenarios/neutron/test_network.py index aee7c517..8daaf95c 100644 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_network.py +++ b/tests/unit/scenarios/neutron/test_network.py @@ -17,10 +17,10 @@ import ddt import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.neutron import network +from rally_openstack.scenarios.neutron import network from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.neutron.network" +BASE = "rally_openstack.scenarios.neutron.network" @ddt.ddt diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_security_groups.py b/tests/unit/scenarios/neutron/test_security_groups.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/neutron/test_security_groups.py rename to tests/unit/scenarios/neutron/test_security_groups.py index 5d305416..d3911b5b 100644 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_security_groups.py +++ b/tests/unit/scenarios/neutron/test_security_groups.py @@ -14,7 +14,7 @@ import ddt import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.neutron import security_groups +from rally_openstack.scenarios.neutron import security_groups from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/neutron/test_utils.py b/tests/unit/scenarios/neutron/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/neutron/test_utils.py rename to tests/unit/scenarios/neutron/test_utils.py index 58819949..ba7f5ccb 100644 --- a/tests/unit/plugins/openstack/scenarios/neutron/test_utils.py +++ b/tests/unit/scenarios/neutron/test_utils.py @@ -17,10 +17,10 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.scenarios.neutron import utils +from rally_openstack.scenarios.neutron import utils from tests.unit import test -NEUTRON_UTILS = "rally.plugins.openstack.scenarios.neutron.utils" +NEUTRON_UTILS = "rally_openstack.scenarios.neutron.utils" @ddt.ddt diff --git a/tests/unit/plugins/openstack/scenarios/monasca/__init__.py b/tests/unit/scenarios/nova/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/monasca/__init__.py rename to tests/unit/scenarios/nova/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_agents.py b/tests/unit/scenarios/nova/test_agents.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/nova/test_agents.py rename to tests/unit/scenarios/nova/test_agents.py index b4d37362..92a0e2eb 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_agents.py +++ b/tests/unit/scenarios/nova/test_agents.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import agents +from rally_openstack.scenarios.nova import agents from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_aggregates.py b/tests/unit/scenarios/nova/test_aggregates.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/nova/test_aggregates.py rename to tests/unit/scenarios/nova/test_aggregates.py index 632575bc..93f42ab4 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_aggregates.py +++ b/tests/unit/scenarios/nova/test_aggregates.py @@ -16,7 +16,7 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.nova import aggregates +from rally_openstack.scenarios.nova import aggregates from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_availability_zones.py b/tests/unit/scenarios/nova/test_availability_zones.py similarity index 93% rename from tests/unit/plugins/openstack/scenarios/nova/test_availability_zones.py rename to tests/unit/scenarios/nova/test_availability_zones.py index 8cc66b39..41020ed2 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_availability_zones.py +++ b/tests/unit/scenarios/nova/test_availability_zones.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import availability_zones +from rally_openstack.scenarios.nova import availability_zones from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_flavors.py b/tests/unit/scenarios/nova/test_flavors.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/nova/test_flavors.py rename to tests/unit/scenarios/nova/test_flavors.py index abd619f0..948b1370 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_flavors.py +++ b/tests/unit/scenarios/nova/test_flavors.py @@ -17,7 +17,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.scenarios.nova import flavors +from rally_openstack.scenarios.nova import flavors from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_hosts.py b/tests/unit/scenarios/nova/test_hosts.py similarity index 96% rename from tests/unit/plugins/openstack/scenarios/nova/test_hosts.py rename to tests/unit/scenarios/nova/test_hosts.py index 8c912b44..b2965e5d 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_hosts.py +++ b/tests/unit/scenarios/nova/test_hosts.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import hosts +from rally_openstack.scenarios.nova import hosts from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_hypervisors.py b/tests/unit/scenarios/nova/test_hypervisors.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/nova/test_hypervisors.py rename to tests/unit/scenarios/nova/test_hypervisors.py index 9e77ebd4..00aae583 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_hypervisors.py +++ b/tests/unit/scenarios/nova/test_hypervisors.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import hypervisors +from rally_openstack.scenarios.nova import hypervisors from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_images.py b/tests/unit/scenarios/nova/test_images.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/nova/test_images.py rename to tests/unit/scenarios/nova/test_images.py index 26136dd2..16401174 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_images.py +++ b/tests/unit/scenarios/nova/test_images.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import images +from rally_openstack.scenarios.nova import images from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_keypairs.py b/tests/unit/scenarios/nova/test_keypairs.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/nova/test_keypairs.py rename to tests/unit/scenarios/nova/test_keypairs.py index 4b20c6ad..6c426b36 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_keypairs.py +++ b/tests/unit/scenarios/nova/test_keypairs.py @@ -16,7 +16,7 @@ import mock from rally import exceptions -from rally.plugins.openstack.scenarios.nova import keypairs +from rally_openstack.scenarios.nova import keypairs from tests.unit import fakes from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_server_groups.py b/tests/unit/scenarios/nova/test_server_groups.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/nova/test_server_groups.py rename to tests/unit/scenarios/nova/test_server_groups.py index d4dc7798..20e58303 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_server_groups.py +++ b/tests/unit/scenarios/nova/test_server_groups.py @@ -17,10 +17,10 @@ import ddt import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.nova import server_groups +from rally_openstack.scenarios.nova import server_groups from tests.unit import test -SERVER_GROUPS_MODULE = "rally.plugins.openstack.scenarios.nova.server_groups" +SERVER_GROUPS_MODULE = "rally_openstack.scenarios.nova.server_groups" NOVA_SERVER_GROUPS = SERVER_GROUPS_MODULE + ".NovaServerGroups" diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_servers.py b/tests/unit/scenarios/nova/test_servers.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/nova/test_servers.py rename to tests/unit/scenarios/nova/test_servers.py index 5e628b5f..8526a103 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_servers.py +++ b/tests/unit/scenarios/nova/test_servers.py @@ -17,12 +17,12 @@ import ddt import mock from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.nova import servers +from rally_openstack.scenarios.nova import servers from tests.unit import fakes from tests.unit import test -NOVA_SERVERS_MODULE = "rally.plugins.openstack.scenarios.nova.servers" +NOVA_SERVERS_MODULE = "rally_openstack.scenarios.nova.servers" NOVA_SERVERS = NOVA_SERVERS_MODULE + ".NovaServers" @@ -345,7 +345,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario.run(True) scenario._list_servers.assert_called_once_with(True) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_from_volume(self, mock_block_storage): fake_server = object() scenario = servers.BootServerFromVolume( @@ -367,7 +367,7 @@ class NovaServersTestCase(test.ScenarioTestCase): block_device_mapping={"vda": "volume_id:::1"}, fakearg="f") - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_from_volume_and_delete(self, mock_block_storage): fake_server = object() scenario = servers.BootServerFromVolumeAndDelete( @@ -517,7 +517,7 @@ class NovaServersTestCase(test.ScenarioTestCase): @ddt.data({"confirm": True, "do_delete": True}, {"confirm": False, "do_delete": True}) @ddt.unpack - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_attach_created_volume_and_resize( self, mock_block_storage, confirm=False, do_delete=False): fake_volume = mock.MagicMock() @@ -566,7 +566,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._delete_server.assert_called_once_with(fake_server, force=False) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_list_attachments(self, mock_block_storage): mock_volume_service = mock_block_storage.return_value fake_volume = mock.MagicMock() @@ -608,7 +608,7 @@ class NovaServersTestCase(test.ScenarioTestCase): fake_volume) scenario._list_attachments.assert_called_once_with(fake_server.id) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_list_attachments_fails(self, mock_block_storage): mock_volume_service = mock_block_storage.return_value fake_volume = mock.MagicMock() @@ -657,7 +657,7 @@ class NovaServersTestCase(test.ScenarioTestCase): @ddt.data({"confirm": True, "do_delete": True}, {"confirm": False, "do_delete": True}) @ddt.unpack - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_from_volume_and_resize( self, mock_block_storage, confirm=False, do_delete=False): fake_server = object() @@ -719,7 +719,7 @@ class NovaServersTestCase(test.ScenarioTestCase): False, False) scenario._delete_server.assert_called_once_with(fake_server) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_from_volume_and_live_migrate(self, mock_block_storage): fake_server = mock.MagicMock() @@ -755,7 +755,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._delete_server.assert_called_once_with(fake_server, force=False) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_attach_created_volume_and_live_migrate( self, mock_block_storage): fake_volume = mock.MagicMock() @@ -1002,7 +1002,7 @@ class NovaServersTestCase(test.ScenarioTestCase): scenario._attach_interface.assert_called_once_with( server, net_id=net["network"]["id"]) - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test_boot_server_from_volume_snapshot(self, mock_block_storage): fake_volume = mock.MagicMock(id="volume_id") fake_snapshot = mock.MagicMock(id="snapshot_id") diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_services.py b/tests/unit/scenarios/nova/test_services.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/nova/test_services.py rename to tests/unit/scenarios/nova/test_services.py index 16adae32..68239da8 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_services.py +++ b/tests/unit/scenarios/nova/test_services.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.nova import services +from rally_openstack.scenarios.nova import services from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py b/tests/unit/scenarios/nova/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/nova/test_utils.py rename to tests/unit/scenarios/nova/test_utils.py index 6c5257e3..5a02ecc3 100644 --- a/tests/unit/plugins/openstack/scenarios/nova/test_utils.py +++ b/tests/unit/scenarios/nova/test_utils.py @@ -18,12 +18,12 @@ import mock from rally.common import cfg from rally import exceptions as rally_exceptions -from rally.plugins.openstack.scenarios.nova import utils +from rally_openstack.scenarios.nova import utils from tests.unit import fakes from tests.unit import test BM_UTILS = "rally.task.utils" -NOVA_UTILS = "rally.plugins.openstack.scenarios.nova.utils" +NOVA_UTILS = "rally_openstack.scenarios.nova.utils" CONF = cfg.CONF @@ -231,7 +231,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(nova_scenario.atomic_actions(), "nova.unshelve_server") - @mock.patch("rally.plugins.openstack.scenarios.nova.utils.image_service") + @mock.patch("rally_openstack.scenarios.nova.utils.image_service") def test__create_image(self, mock_image_service): glance = mock_image_service.Image.return_value glance.get_image.return_value = self.image @@ -409,7 +409,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): def test__force_delete_servers(self): self._test_delete_servers(force=True) - @mock.patch("rally.plugins.openstack.scenarios.nova.utils.image_service") + @mock.patch("rally_openstack.scenarios.nova.utils.image_service") def test__delete_image(self, mock_image_service): glance = mock_image_service.Image.return_value nova_scenario = utils.NovaScenario(context=self.context, @@ -595,7 +595,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(nova_scenario.atomic_actions(), "nova.resize_revert") - @mock.patch("rally.plugins.openstack.services.storage.block.BlockStorage") + @mock.patch("rally_openstack.services.storage.block.BlockStorage") def test__update_volume_resource(self, mock_block_storage): volume = fakes.FakeVolume(id=1) cinder = mock_block_storage.return_value @@ -858,7 +858,7 @@ class NovaScenarioTestCase(test.ScenarioTestCase): self._test_atomic_action_timer(nova_scenario.atomic_actions(), "nova.list_interfaces") - @mock.patch("rally.plugins.openstack.scenarios.nova.utils.image_service") + @mock.patch("rally_openstack.scenarios.nova.utils.image_service") def test__list_images(self, mock_image_service): result = utils.NovaScenario(clients=mock.Mock())._list_images() glance = mock_image_service.Image.return_value diff --git a/tests/unit/plugins/openstack/scenarios/murano/__init__.py b/tests/unit/scenarios/quotas/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/murano/__init__.py rename to tests/unit/scenarios/quotas/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/quotas/test_quotas.py b/tests/unit/scenarios/quotas/test_quotas.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/quotas/test_quotas.py rename to tests/unit/scenarios/quotas/test_quotas.py index b9c023e4..20602775 100644 --- a/tests/unit/plugins/openstack/scenarios/quotas/test_quotas.py +++ b/tests/unit/scenarios/quotas/test_quotas.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.quotas import quotas +from rally_openstack.scenarios.quotas import quotas from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/quotas/test_utils.py b/tests/unit/scenarios/quotas/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/quotas/test_utils.py rename to tests/unit/scenarios/quotas/test_utils.py index 090e5ffe..80977133 100644 --- a/tests/unit/plugins/openstack/scenarios/quotas/test_utils.py +++ b/tests/unit/scenarios/quotas/test_utils.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.quotas import utils +from rally_openstack.scenarios.quotas import utils from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/neutron/__init__.py b/tests/unit/scenarios/sahara/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/neutron/__init__.py rename to tests/unit/scenarios/sahara/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/sahara/test_clusters.py b/tests/unit/scenarios/sahara/test_clusters.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/sahara/test_clusters.py rename to tests/unit/scenarios/sahara/test_clusters.py index d4999f04..74e5e49b 100644 --- a/tests/unit/plugins/openstack/scenarios/sahara/test_clusters.py +++ b/tests/unit/scenarios/sahara/test_clusters.py @@ -15,10 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.sahara import clusters +from rally_openstack.scenarios.sahara import clusters from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.sahara.clusters" +BASE = "rally_openstack.scenarios.sahara.clusters" class SaharaClustersTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/sahara/test_jobs.py b/tests/unit/scenarios/sahara/test_jobs.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/sahara/test_jobs.py rename to tests/unit/scenarios/sahara/test_jobs.py index ae0552c7..664284d9 100644 --- a/tests/unit/plugins/openstack/scenarios/sahara/test_jobs.py +++ b/tests/unit/scenarios/sahara/test_jobs.py @@ -16,12 +16,12 @@ import mock from rally.common import cfg -from rally.plugins.openstack.scenarios.sahara import jobs +from rally_openstack.scenarios.sahara import jobs from tests.unit import test CONF = cfg.CONF -BASE = "rally.plugins.openstack.scenarios.sahara.jobs" +BASE = "rally_openstack.scenarios.sahara.jobs" class SaharaJobTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/sahara/test_node_group_templates.py b/tests/unit/scenarios/sahara/test_node_group_templates.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/sahara/test_node_group_templates.py rename to tests/unit/scenarios/sahara/test_node_group_templates.py index c5ae0f22..03b46757 100644 --- a/tests/unit/plugins/openstack/scenarios/sahara/test_node_group_templates.py +++ b/tests/unit/scenarios/sahara/test_node_group_templates.py @@ -15,11 +15,10 @@ import mock -from rally.plugins.openstack.scenarios.sahara import (node_group_templates - as ngts) +from rally_openstack.scenarios.sahara import node_group_templates as ngts from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.sahara.node_group_templates" +BASE = "rally_openstack.scenarios.sahara.node_group_templates" class SaharaNodeGroupTemplatesTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/scenarios/sahara/test_utils.py b/tests/unit/scenarios/sahara/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/sahara/test_utils.py rename to tests/unit/scenarios/sahara/test_utils.py index 65b85070..b3ad6beb 100644 --- a/tests/unit/plugins/openstack/scenarios/sahara/test_utils.py +++ b/tests/unit/scenarios/sahara/test_utils.py @@ -20,12 +20,12 @@ from saharaclient.api import base as sahara_base from rally.common import cfg from rally import consts from rally import exceptions -from rally.plugins.openstack.scenarios.sahara import utils +from rally_openstack.scenarios.sahara import utils from tests.unit import test CONF = cfg.CONF -SAHARA_UTILS = "rally.plugins.openstack.scenarios.sahara.utils" +SAHARA_UTILS = "rally_openstack.scenarios.sahara.utils" class SaharaScenarioTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/nova/__init__.py b/tests/unit/scenarios/senlin/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/nova/__init__.py rename to tests/unit/scenarios/senlin/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/senlin/test_clusters.py b/tests/unit/scenarios/senlin/test_clusters.py similarity index 95% rename from tests/unit/plugins/openstack/scenarios/senlin/test_clusters.py rename to tests/unit/scenarios/senlin/test_clusters.py index 92b26fcb..10d0437c 100644 --- a/tests/unit/plugins/openstack/scenarios/senlin/test_clusters.py +++ b/tests/unit/scenarios/senlin/test_clusters.py @@ -12,7 +12,7 @@ import mock -from rally.plugins.openstack.scenarios.senlin import clusters +from rally_openstack.scenarios.senlin import clusters from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/senlin/test_utils.py b/tests/unit/scenarios/senlin/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/senlin/test_utils.py rename to tests/unit/scenarios/senlin/test_utils.py index 5ca9c86c..812d4726 100644 --- a/tests/unit/plugins/openstack/scenarios/senlin/test_utils.py +++ b/tests/unit/scenarios/senlin/test_utils.py @@ -14,10 +14,10 @@ import mock from rally.common import cfg from rally import exceptions -from rally.plugins.openstack.scenarios.senlin import utils +from rally_openstack.scenarios.senlin import utils from tests.unit import test -SENLIN_UTILS = "rally.plugins.openstack.scenarios.senlin.utils." +SENLIN_UTILS = "rally_openstack.scenarios.senlin.utils." CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/scenarios/quotas/__init__.py b/tests/unit/scenarios/swift/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/quotas/__init__.py rename to tests/unit/scenarios/swift/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/swift/test_objects.py b/tests/unit/scenarios/swift/test_objects.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/swift/test_objects.py rename to tests/unit/scenarios/swift/test_objects.py index 9072e76c..baf4a53c 100644 --- a/tests/unit/plugins/openstack/scenarios/swift/test_objects.py +++ b/tests/unit/scenarios/swift/test_objects.py @@ -16,7 +16,7 @@ import ddt import mock -from rally.plugins.openstack.scenarios.swift import objects +from rally_openstack.scenarios.swift import objects from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/swift/test_utils.py b/tests/unit/scenarios/swift/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/swift/test_utils.py rename to tests/unit/scenarios/swift/test_utils.py index 500ddab5..17079b1a 100644 --- a/tests/unit/plugins/openstack/scenarios/swift/test_utils.py +++ b/tests/unit/scenarios/swift/test_utils.py @@ -16,10 +16,10 @@ import ddt import mock -from rally.plugins.openstack.scenarios.swift import utils +from rally_openstack.scenarios.swift import utils from tests.unit import test -SWIFT_UTILS = "rally.plugins.openstack.scenarios.swift.utils" +SWIFT_UTILS = "rally_openstack.scenarios.swift.utils" @ddt.ddt diff --git a/tests/unit/plugins/openstack/scenarios/sahara/__init__.py b/tests/unit/scenarios/vm/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/sahara/__init__.py rename to tests/unit/scenarios/vm/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/vm/test_utils.py b/tests/unit/scenarios/vm/test_utils.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/vm/test_utils.py rename to tests/unit/scenarios/vm/test_utils.py index ee8bd743..0b503ce5 100644 --- a/tests/unit/plugins/openstack/scenarios/vm/test_utils.py +++ b/tests/unit/scenarios/vm/test_utils.py @@ -20,10 +20,10 @@ import mock import netaddr from rally.common import cfg -from rally.plugins.openstack.scenarios.vm import utils +from rally_openstack.scenarios.vm import utils from tests.unit import test -VMTASKS_UTILS = "rally.plugins.openstack.scenarios.vm.utils" +VMTASKS_UTILS = "rally_openstack.scenarios.vm.utils" CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/scenarios/vm/test_vmtasks.py b/tests/unit/scenarios/vm/test_vmtasks.py similarity index 99% rename from tests/unit/plugins/openstack/scenarios/vm/test_vmtasks.py rename to tests/unit/scenarios/vm/test_vmtasks.py index d93f417a..98755e98 100644 --- a/tests/unit/plugins/openstack/scenarios/vm/test_vmtasks.py +++ b/tests/unit/scenarios/vm/test_vmtasks.py @@ -20,11 +20,11 @@ import mock from rally.common import validation from rally import exceptions -from rally.plugins.openstack.scenarios.vm import vmtasks +from rally_openstack.scenarios.vm import vmtasks from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.vm.vmtasks" +BASE = "rally_openstack.scenarios.vm.vmtasks" @ddt.ddt @@ -36,7 +36,7 @@ class VMTasksTestCase(test.ScenarioTestCase): "credential": mock.MagicMock()}}) cinder_patcher = mock.patch( - "rally.plugins.openstack.services.storage.block.BlockStorage") + "rally_openstack.services.storage.block.BlockStorage") self.cinder = cinder_patcher.start().return_value self.cinder.create_volume.return_value = mock.Mock(id="foo_volume") self.addCleanup(cinder_patcher.stop) diff --git a/tests/unit/plugins/openstack/scenarios/senlin/__init__.py b/tests/unit/scenarios/watcher/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/senlin/__init__.py rename to tests/unit/scenarios/watcher/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/watcher/test_basic.py b/tests/unit/scenarios/watcher/test_basic.py similarity index 97% rename from tests/unit/plugins/openstack/scenarios/watcher/test_basic.py rename to tests/unit/scenarios/watcher/test_basic.py index a83b6dfb..6b2fbb0e 100644 --- a/tests/unit/plugins/openstack/scenarios/watcher/test_basic.py +++ b/tests/unit/scenarios/watcher/test_basic.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack.scenarios.watcher import basic +from rally_openstack.scenarios.watcher import basic from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/watcher/test_utils.py b/tests/unit/scenarios/watcher/test_utils.py similarity index 98% rename from tests/unit/plugins/openstack/scenarios/watcher/test_utils.py rename to tests/unit/scenarios/watcher/test_utils.py index 6e3dc3b3..f2c69355 100644 --- a/tests/unit/plugins/openstack/scenarios/watcher/test_utils.py +++ b/tests/unit/scenarios/watcher/test_utils.py @@ -16,7 +16,7 @@ import mock from rally.common import cfg -from rally.plugins.openstack.scenarios.watcher import utils +from rally_openstack.scenarios.watcher import utils from tests.unit import test CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/scenarios/swift/__init__.py b/tests/unit/scenarios/zaqar/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/swift/__init__.py rename to tests/unit/scenarios/zaqar/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/zaqar/test_basic.py b/tests/unit/scenarios/zaqar/test_basic.py similarity index 94% rename from tests/unit/plugins/openstack/scenarios/zaqar/test_basic.py rename to tests/unit/scenarios/zaqar/test_basic.py index db4a0a80..e5411837 100644 --- a/tests/unit/plugins/openstack/scenarios/zaqar/test_basic.py +++ b/tests/unit/scenarios/zaqar/test_basic.py @@ -14,10 +14,10 @@ import mock -from rally.plugins.openstack.scenarios.zaqar import basic +from rally_openstack.scenarios.zaqar import basic from tests.unit import test -BASE = "rally.plugins.openstack.scenarios.zaqar.basic" +BASE = "rally_openstack.scenarios.zaqar.basic" class ZaqarBasicTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/zaqar/test_utils.py b/tests/unit/scenarios/zaqar/test_utils.py similarity index 95% rename from tests/unit/plugins/openstack/scenarios/zaqar/test_utils.py rename to tests/unit/scenarios/zaqar/test_utils.py index c762c156..34d957eb 100644 --- a/tests/unit/plugins/openstack/scenarios/zaqar/test_utils.py +++ b/tests/unit/scenarios/zaqar/test_utils.py @@ -14,11 +14,11 @@ import mock -from rally.plugins.openstack.scenarios.zaqar import utils +from rally_openstack.scenarios.zaqar import utils from tests.unit import fakes from tests.unit import test -UTILS = "rally.plugins.openstack.scenarios.zaqar.utils." +UTILS = "rally_openstack.scenarios.zaqar.utils." class ZaqarScenarioTestCase(test.ScenarioTestCase): diff --git a/tests/unit/plugins/openstack/scenarios/vm/__init__.py b/tests/unit/services/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/vm/__init__.py rename to tests/unit/services/__init__.py diff --git a/tests/unit/plugins/openstack/scenarios/watcher/__init__.py b/tests/unit/services/gnocchi/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/watcher/__init__.py rename to tests/unit/services/gnocchi/__init__.py diff --git a/tests/unit/plugins/openstack/services/gnocchi/test_metric.py b/tests/unit/services/gnocchi/test_metric.py similarity index 99% rename from tests/unit/plugins/openstack/services/gnocchi/test_metric.py rename to tests/unit/services/gnocchi/test_metric.py index 297e888b..16794c1e 100644 --- a/tests/unit/plugins/openstack/services/gnocchi/test_metric.py +++ b/tests/unit/services/gnocchi/test_metric.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.services.gnocchi import metric +from rally_openstack.services.gnocchi import metric from tests.unit import test diff --git a/tests/unit/plugins/openstack/scenarios/zaqar/__init__.py b/tests/unit/services/heat/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/scenarios/zaqar/__init__.py rename to tests/unit/services/heat/__init__.py diff --git a/tests/unit/plugins/openstack/services/heat/test_main.py b/tests/unit/services/heat/test_main.py similarity index 89% rename from tests/unit/plugins/openstack/services/heat/test_main.py rename to tests/unit/services/heat/test_main.py index 5c002556..35ec9697 100644 --- a/tests/unit/plugins/openstack/services/heat/test_main.py +++ b/tests/unit/services/heat/test_main.py @@ -13,7 +13,7 @@ import mock -from rally.plugins.openstack.services.heat import main +from rally_openstack.services.heat import main from tests.unit import test @@ -24,7 +24,7 @@ class Stack(main.Stack): class StackTestCase(test.ScenarioTestCase): - @mock.patch("rally.plugins.openstack.services.heat.main.open", + @mock.patch("rally_openstack.services.heat.main.open", create=True) def test___init__(self, mock_open): reads = [mock.Mock(), mock.Mock()] @@ -41,7 +41,7 @@ class StackTestCase(test.ScenarioTestCase): reads[0].read.assert_called_once_with() reads[1].read.assert_called_once_with() - @mock.patch("rally.plugins.openstack.services.heat.main.utils") + @mock.patch("rally_openstack.services.heat.main.utils") def test__wait(self, mock_utils): fake_stack = mock.Mock() stack = Stack() @@ -55,8 +55,8 @@ class StackTestCase(test.ScenarioTestCase): update_resource=mock_utils.get_from_manager()) @mock.patch("rally.task.atomic") - @mock.patch("rally.plugins.openstack.services.heat.main.open") - @mock.patch("rally.plugins.openstack.services.heat.main.Stack._wait") + @mock.patch("rally_openstack.services.heat.main.open") + @mock.patch("rally_openstack.services.heat.main.Stack._wait") def test_create(self, mock_stack__wait, mock_open, mock_task_atomic): mock_scenario = mock.MagicMock(_atomic_actions=[]) mock_scenario.generate_random_name.return_value = "fake_name" @@ -84,8 +84,8 @@ class StackTestCase(test.ScenarioTestCase): ["CREATE_FAILED"]) @mock.patch("rally.task.atomic") - @mock.patch("rally.plugins.openstack.services.heat.main.open") - @mock.patch("rally.plugins.openstack.services.heat.main.Stack._wait") + @mock.patch("rally_openstack.services.heat.main.open") + @mock.patch("rally_openstack.services.heat.main.Stack._wait") def test_update(self, mock_stack__wait, mock_open, mock_task_atomic): mock_scenario = mock.MagicMock( stack_id="fake_id", _atomic_actions=[]) diff --git a/tests/unit/plugins/openstack/services/__init__.py b/tests/unit/services/identity/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/__init__.py rename to tests/unit/services/identity/__init__.py diff --git a/tests/unit/plugins/openstack/services/identity/test_identity.py b/tests/unit/services/identity/test_identity.py similarity index 98% rename from tests/unit/plugins/openstack/services/identity/test_identity.py rename to tests/unit/services/identity/test_identity.py index 86fac128..1bbbe3fd 100644 --- a/tests/unit/plugins/openstack/services/identity/test_identity.py +++ b/tests/unit/services/identity/test_identity.py @@ -15,7 +15,7 @@ import ddt import mock -from rally.plugins.openstack.services.identity import identity +from rally_openstack.services.identity import identity from tests.unit import test @@ -26,7 +26,7 @@ class IdentityTestCase(test.TestCase): self.clients = mock.MagicMock() def get_service_with_fake_impl(self): - path = "rally.plugins.openstack.services.identity.identity" + path = "rally_openstack.services.identity.identity" with mock.patch("%s.Identity.discover_impl" % path) as mock_discover: mock_discover.return_value = mock.MagicMock(), None service = identity.Identity(self.clients) diff --git a/tests/unit/plugins/openstack/services/identity/test_keystone_common.py b/tests/unit/services/identity/test_keystone_common.py similarity index 97% rename from tests/unit/plugins/openstack/services/identity/test_keystone_common.py rename to tests/unit/services/identity/test_keystone_common.py index dac79f8e..b750396e 100644 --- a/tests/unit/plugins/openstack/services/identity/test_keystone_common.py +++ b/tests/unit/services/identity/test_keystone_common.py @@ -14,9 +14,9 @@ import mock -from rally.plugins.openstack import service -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.identity import keystone_common +from rally_openstack import service +from rally_openstack.services.identity import identity +from rally_openstack.services.identity import keystone_common from tests.unit import test @@ -265,7 +265,7 @@ class KeystoneMixinTestCase(test.TestCase): self.kc.ec2.delete.assert_called_once_with(user_id=user_id, access=access) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_fetch_token(self, mock_clients): expected_token = mock_clients.return_value.keystone.auth_ref.auth_token self.assertEqual(expected_token, self.service.fetch_token()) diff --git a/tests/unit/plugins/openstack/services/identity/test_keystone_v2.py b/tests/unit/services/identity/test_keystone_v2.py similarity index 99% rename from tests/unit/plugins/openstack/services/identity/test_keystone_v2.py rename to tests/unit/services/identity/test_keystone_v2.py index 6d1a118f..866622ac 100644 --- a/tests/unit/plugins/openstack/services/identity/test_keystone_v2.py +++ b/tests/unit/services/identity/test_keystone_v2.py @@ -17,12 +17,12 @@ import uuid import ddt import mock -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.identity import keystone_v2 +from rally_openstack.services.identity import identity +from rally_openstack.services.identity import keystone_v2 from tests.unit import test -PATH = "rally.plugins.openstack.services.identity.keystone_v2" +PATH = "rally_openstack.services.identity.keystone_v2" @ddt.ddt diff --git a/tests/unit/plugins/openstack/services/identity/test_keystone_v3.py b/tests/unit/services/identity/test_keystone_v3.py similarity index 99% rename from tests/unit/plugins/openstack/services/identity/test_keystone_v3.py rename to tests/unit/services/identity/test_keystone_v3.py index 800612ad..6c40d076 100644 --- a/tests/unit/plugins/openstack/services/identity/test_keystone_v3.py +++ b/tests/unit/services/identity/test_keystone_v3.py @@ -18,12 +18,12 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.services.identity import identity -from rally.plugins.openstack.services.identity import keystone_v3 +from rally_openstack.services.identity import identity +from rally_openstack.services.identity import keystone_v3 from tests.unit import test -PATH = "rally.plugins.openstack.services.identity.keystone_v3" +PATH = "rally_openstack.services.identity.keystone_v3" @ddt.ddt diff --git a/tests/unit/plugins/openstack/services/gnocchi/__init__.py b/tests/unit/services/image/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/gnocchi/__init__.py rename to tests/unit/services/image/__init__.py diff --git a/tests/unit/plugins/openstack/services/image/test_glance_common.py b/tests/unit/services/image/test_glance_common.py similarity index 96% rename from tests/unit/plugins/openstack/services/image/test_glance_common.py rename to tests/unit/services/image/test_glance_common.py index 71b3f67e..da8e01e8 100644 --- a/tests/unit/plugins/openstack/services/image/test_glance_common.py +++ b/tests/unit/services/image/test_glance_common.py @@ -18,9 +18,9 @@ from glanceclient import exc as glance_exc import mock from rally import exceptions -from rally.plugins.openstack import service -from rally.plugins.openstack.services.image import glance_common -from rally.plugins.openstack.services.image import image +from rally_openstack import service +from rally_openstack.services.image import glance_common +from rally_openstack.services.image import image from tests.unit import test diff --git a/tests/unit/plugins/openstack/services/image/test_glance_v1.py b/tests/unit/services/image/test_glance_v1.py similarity index 97% rename from tests/unit/plugins/openstack/services/image/test_glance_v1.py rename to tests/unit/services/image/test_glance_v1.py index 13964fb2..0bc4ae18 100755 --- a/tests/unit/plugins/openstack/services/image/test_glance_v1.py +++ b/tests/unit/services/image/test_glance_v1.py @@ -18,12 +18,12 @@ import ddt import fixtures import mock -from rally.plugins.openstack.services.image import glance_v1 -from rally.plugins.openstack.services.image import image +from rally_openstack.services.image import glance_v1 +from rally_openstack.services.image import image from tests.unit import test -PATH = ("rally.plugins.openstack.services.image.glance_common." +PATH = ("rally_openstack.services.image.glance_common." "UnifiedGlanceMixin._unify_image") diff --git a/tests/unit/plugins/openstack/services/image/test_glance_v2.py b/tests/unit/services/image/test_glance_v2.py similarity index 98% rename from tests/unit/plugins/openstack/services/image/test_glance_v2.py rename to tests/unit/services/image/test_glance_v2.py index bd135806..6369d143 100755 --- a/tests/unit/plugins/openstack/services/image/test_glance_v2.py +++ b/tests/unit/services/image/test_glance_v2.py @@ -18,11 +18,11 @@ import ddt import fixtures import mock -from rally.plugins.openstack.services.image import glance_v2 +from rally_openstack.services.image import glance_v2 from tests.unit import test -PATH = "rally.plugins.openstack.services.image" +PATH = "rally_openstack.services.image" @ddt.ddt diff --git a/tests/unit/plugins/openstack/services/image/test_image.py b/tests/unit/services/image/test_image.py similarity index 95% rename from tests/unit/plugins/openstack/services/image/test_image.py rename to tests/unit/services/image/test_image.py index dbacc221..4145ab51 100755 --- a/tests/unit/plugins/openstack/services/image/test_image.py +++ b/tests/unit/services/image/test_image.py @@ -15,9 +15,9 @@ import ddt import mock -from rally.plugins.openstack.services.image import glance_v1 -from rally.plugins.openstack.services.image import glance_v2 -from rally.plugins.openstack.services.image import image +from rally_openstack.services.image import glance_v1 +from rally_openstack.services.image import glance_v2 +from rally_openstack.services.image import image from tests.unit import test @@ -29,7 +29,7 @@ class ImageTestCase(test.TestCase): self.clients = mock.MagicMock() def get_service_with_fake_impl(self): - path = "rally.plugins.openstack.services.image.image" + path = "rally_openstack.services.image.image" with mock.patch("%s.Image.discover_impl" % path) as mock_discover: mock_discover.return_value = mock.MagicMock(), None service = image.Image(self.clients) diff --git a/tests/unit/plugins/openstack/services/heat/__init__.py b/tests/unit/services/storage/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/heat/__init__.py rename to tests/unit/services/storage/__init__.py diff --git a/tests/unit/plugins/openstack/services/storage/test_block.py b/tests/unit/services/storage/test_block.py similarity index 99% rename from tests/unit/plugins/openstack/services/storage/test_block.py rename to tests/unit/services/storage/test_block.py index 2e10691a..bc602e5c 100644 --- a/tests/unit/plugins/openstack/services/storage/test_block.py +++ b/tests/unit/services/storage/test_block.py @@ -14,7 +14,7 @@ import mock -from rally.plugins.openstack.services.storage import block +from rally_openstack.services.storage import block from tests.unit import test @@ -25,7 +25,7 @@ class BlockTestCase(test.TestCase): self.service = self._get_service_with_fake_impl() def _get_service_with_fake_impl(self): - path = "rally.plugins.openstack.services.storage.block" + path = "rally_openstack.services.storage.block" path = "%s.BlockStorage.discover_impl" % path with mock.patch(path) as mock_discover: mock_discover.return_value = mock.MagicMock(), None diff --git a/tests/unit/plugins/openstack/services/storage/test_cinder_common.py b/tests/unit/services/storage/test_cinder_common.py similarity index 98% rename from tests/unit/plugins/openstack/services/storage/test_cinder_common.py rename to tests/unit/services/storage/test_cinder_common.py index b66e70e2..5927501c 100644 --- a/tests/unit/plugins/openstack/services/storage/test_cinder_common.py +++ b/tests/unit/services/storage/test_cinder_common.py @@ -19,13 +19,13 @@ import mock from rally.common import cfg from rally import exceptions -from rally.plugins.openstack import service -from rally.plugins.openstack.services.storage import block -from rally.plugins.openstack.services.storage import cinder_common +from rally_openstack import service +from rally_openstack.services.storage import block +from rally_openstack.services.storage import cinder_common from tests.unit import fakes from tests.unit import test -BASE_PATH = "rally.plugins.openstack.services.storage" +BASE_PATH = "rally_openstack.services.storage" CONF = cfg.CONF @@ -195,7 +195,7 @@ class CinderMixinTestCase(test.ScenarioTestCase): self.cinder.volumes.update_readonly_flag.assert_called_once_with( fake_volume, "fake_flag") - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test_upload_volume_to_image(self, mock_image): volume = mock.Mock() image = {"os-volume_upload_image": {"image_id": 1}} diff --git a/tests/unit/plugins/openstack/services/storage/test_cinder_v1.py b/tests/unit/services/storage/test_cinder_v1.py similarity index 99% rename from tests/unit/plugins/openstack/services/storage/test_cinder_v1.py rename to tests/unit/services/storage/test_cinder_v1.py index b2a13027..c720ee57 100644 --- a/tests/unit/plugins/openstack/services/storage/test_cinder_v1.py +++ b/tests/unit/services/storage/test_cinder_v1.py @@ -15,11 +15,11 @@ import mock from rally.common import cfg -from rally.plugins.openstack.services.storage import cinder_v1 +from rally_openstack.services.storage import cinder_v1 from tests.unit import fakes from tests.unit import test -BASE_PATH = "rally.plugins.openstack.services.storage" +BASE_PATH = "rally_openstack.services.storage" CONF = cfg.CONF diff --git a/tests/unit/plugins/openstack/services/storage/test_cinder_v2.py b/tests/unit/services/storage/test_cinder_v2.py similarity index 99% rename from tests/unit/plugins/openstack/services/storage/test_cinder_v2.py rename to tests/unit/services/storage/test_cinder_v2.py index c3857f29..42dcb812 100644 --- a/tests/unit/plugins/openstack/services/storage/test_cinder_v2.py +++ b/tests/unit/services/storage/test_cinder_v2.py @@ -15,11 +15,11 @@ import mock from rally.common import cfg -from rally.plugins.openstack.services.storage import cinder_v2 +from rally_openstack.services.storage import cinder_v2 from tests.unit import fakes from tests.unit import test -BASE_PATH = "rally.plugins.openstack.services.storage" +BASE_PATH = "rally_openstack.services.storage" CONF = cfg.CONF diff --git a/tests/unit/test.py b/tests/unit/test.py index f1aa20ed..cee25da4 100644 --- a/tests/unit/test.py +++ b/tests/unit/test.py @@ -123,7 +123,7 @@ class ScenarioTestCase(TestCase): return key in self._clients def get_client_mocks(self): - base_path = "rally.plugins.openstack" + base_path = "rally_openstack" return [ mock.patch( @@ -210,7 +210,7 @@ class ContextTestCase(ScenarioTestCase): def get_client_mocks(self): return [ mock.patch( - "rally.plugins.openstack.osclients.Clients", + "rally_openstack.osclients.Clients", mock.Mock(side_effect=self.context_client)) ] diff --git a/tests/unit/plugins/openstack/test_credential.py b/tests/unit/test_credential.py similarity index 93% rename from tests/unit/plugins/openstack/test_credential.py rename to tests/unit/test_credential.py index 01c6433a..db43df5d 100644 --- a/tests/unit/plugins/openstack/test_credential.py +++ b/tests/unit/test_credential.py @@ -15,7 +15,7 @@ import mock -from rally.plugins.openstack import credential +from rally_openstack import credential from tests.unit import test @@ -45,7 +45,7 @@ class OpenStackCredentialTestCase(test.TestCase): "profiler_conn_str": None}, self.credential.to_dict()) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_list_services(self, mock_clients): mock_clients.return_value.services.return_value = {"compute": "nova", "volume": "cinder"} @@ -56,7 +56,7 @@ class OpenStackCredentialTestCase(test.TestCase): self.assertEqual([{"name": "cinder", "type": "volume"}, {"name": "nova", "type": "compute"}], result) - @mock.patch("rally.plugins.openstack.osclients.Clients") + @mock.patch("rally_openstack.osclients.Clients") def test_clients(self, mock_clients): clients = self.credential.clients(api_info="fake_info") mock_clients.assert_called_once_with( diff --git a/tests/unit/plugins/openstack/test_osclients.py b/tests/unit/test_osclients.py similarity index 99% rename from tests/unit/plugins/openstack/test_osclients.py rename to tests/unit/test_osclients.py index 1c0ad545..92111599 100644 --- a/tests/unit/plugins/openstack/test_osclients.py +++ b/tests/unit/test_osclients.py @@ -20,13 +20,13 @@ from rally.common import cfg from rally import consts from rally import exceptions from rally import osclients as deprecated_osclients # noqa -from rally.plugins.openstack import credential as oscredential -from rally.plugins.openstack import osclients +from rally_openstack import credential as oscredential +from rally_openstack import osclients from tests.unit import fakes from tests.unit import test -PATH = "rally.plugins.openstack.osclients" +PATH = "rally_openstack.osclients" @osclients.configure("dummy", supported_versions=("0.1", "1"), diff --git a/tests/unit/plugins/openstack/test_scenario.py b/tests/unit/test_scenario.py similarity index 95% rename from tests/unit/plugins/openstack/test_scenario.py rename to tests/unit/test_scenario.py index 2527709a..fbbfb8ba 100644 --- a/tests/unit/plugins/openstack/test_scenario.py +++ b/tests/unit/test_scenario.py @@ -16,8 +16,8 @@ import ddt import fixtures import mock -from rally.plugins.openstack.credential import OpenStackCredential -from rally.plugins.openstack import scenario as base_scenario +from rally_openstack.credential import OpenStackCredential +from rally_openstack import scenario as base_scenario from tests.unit import test @@ -38,7 +38,7 @@ class OpenStackScenarioTestCase(test.TestCase): def setUp(self): super(OpenStackScenarioTestCase, self).setUp() self.osclients = fixtures.MockPatch( - "rally.plugins.openstack.osclients.Clients") + "rally_openstack.osclients.Clients") self.useFixture(self.osclients) self.context = test.get_test_context() self.context.update({"foo": "bar"}) @@ -106,8 +106,8 @@ class OpenStackScenarioTestCase(test.TestCase): ([("admin", CREDENTIAL_WITHOUT_HMAC), ("user", CREDENTIAL_WITHOUT_HMAC)], 0)) @ddt.unpack - @mock.patch("rally.plugins.openstack.scenario.profiler.init") - @mock.patch("rally.plugins.openstack.scenario.profiler.get") + @mock.patch("rally_openstack.scenario.profiler.init") + @mock.patch("rally_openstack.scenario.profiler.get") def test_profiler_init(self, users_credentials, expected_call_count, mock_profiler_get, diff --git a/tests/unit/plugins/openstack/test_service.py b/tests/unit/test_service.py similarity index 96% rename from tests/unit/plugins/openstack/test_service.py rename to tests/unit/test_service.py index 24ace337..3617199a 100644 --- a/tests/unit/plugins/openstack/test_service.py +++ b/tests/unit/test_service.py @@ -13,7 +13,7 @@ import mock -from rally.plugins.openstack import service +from rally_openstack import service from rally.task import service as base_service from tests.unit import test diff --git a/tests/unit/plugins/openstack/test_types.py b/tests/unit/test_types.py similarity index 99% rename from tests/unit/plugins/openstack/test_types.py rename to tests/unit/test_types.py index fb76778c..03f24700 100644 --- a/tests/unit/plugins/openstack/test_types.py +++ b/tests/unit/test_types.py @@ -17,7 +17,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack import types +from rally_openstack import types from tests.unit import fakes from tests.unit import test diff --git a/tests/unit/plugins/openstack/test_validators.py b/tests/unit/test_validators.py similarity index 99% rename from tests/unit/plugins/openstack/test_validators.py rename to tests/unit/test_validators.py index aa6538c9..090160ac 100644 --- a/tests/unit/plugins/openstack/test_validators.py +++ b/tests/unit/test_validators.py @@ -22,11 +22,11 @@ from novaclient import exceptions as nova_exc from rally import consts from rally import exceptions -from rally.plugins.openstack import validators +from rally_openstack import validators from tests.unit import test -PATH = "rally.plugins.openstack.validators" +PATH = "rally_openstack.validators" context = { @@ -48,7 +48,7 @@ config = dict(args={"image": {"id": "fake_id", ) -@mock.patch("rally.plugins.openstack.context.keystone.roles.RoleGenerator") +@mock.patch("rally_openstack.contexts.keystone.roles.RoleGenerator") def test_with_roles_ctx(mock_role_generator): @validators.with_roles_ctx() @@ -671,7 +671,7 @@ class ValidateHeatTemplateValidatorTestCase(test.TestCase): @ddt.unpack @mock.patch("%s.os.path.exists" % PATH, return_value=True) - @mock.patch("rally.plugins.openstack.validators.open", + @mock.patch("rally_openstack.validators.open", side_effect=mock.mock_open(), create=True) def test_validate(self, mock_open, mock_exists, exception_msg): clients = self.context["users"][0]["credential"].clients() diff --git a/tests/unit/plugins/openstack/services/identity/__init__.py b/tests/unit/verification/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/identity/__init__.py rename to tests/unit/verification/__init__.py diff --git a/tests/unit/plugins/openstack/services/image/__init__.py b/tests/unit/verification/tempest/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/image/__init__.py rename to tests/unit/verification/tempest/__init__.py diff --git a/tests/unit/plugins/openstack/verification/tempest/test_config.py b/tests/unit/verification/tempest/test_config.py similarity index 98% rename from tests/unit/plugins/openstack/verification/tempest/test_config.py rename to tests/unit/verification/tempest/test_config.py index f08ed441..b5e7e51d 100644 --- a/tests/unit/plugins/openstack/verification/tempest/test_config.py +++ b/tests/unit/verification/tempest/test_config.py @@ -17,8 +17,8 @@ import ddt import mock from rally.common import cfg -from rally.plugins.openstack import osclients -from rally.plugins.openstack.verification.tempest import config +from rally_openstack import osclients +from rally_openstack.verification.tempest import config from tests.unit import fakes from tests.unit import test @@ -39,7 +39,7 @@ CRED = { "project_domain_name": "admin" } -PATH = "rally.plugins.openstack.verification.tempest.config" +PATH = "rally_openstack.verification.tempest.config" @ddt.ddt diff --git a/tests/unit/plugins/openstack/verification/tempest/test_context.py b/tests/unit/verification/tempest/test_context.py similarity index 96% rename from tests/unit/plugins/openstack/verification/tempest/test_context.py rename to tests/unit/verification/tempest/test_context.py index cc767901..04e9ed32 100644 --- a/tests/unit/plugins/openstack/verification/tempest/test_context.py +++ b/tests/unit/verification/tempest/test_context.py @@ -21,8 +21,8 @@ import requests from rally.common import cfg from rally import exceptions -from rally.plugins.openstack.verification.tempest import config -from rally.plugins.openstack.verification.tempest import context +from rally_openstack.verification.tempest import config +from rally_openstack.verification.tempest import context from tests.unit import fakes from tests.unit import test @@ -43,7 +43,7 @@ CRED = { "project_domain_name": "admin" } -PATH = "rally.plugins.openstack.verification.tempest.context" +PATH = "rally_openstack.verification.tempest.context" @ddt.ddt @@ -116,7 +116,7 @@ class TempestContextTestCase(test.TestCase): self.context._download_image_from_source, os.path.join(self.context.data_dir, "foo")) - @mock.patch("rally.plugins.openstack.wrappers." + @mock.patch("rally_openstack.wrappers." "network.NeutronWrapper.create_network") @mock.patch("six.moves.builtins.open", side_effect=mock.mock_open()) def test_options_configured_manually( @@ -159,7 +159,7 @@ class TempestContextTestCase(test.TestCase): self.assertIn(role3, created_roles) self.assertIn(role4, created_roles) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__discover_image(self, mock_image): client = mock_image.return_value client.list_images.return_value = [fakes.FakeImage(name="Foo"), @@ -170,7 +170,7 @@ class TempestContextTestCase(test.TestCase): @mock.patch("six.moves.builtins.open", side_effect=mock.mock_open(), create=True) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") @mock.patch("os.path.isfile", return_value=False) def test__download_image(self, mock_isfile, mock_image, mock_open): img_1 = mock.MagicMock() @@ -206,7 +206,7 @@ class TempestContextTestCase(test.TestCase): result = self.context.conf.get("compute", "flavor_ref") self.assertEqual("id1", result) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__discover_or_create_image_when_image_exists(self, mock_image): client = mock_image.return_value client.list_images.return_value = [fakes.FakeImage(name="CirrOS")] @@ -216,7 +216,7 @@ class TempestContextTestCase(test.TestCase): self.assertEqual(0, client.create_image.call_count) self.assertEqual(0, len(self.context._created_images)) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__discover_or_create_image(self, mock_image): client = mock_image.return_value @@ -276,7 +276,7 @@ class TempestContextTestCase(test.TestCase): client = self.context.clients.keystone() self.assertEqual(2, client.roles.delete.call_count) - @mock.patch("rally.plugins.openstack.services.image.image.Image") + @mock.patch("rally_openstack.services.image.image.Image") def test__cleanup_images(self, mock_image): self.context._created_images = [fakes.FakeImage(id="id1"), fakes.FakeImage(id="id2")] @@ -317,7 +317,7 @@ class TempestContextTestCase(test.TestCase): self.assertEqual("", self.context.conf.get("orchestration", "instance_type")) - @mock.patch("rally.plugins.openstack.wrappers." + @mock.patch("rally_openstack.wrappers." "network.NeutronWrapper.delete_network") def test__cleanup_network_resources( self, mock_neutron_wrapper_delete_network): diff --git a/tests/unit/plugins/openstack/verification/tempest/test_manager.py b/tests/unit/verification/tempest/test_manager.py similarity index 98% rename from tests/unit/plugins/openstack/verification/tempest/test_manager.py rename to tests/unit/verification/tempest/test_manager.py index a680ae76..31474455 100644 --- a/tests/unit/plugins/openstack/verification/tempest/test_manager.py +++ b/tests/unit/verification/tempest/test_manager.py @@ -18,11 +18,11 @@ import subprocess import mock from rally import exceptions -from rally.plugins.openstack.verification.tempest import manager +from rally_openstack.verification.tempest import manager from tests.unit import test -PATH = "rally.plugins.openstack.verification.tempest.manager" +PATH = "rally_openstack.verification.tempest.manager" class TempestManagerTestCase(test.TestCase): diff --git a/tests/unit/plugins/openstack/services/storage/__init__.py b/tests/unit/workload/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/services/storage/__init__.py rename to tests/unit/workload/__init__.py diff --git a/tests/unit/plugins/workload/test_siege.py b/tests/unit/workload/test_siege.py similarity index 100% rename from tests/unit/plugins/workload/test_siege.py rename to tests/unit/workload/test_siege.py diff --git a/tests/unit/plugins/openstack/verification/__init__.py b/tests/unit/wrappers/__init__.py similarity index 100% rename from tests/unit/plugins/openstack/verification/__init__.py rename to tests/unit/wrappers/__init__.py diff --git a/tests/unit/plugins/openstack/wrappers/test_cinder.py b/tests/unit/wrappers/test_cinder.py similarity index 96% rename from tests/unit/plugins/openstack/wrappers/test_cinder.py rename to tests/unit/wrappers/test_cinder.py index 9edacc87..53f66f82 100644 --- a/tests/unit/plugins/openstack/wrappers/test_cinder.py +++ b/tests/unit/wrappers/test_cinder.py @@ -17,7 +17,7 @@ import ddt import mock from rally import exceptions -from rally.plugins.openstack.wrappers import cinder as cinder_wrapper +from rally_openstack.wrappers import cinder as cinder_wrapper from tests.unit import test @@ -35,7 +35,7 @@ class CinderWrapperTestCase(test.ScenarioTestCase): self.assertIsInstance(cinder_wrapper.wrap(client, mock.Mock()), expected_class) - @mock.patch("rally.plugins.openstack.wrappers.cinder.LOG") + @mock.patch("rally_openstack.wrappers.cinder.LOG") def test_wrap_wrong_version(self, mock_log): client = mock.MagicMock() client.choose_version.return_value = "dummy" diff --git a/tests/unit/plugins/openstack/wrappers/test_glance.py b/tests/unit/wrappers/test_glance.py similarity index 98% rename from tests/unit/plugins/openstack/wrappers/test_glance.py rename to tests/unit/wrappers/test_glance.py index 02f926f4..7fdd80ce 100644 --- a/tests/unit/plugins/openstack/wrappers/test_glance.py +++ b/tests/unit/wrappers/test_glance.py @@ -21,7 +21,7 @@ import mock from rally.common import cfg from rally import exceptions -from rally.plugins.openstack.wrappers import glance as glance_wrapper +from rally_openstack.wrappers import glance as glance_wrapper from tests.unit import test CONF = cfg.CONF @@ -41,7 +41,7 @@ class GlanceWrapperTestCase(test.ScenarioTestCase): self.assertIsInstance(glance_wrapper.wrap(client, mock.Mock()), expected_class) - @mock.patch("rally.plugins.openstack.wrappers.glance.LOG") + @mock.patch("rally_openstack.wrappers.glance.LOG") def test_wrap_wrong_version(self, mock_log): client = mock.MagicMock() client.choose_version.return_value = "dummy" diff --git a/tests/unit/plugins/openstack/wrappers/test_keystone.py b/tests/unit/wrappers/test_keystone.py similarity index 99% rename from tests/unit/plugins/openstack/wrappers/test_keystone.py rename to tests/unit/wrappers/test_keystone.py index 4942b38f..da15a2fa 100644 --- a/tests/unit/plugins/openstack/wrappers/test_keystone.py +++ b/tests/unit/wrappers/test_keystone.py @@ -16,7 +16,7 @@ from keystoneclient import exceptions import mock -from rally.plugins.openstack.wrappers import keystone +from rally_openstack.wrappers import keystone from tests.unit import test diff --git a/tests/unit/plugins/openstack/wrappers/test_network.py b/tests/unit/wrappers/test_network.py similarity index 97% rename from tests/unit/plugins/openstack/wrappers/test_network.py rename to tests/unit/wrappers/test_network.py index 44cf8afb..8d0cbe1c 100644 --- a/tests/unit/plugins/openstack/wrappers/test_network.py +++ b/tests/unit/wrappers/test_network.py @@ -18,12 +18,12 @@ import mock from rally.common import utils from rally import consts -from rally.plugins.openstack.wrappers import network +from rally_openstack.wrappers import network from tests.unit import test from neutronclient.common import exceptions as neutron_exceptions -SVC = "rally.plugins.openstack.wrappers.network." +SVC = "rally_openstack.wrappers.network." class Owner(utils.RandomNameGeneratorMixin): @@ -43,7 +43,7 @@ class NeutronWrapperTestCase(test.TestCase): def test_SUBNET_IP_VERSION(self): self.assertEqual(4, network.NeutronWrapper.SUBNET_IP_VERSION) - @mock.patch("rally.plugins.openstack.wrappers.network.generate_cidr") + @mock.patch("rally_openstack.wrappers.network.generate_cidr") def test__generate_cidr(self, mock_generate_cidr): cidrs = iter(range(5)) mock_generate_cidr.side_effect = ( @@ -231,7 +231,7 @@ class NeutronWrapperTestCase(test.TestCase): [mock.call("foo_router", {"subnet_id": "foo_subnet"}) for i in range(subnets_num)]) - @mock.patch("rally.plugins.openstack.wrappers.network.NeutronWrapper" + @mock.patch("rally_openstack.wrappers.network.NeutronWrapper" ".supports_extension", return_value=(False, "")) def test_delete_network(self, mock_neutron_wrapper_supports_extension): service = self.get_wrapper() @@ -253,7 +253,7 @@ class NeutronWrapperTestCase(test.TestCase): service.delete_v1_pool(pool["pool"]["id"]) service.client.delete_pool.assert_called_once_with("pool-id") - @mock.patch("rally.plugins.openstack.wrappers.network.NeutronWrapper" + @mock.patch("rally_openstack.wrappers.network.NeutronWrapper" ".supports_extension", return_value=(True, "")) def test_delete_network_with_dhcp_and_router_and_ports_and_subnets( self, mock_neutron_wrapper_supports_extension): @@ -296,7 +296,7 @@ class NeutronWrapperTestCase(test.TestCase): {"exception_type": KeyError, "should_raise": True}) @ddt.unpack - @mock.patch("rally.plugins.openstack.wrappers.network.NeutronWrapper" + @mock.patch("rally_openstack.wrappers.network.NeutronWrapper" ".supports_extension", return_value=(True, "")) def test_delete_network_with_router_throw_exception( self, mock_neutron_wrapper_supports_extension, exception_type, @@ -470,13 +470,13 @@ class NeutronWrapperTestCase(test.TestCase): class FunctionsTestCase(test.TestCase): def test_generate_cidr(self): - with mock.patch("rally.plugins.openstack.wrappers.network.cidr_incr", + with mock.patch("rally_openstack.wrappers.network.cidr_incr", iter(range(1, 4))): self.assertEqual("10.2.1.0/24", network.generate_cidr()) self.assertEqual("10.2.2.0/24", network.generate_cidr()) self.assertEqual("10.2.3.0/24", network.generate_cidr()) - with mock.patch("rally.plugins.openstack.wrappers.network.cidr_incr", + with mock.patch("rally_openstack.wrappers.network.cidr_incr", iter(range(1, 4))): start_cidr = "1.1.0.0/26" self.assertEqual("1.1.0.64/26", network.generate_cidr(start_cidr)) diff --git a/tox.ini b/tox.ini index 2d1bec8d..06c84df5 100644 --- a/tox.ini +++ b/tox.ini @@ -84,12 +84,11 @@ deps = requests[security] commands = python {toxinidir}/tests/ci/sync_requirements.py {posargs} [flake8] -ignore = H703,H105 +ignore = H703,H105,H306 show-source = true exclude=.venv,.git,.tox,dist,*lib/python*,*egg,tools,build,setup.py [hacking] -import_exceptions = rally.common.i18n local-check-factory = tests.hacking.checks.factory [testenv:bindep] diff --git a/upper-constraints.txt b/upper-constraints.txt index 34fff8c2..7d47a0f1 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -140,6 +140,6 @@ unittest2===1.1.0 urllib3===1.22 warlock===1.2.0 WebOb===1.7.4 -websocket-client===0.46.0 +websocket-client===0.40.0 wrapt===1.10.11 yaql===1.1.3