Corrected output when env description is not provided.

Environment output format has been updated, table will be
shown when env description is not given.

Change-Id: I522c8eeebeeec8da14f35a0917139c570147760a
Closes-Bug: #1418916
This commit is contained in:
hardik
2015-09-24 14:06:38 +05:30
parent 33f5aeb320
commit a94aa36c61
2 changed files with 31 additions and 3 deletions

View File

@@ -66,9 +66,14 @@ def format(environment=None):
) )
if environment: if environment:
data = ( data = (environment.name,)
environment.name,
environment.description, if hasattr(environment, 'description'):
data += (environment.description or '<none>',)
else:
data += (None,)
data += (
json.dumps(environment.variables, indent=4), json.dumps(environment.variables, indent=4),
environment.scope, environment.scope,
environment.created_at, environment.created_at,

View File

@@ -585,6 +585,29 @@ class EnvironmentCLITests(base_v2.MistralClientTestBase):
envs = self.mistral_admin('environment-list') envs = self.mistral_admin('environment-list')
self.assertNotIn(env_name, [en['Name'] for en in envs]) self.assertNotIn(env_name, [en['Name'] for en in envs])
def test_environment_create_without_description(self):
self.create_file('env_without_des.yaml',
'name: env\n'
'variables:\n'
' var: "value"')
env = self.mistral_admin('environment-create',
params='env_without_des.yaml')
env_name = self.get_value_of_field(env, 'Name')
env_desc = self.get_value_of_field(env, 'Description')
self.assertTableStruct(env, ['Field', 'Value'])
envs = self.mistral_admin('environment-list')
self.assertIn(env_name, [en['Name'] for en in envs])
self.assertIn(env_desc, 'None')
self.mistral_admin('environment-delete', params='env')
envs = self.mistral_admin('environment-list')
self.assertNotIn(env_name, [en['Name'] for en in envs])
def test_environment_update(self): def test_environment_update(self):
env = self.environment_create('env.yaml') env = self.environment_create('env.yaml')
env_name = self.get_value_of_field(env, 'Name') env_name = self.get_value_of_field(env, 'Name')