x/browbeat
Code Issues Proposed changes

Merge "Port rally plugins to use proper modules"

Browse Source
This commit is contained in:
Zuul 2018-08-01 14:48:10 +00:00 committed by Gerrit Code Review
commit 645e107630
12 changed files with 31 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/install/group_vars/all.yml
View File

@ -31,7 +31,7 @@ browbeat_venv: "{{browbeat_path}}/.browbeat-venv"
rally_venv: "{{browbeat_path}}/.rally-venv" rally_venv: "{{browbeat_path}}/.rally-venv"
# Rally version to install # Rally version to install
rally_version: 0.10.1 rally_version: 1.1.0
# The default Shaker venv # The default Shaker venv
shaker_venv: "{{browbeat_path}}/.shaker-venv" shaker_venv: "{{browbeat_path}}/.shaker-venv"

12
ansible/install/roles/rally/tasks/main.yml
View File

@ -15,20 +15,12 @@
line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}' line: 'export REQUESTS_CA_BUNDLE={{ overcloud_ca_path }}'
when: overcloud_ca_path is defined when: overcloud_ca_path is defined
- name: Install rally into rally-venv - name: Install Rally with OpenStack plugins into rally-venv
pip: pip:
name: rally name: rally-openstack
version: "{{ rally_version }}" version: "{{ rally_version }}"
virtualenv: "{{ rally_venv }}" virtualenv: "{{ rally_venv }}"
# (akrzos) Rally 0.10.1 installs a version (4.0.0) of gnocchiclient which deprecated service_type
# session option.
- name: Downgrade gnocchiclient in Rally venv
pip:
name: gnocchiclient
version: 3.3.1
virtualenv: "{{ rally_venv }}"
- name: Install elasticsearch into rally-venv - name: Install elasticsearch into rally-venv
pip: pip:
name: elasticsearch name: elasticsearch

8
rally/rally-plugins/glance/glance_create_boot_delete.py
View File

@ -10,13 +10,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.glance.images import GlanceBasic from rally_openstack import consts
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack.scenarios.glance.images import GlanceBasic
from rally.plugins.openstack.scenarios.nova import utils as nova_utils from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.nova import utils as nova_utils
from rally.task import scenario from rally.task import scenario
from rally.task import types from rally.task import types
from rally.task import validation from rally.task import validation
from rally import consts
@types.convert(flavor={"type": "nova_flavor"}, image_location={"type": "path_or_url"}) @types.convert(flavor={"type": "nova_flavor"}, image_location={"type": "path_or_url"})

6
rally/rally-plugins/gnocchi/gnocchi.py
View File

@ -12,13 +12,13 @@
import uuid import uuid
from rally.plugins.openstack import osclients
from rally.plugins.openstack import scenario
from rally.common import logging from rally.common import logging
from rally_openstack import consts
from rally_openstack import osclients
from rally_openstack import scenario
from rally.task import atomic from rally.task import atomic
from rally.task import context from rally.task import context
from rally.task import validation from rally.task import validation
from rally import consts
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

6
rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py
View File

@ -10,12 +10,12 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.nova import utils as nova_utils from rally_openstack import consts
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally.task import scenario from rally.task import scenario
from rally.task import types from rally.task import types
from rally.task import validation from rally.task import validation
from rally import consts
@types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"})

6
rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py
View File

@ -10,13 +10,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack import consts
from rally.plugins.openstack.scenarios.vm import utils as vm_utils from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally.task import atomic from rally.task import atomic
from rally.task import scenario from rally.task import scenario
from rally.task import types from rally.task import types
from rally.task import validation from rally.task import validation
from rally import consts
@types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"})

4
rally/rally-plugins/neutron/neutron.py
View File

@ -11,9 +11,9 @@
# under the License. # under the License.
from rally.common import logging from rally.common import logging
from rally.plugins.openstack.context.network import networks from rally_openstack import consts
from rally_openstack.context.network import networks
from rally.task import context from rally.task import context
from rally import consts
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)

4
rally/rally-plugins/neutron/port_create_assoicate.py
View File

@ -10,10 +10,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally.task import scenario from rally.task import scenario
from rally.task import validation from rally.task import validation
from rally import consts
import subprocess import subprocess
import time import time

4
rally/rally-plugins/neutron/router_subnet_create_delete.py
View File

@ -10,10 +10,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally.task import scenario from rally.task import scenario
from rally.task import validation from rally.task import validation
from rally import consts
@validation.add("required_services",services=[consts.Service.NEUTRON]) @validation.add("required_services",services=[consts.Service.NEUTRON])

4
rally/rally-plugins/neutron/securitygroup_port.py
View File

@ -10,10 +10,10 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally.task import scenario from rally.task import scenario
from rally.task import validation from rally.task import validation
from rally import consts
@validation.add("required_services",services=[consts.Service.NEUTRON]) @validation.add("required_services",services=[consts.Service.NEUTRON])

8
rally/rally-plugins/nova/nova.py
View File

@ -10,13 +10,13 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from rally.plugins.openstack.scenarios.cinder import utils as cinder_utils from rally_openstack import consts
from rally.plugins.openstack.scenarios.nova import utils as nova_utils from rally_openstack.scenarios.cinder import utils as cinder_utils
from rally.plugins.openstack.scenarios.vm import utils as vm_utils from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally.task import scenario from rally.task import scenario
from rally.task import types from rally.task import types
from rally.task import validation from rally.task import validation
from rally import consts
@types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"}) @types.convert(image={"type": "glance_image"}, flavor={"type": "nova_flavor"})

6
rally/rally-plugins/workloads/pbench-uperf.py
View File

@ -19,13 +19,13 @@ import time
import browbeat.elastic import browbeat.elastic
from rally.plugins.openstack.scenarios.vm import utils as vm_utils
from rally.plugins.openstack.scenarios.neutron import utils as neutron_utils
from rally.common import sshutils from rally.common import sshutils
from rally_openstack import consts
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally.task import scenario from rally.task import scenario
from rally.task import types from rally.task import types
from rally.task import validation from rally.task import validation
from rally import consts
LOG = logging.getLogger(__name__) LOG = logging.getLogger(__name__)