x/browbeat
Code Issues Proposed changes

Merge "made changes that are required for openstack-rally-2.2.0"

Browse Source
This commit is contained in:
Zuul 2022-07-08 08:52:52 +00:00 committed by Gerrit Code Review
commit 2830c0b05f
29 changed files with 102 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,7 +37,7 @@ browbeat_venv: "{{browbeat_path}}/.browbeat-venv"
rally_venv: "{{browbeat_path}}/.rally-venv"
# Rally version to install
rally_openstack_version: 1.6.0
rally_openstack_version: 2.2.0
# The default Shaker venv
shaker_venv: "{{browbeat_path}}/.shaker-venv"

4
browbeat-config.yaml
View File

@ -175,7 +175,6 @@ workloads:
file: rally/neutron/neutron-create-update-network-cc.yml
network_update_args:
admin_state_up: False
name: "_updated"
- name: create-delete-network
enabled: false
file: rally/neutron/neutron-create-delete-network-cc.yml
@ -192,7 +191,6 @@ workloads:
admin_state_up: False
device_id: "dummy_id"
device_owner: "dummy_owner"
name: "_port_updated"
- name: create-delete-port
enabled: false
file: rally/neutron/neutron-create-delete-port-cc.yml
@ -212,7 +210,6 @@ workloads:
router_create_args: {}
router_update_args:
admin_state_up: False
name: "_router_updated"
- name: create-delete-router
enabled: false
file: rally/neutron/neutron-create-delete-router-cc.yml
@ -236,7 +233,6 @@ workloads:
subnets_per_network: 2
subnet_update_args:
enable_dhcp: true
name: "_subnet_updated"
- name: create-delete-subnets
enabled: false
file: rally/neutron/neutron-create-delete-subnet-cc.yml

6
rally/rally-plugins/cinder/boot_vm_attach_volume_list.py
View File

@ -11,9 +11,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.scenarios.cinder import utils as cinder_utils
from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.cinder import utils as cinder_utils
from rally_openstack.task.scenarios.nova import utils as nova_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

6
rally/rally-plugins/dynamic-workloads/dynamic_utils.py
View File

@ -14,10 +14,10 @@ import logging
import time
from rally.common import cfg
from rally.common import sshutils
from rally.utils import sshutils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally.task import atomic
from rally.task import utils

2
rally/rally-plugins/dynamic-workloads/dynamic_workload.py
View File

@ -12,7 +12,7 @@
import os
from rally_openstack import consts
from rally_openstack.common import consts
from rally.task import scenario
from rally.task import types
from rally.task import validation

2
rally/rally-plugins/dynamic-workloads/dynamic_workload_min.py
View File

@ -10,7 +10,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.common import consts
from rally.task import scenario
from rally.task import types
from rally.task import validation

4
rally/rally-plugins/dynamic-workloads/octavia.py
View File

@ -13,9 +13,9 @@
import io
import time
import random
from rally.common import sshutils
from rally.utils import sshutils
from rally_openstack.scenarios.octavia import utils as octavia_utils
from rally_openstack.task.scenarios.octavia import utils as octavia_utils
from octaviaclient.api import exceptions
import dynamic_utils

2
rally/rally-plugins/dynamic-workloads/provider_network.py
View File

@ -14,7 +14,7 @@ import random
import os
import subprocess
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
import dynamic_utils
from rally.task import atomic

4
rally/rally-plugins/dynamic-workloads/rally_context.py
View File

@ -14,8 +14,8 @@ from rally.task import context
from rally.common import logging
from rally.common import utils
from rally import consts
from rally_openstack import osclients
from rally_openstack.wrappers import network as network_wrapper
from rally_openstack.common import osclients
from rally_openstack.common.wrappers import network as network_wrapper
import subprocess

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

@ -10,11 +10,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack import scenario
from rally_openstack.scenarios.glance.images import GlanceBasic
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.common import consts
from rally_openstack.task import scenario
from rally_openstack.task.scenarios.glance.images import GlanceBasic
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.nova import utils as nova_utils
from rally.task import types
from rally.task import validation

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

@ -10,9 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.nova import utils as nova_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

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

@ -10,9 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally.task import atomic
from rally.task import scenario
from rally.task import types

25
rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping_sec_groups.py
View File

@ -11,9 +11,9 @@
# limitations under the License.
from random import randint
from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally.task import atomic
from rally.task import scenario
from rally.task import types
@ -140,3 +140,22 @@ class CreateNetworkNovaBootPingSecGroups(vm_utils.VMScenario,
:returns: neutron router dict
"""
return self.admin_clients("neutron").create_router({"router": router_create_args})
@atomic.action_timer("neutron.create_security_group_rule")
def _create_security_group_rule(self, security_group_id,
**security_group_rule_args):
"""Create Neutron security-group-rule.
:param security_group_id: id of neutron security_group
:param security_group_rule_args: dict, POST
/v2.0/security-group-rules request options
:returns: dict, neutron security-group-rule
"""
security_group_rule_args["security_group_id"] = security_group_id
if "direction" not in security_group_rule_args:
security_group_rule_args["direction"] = "ingress"
if "protocol" not in security_group_rule_args:
security_group_rule_args["protocol"] = "tcp"
return self.clients("neutron").create_security_group_rule(
{"security_group_rule": security_group_rule_args})

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

@ -12,9 +12,9 @@
import logging
from rally_openstack import consts
from rally_openstack.scenarios.vm import utils as vm_utils
from rally.common import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally.utils import sshutils
from rally.task import scenario
from rally.task import types
from rally.task import validation

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

@ -10,9 +10,9 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.nova import utils as nova_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

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

@ -14,9 +14,9 @@ import logging
import os
import subprocess
from rally_openstack import consts
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally.task import atomic
from rally.task import scenario
from rally.task import types

8
rally/rally-plugins/netcreate-boot/trunk_network_simulation.py
View File

@ -13,11 +13,11 @@
import time
from rally.common import logging
from rally.common import sshutils
from rally.utils import sshutils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack import consts
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.common import consts
from rally.task import scenario
from rally.task import validation

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

@ -1,59 +0,0 @@
# 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.
from rally.common import logging
from rally_openstack import consts
from rally_openstack.contexts.network import networks
from rally.task import context
LOG = logging.getLogger(__name__)
@context.configure(name="browbeat_persist_network", order=350)
class BrowbeatPersistNetwork(networks.Network):
"""Create networking resources but does not clean them up
at the conclusion to allow resources to persist.
"""
CONFIG_SCHEMA = {
"type": "object",
"$schema": consts.JSON_SCHEMA,
"properties": {
"start_cidr": {
"type": "string"
},
"networks_per_tenant": {
"type": "integer",
"minimum": 1
},
"subnets_per_network": {
"type": "integer",
"minimum": 1
},
"network_create_args": {
"type": "object",
"additionalProperties": True
},
"dns_nameservers": {
"type": "array",
"items": {"type": "string"},
"uniqueItems": True
}
},
"additionalProperties": True
}
def setup(self):
super(BrowbeatPersistNetwork, self).setup()
def cleanup(self):
pass

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

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

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

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

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

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

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

@ -10,10 +10,10 @@
# See the License for the specific language governing permissions and
# limitations under the License.
from rally_openstack import consts
from rally_openstack.scenarios.cinder import utils as cinder_utils
from rally_openstack.scenarios.nova import utils as nova_utils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.cinder import utils as cinder_utils
from rally_openstack.task.scenarios.nova import utils as nova_utils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

10
rally/rally-plugins/octavia/octavia-create-loadabalancer-listeners-pools-members.py
View File

@ -14,11 +14,11 @@ import logging
import time
import io
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_openstack.scenarios.octavia import utils as octavia_utils
from rally.utils import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.octavia import utils as octavia_utils
from octaviaclient.api import exceptions
from rally.task import scenario

10
rally/rally-plugins/octavia/octavia-create-loadabalancer-resources.py
View File

@ -13,11 +13,11 @@
import logging
import time
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_openstack.scenarios.octavia import utils as octavia_utils
from rally.utils import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.octavia import utils as octavia_utils
from rally.task import atomic
from rally.task import scenario
from rally.task import types

10
rally/rally-plugins/octavia/octavia-fully-populated-loadbalancer.py
View File

@ -14,11 +14,11 @@ import io
import logging
import time
from rally_openstack import consts
from rally.common import sshutils
from rally_openstack.scenarios.vm import utils as vm_utils
from rally_openstack.scenarios.neutron import utils as neutron_utils
from rally_openstack.scenarios.octavia import utils as octavia_utils
from rally_openstack.common import consts
from rally.utils import sshutils
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.octavia import utils as octavia_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

10
rally/rally-plugins/workloads/abench.py
View File

@ -12,11 +12,11 @@
import logging
import time
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_openstack.scenarios.octavia import utils as octavia_utils
from rally.utils import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally_openstack.task.scenarios.octavia import utils as octavia_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

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

@ -19,10 +19,10 @@ import time
import browbeat.elastic
import six
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.utils import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally.task import scenario
from rally.task import types
from rally.task import validation

8
rally/rally-plugins/workloads/stress-ng.py
View File

@ -12,10 +12,10 @@
import logging
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.common import sshutils
from rally_openstack.common import consts
from rally_openstack.task.scenarios.vm import utils as vm_utils
from rally_openstack.task.scenarios.neutron import utils as neutron_utils
from rally.utils import sshutils
from rally.task import scenario
from rally.task import types
from rally.task import validation

8
rally/rally-plugins/workloads/sysbench.py
View File

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