Don't expect NST to be specified in a cluster
Nailgun apparently does not include information about network segmentation type to JSON representations of environments for GET and POST requests. This patch removes all references to that information. Closes-bug: #1514897 Change-Id: I0d7970ad4c45c4e6175a7366610df1ec2a850254
This commit is contained in:
@@ -28,8 +28,7 @@ class EnvList(EnvMixIn, base.BaseListCommand):
|
||||
columns = ("id",
|
||||
"status",
|
||||
"name",
|
||||
"release_id",
|
||||
"net_segment_type")
|
||||
"release_id")
|
||||
|
||||
|
||||
class EnvShow(EnvMixIn, base.BaseShowCommand):
|
||||
@@ -41,8 +40,7 @@ class EnvShow(EnvMixIn, base.BaseShowCommand):
|
||||
"release_id",
|
||||
"pending_release_id",
|
||||
"is_customized",
|
||||
"changes",
|
||||
"net_segment_type")
|
||||
"changes")
|
||||
|
||||
|
||||
class EnvCreate(EnvMixIn, base.BaseShowCommand):
|
||||
|
||||
@@ -94,25 +94,22 @@ class BaseCLITest(oslo_base.BaseTestCase):
|
||||
|
||||
@mock.patch('cliff.formatters.table.TableFormatter.emit_list')
|
||||
def test_lister_sorting(self, m_emit_list):
|
||||
cmd = 'env list -s status net_segment_type'
|
||||
cmd = 'env list -s status release_id'
|
||||
|
||||
raw_data = [{'id': 43,
|
||||
'status': 'STATUS 2',
|
||||
'name': 'Test env 2',
|
||||
'release_id': 2,
|
||||
'net_segment_type': 'tun'},
|
||||
'release_id': 2},
|
||||
|
||||
{'id': 42,
|
||||
'status': 'STATUS 1',
|
||||
'name': 'Test env 1',
|
||||
'release_id': 2,
|
||||
'net_segment_type': 'tun'},
|
||||
'release_id': 2},
|
||||
|
||||
{'id': 44,
|
||||
'status': 'STATUS 2',
|
||||
'name': 'Test env 3',
|
||||
'release_id': 2,
|
||||
'net_segment_type': 'gre'}]
|
||||
'release_id': 1}]
|
||||
|
||||
expected_order = [1, 2, 0]
|
||||
expected_data = [[raw_data[i][prop] for prop in env.EnvList.columns]
|
||||
|
||||
@@ -68,7 +68,7 @@ class TestEnvFacade(test_api.BaseLibTest):
|
||||
def test_env_create(self, m_init):
|
||||
env_name = self.fake_env['name']
|
||||
release_id = self.fake_env['release_id']
|
||||
nst = self.fake_env['net_segment_type']
|
||||
nst = 'vlan'
|
||||
|
||||
matcher = self.m_request.post(self.res_uri, json=self.fake_env)
|
||||
|
||||
|
||||
@@ -27,7 +27,6 @@ def get_fake_env(name=None, status=None, release_id=None,
|
||||
'is_customized': False,
|
||||
'release_id': release_id or 2,
|
||||
'name': name or 'fake_env',
|
||||
'net_segment_type': 'vlan',
|
||||
'fuel_version': fuel_version or '8.0',
|
||||
'pending_release_id': pending_release,
|
||||
'id': env_id or 1,
|
||||
|
||||
Reference in New Issue
Block a user