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

ansible/install/group_vars/all.yml

@@ -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"

browbeat-config.yaml

@@ -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

rally/rally-plugins/cinder/boot_vm_attach_volume_list.py

@@ -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

rally/rally-plugins/dynamic-workloads/dynamic_utils.py

@@ -14,10 +14,10 @@
 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
 

rally/rally-plugins/dynamic-workloads/dynamic_workload.py

@@ -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

rally/rally-plugins/dynamic-workloads/dynamic_workload_min.py

@@ -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

rally/rally-plugins/dynamic-workloads/octavia.py

@@ -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
 

rally/rally-plugins/dynamic-workloads/provider_network.py

@@ -14,7 +14,7 @@
 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
 

rally/rally-plugins/dynamic-workloads/rally_context.py

@@ -14,8 +14,8 @@
 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
 

rally/rally-plugins/glance/glance_create_boot_delete.py

@@ -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
 

rally/rally-plugins/netcreate-boot/netcreate_nova_boot.py

@@ -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

rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping.py

@@ -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

rally/rally-plugins/netcreate-boot/netcreate_nova_boot_fip_ping_sec_groups.py

@@ -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 @@ def _create_router(self, router_create_args):
         :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})

rally/rally-plugins/netcreate-boot/netcreate_nova_boot_test_metadata.py

@@ -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

rally/rally-plugins/netcreate-boot/netcreate_nova_boot_vms_on_single_network.py

@@ -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

rally/rally-plugins/netcreate-boot/provider_netcreate_nova_boot_ping.py

@@ -14,9 +14,9 @@
 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

rally/rally-plugins/netcreate-boot/trunk_network_simulation.py

@@ -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
 

rally/rally-plugins/neutron/port_create_assoicate.py

@@ -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

rally/rally-plugins/neutron/router_subnet_create_delete.py

@@ -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
 

rally/rally-plugins/neutron/securitygroup_port.py

@@ -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
 

rally/rally-plugins/nova/nova.py

@@ -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

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

@@ -14,11 +14,11 @@
 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

rally/rally-plugins/octavia/octavia-create-loadabalancer-resources.py

@@ -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