openstack/deb-python-neutronclient
Code Issues Proposed changes

Merge "Adding registration interface for non_admin_status_resources"

Browse Source
This commit is contained in:
Jenkins
2015-08-21 08:35:35 +00:00
committed by Gerrit Code Review
parent 45ed3ecd30 f6ca3a1fd3
commit a2f8b8f4c6
1 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
neutronclient/tests/unit/test_cli20.py
View File

@@ -15,6 +15,7 @@
# #
import contextlib import contextlib
import copy
import itertools import itertools
import sys import sys
@@ -38,6 +39,16 @@ FORMAT = 'json'
TOKEN = 'testtoken' TOKEN = 'testtoken'
ENDURL = 'localurl' ENDURL = 'localurl'
non_admin_status_resources = ['subnet', 'floatingip', 'security_group',
'security_group_rule', 'qos_queue',
'network_gateway', 'gateway_device',
'credential', 'network_profile',
'policy_profile', 'ikepolicy',
'ipsecpolicy', 'metering_label',
'metering_label_rule', 'net_partition',
'fox_socket', 'subnetpool',
'rbac_policy', 'address_scope']
@contextlib.contextmanager @contextlib.contextmanager
def capture_std_streams(): def capture_std_streams():
@@ -186,6 +197,7 @@ class CLITestV20Base(base.BaseTestCase):
"""Prepare the test environment.""" """Prepare the test environment."""
super(CLITestV20Base, self).setUp() super(CLITestV20Base, self).setUp()
client.Client.EXTED_PLURALS.update(constants.PLURALS) client.Client.EXTED_PLURALS.update(constants.PLURALS)
self.non_admin_status_resources = copy.copy(non_admin_status_resources)
if plurals is not None: if plurals is not None:
client.Client.EXTED_PLURALS.update(plurals) client.Client.EXTED_PLURALS.update(plurals)
self.metadata = {'plurals': client.Client.EXTED_PLURALS, self.metadata = {'plurals': client.Client.EXTED_PLURALS,
@@ -207,6 +219,9 @@ class CLITestV20Base(base.BaseTestCase):
self._get_attr_metadata)) self._get_attr_metadata))
self.client = client.Client(token=TOKEN, endpoint_url=self.endurl) self.client = client.Client(token=TOKEN, endpoint_url=self.endurl)
def register_non_admin_status_resource(self, resource_name):
self.non_admin_status_resources.append(resource_name)
def _test_create_resource(self, resource, cmd, name, myid, args, def _test_create_resource(self, resource, cmd, name, myid, args,
position_names, position_values, position_names, position_values,
tenant_id=None, tags=None, admin_state_up=True, tenant_id=None, tags=None, admin_state_up=True,
@@ -217,18 +232,9 @@ class CLITestV20Base(base.BaseTestCase):
self.mox.StubOutWithMock(cmd, "get_client") self.mox.StubOutWithMock(cmd, "get_client")
self.mox.StubOutWithMock(self.client.httpclient, "request") self.mox.StubOutWithMock(self.client.httpclient, "request")
cmd.get_client().MultipleTimes().AndReturn(self.client) cmd.get_client().MultipleTimes().AndReturn(self.client)
non_admin_status_resources = ['subnet', 'floatingip', 'security_group',
'security_group_rule', 'qos_queue',
'network_gateway', 'gateway_device',
'credential', 'network_profile',
'policy_profile', 'ikepolicy',
'ipsecpolicy', 'metering_label',
'metering_label_rule', 'net_partition',
'fox_socket', 'subnetpool',
'rbac_policy', 'address_scope']
if not cmd_resource: if not cmd_resource:
cmd_resource = resource cmd_resource = resource
if (resource in non_admin_status_resources): if (resource in self.non_admin_status_resources):
body = {resource: {}, } body = {resource: {}, }
else: else:
body = {resource: {'admin_state_up': admin_state_up, }, } body = {resource: {'admin_state_up': admin_state_up, }, }