diff --git a/solumclient/solum.py b/solumclient/solum.py index fb0bacf..7e78c16 100644 --- a/solumclient/solum.py +++ b/solumclient/solum.py @@ -536,12 +536,8 @@ Available commands: raise exc.CommandException(message="Missing artifacts section") elif plan_definition['artifacts'] is None: raise exc.CommandException(message="Artifacts cannot be empty") - elif 'name' not in plan_definition['artifacts'][0]: - raise exc.CommandException(message="Artifact name missing") elif 'content' not in plan_definition['artifacts'][0]: raise exc.CommandException(message="Artifact content missing") - elif 'language_pack' not in plan_definition['artifacts'][0]: - raise exc.CommandException(message="Language pack missing") def list(self): """Print a list of all deployed applications.""" @@ -696,7 +692,9 @@ Available commands: while not name: name = raw_input("Please name the application.\n> ") plan_definition['name'] = name - plan_definition['artifacts'][0]['name'] = name + + if 'name' not in plan_definition['artifacts'][0]: + plan_definition['artifacts'][0]['name'] = plan_definition['name'] if args.desc is not None: plan_definition['description'] = args.desc diff --git a/solumclient/tests/test_solum.py b/solumclient/tests/test_solum.py index 3027a8a..a77ef8d 100644 --- a/solumclient/tests/test_solum.py +++ b/solumclient/tests/test_solum.py @@ -274,20 +274,6 @@ class TestSolum(base.TestCase): out = self.shell("app create --plan-file /dev/null") self.assertEqual("ERROR: Artifacts cannot be empty\n", out) - def test_app_create_with_artifacts_no_name(self): - raw_data = 'version: 1\nname: ex_plan1\ndescription: d1.\nartifacts:\n' - raw_data += '- content:\n' - raw_data += ' href: asdfds\n' - raw_data += ' artifact_type: heroku\n' - raw_data += ' language_pack: lp' - - mopen = mock.mock_open(read_data=raw_data) - - with mock.patch('%s.open' % solum.__name__, mopen, create=True): - self.make_env() - out = self.shell("app create --plan-file /dev/null") - self.assertEqual("ERROR: Artifact name missing\n", out) - def test_app_create_with_artifacts_no_content(self): raw_data = 'version: 1\nname: ex_plan1\ndescription: d1.\nartifacts:\n' raw_data += '- name: asdfds\n' @@ -301,17 +287,6 @@ class TestSolum(base.TestCase): out = self.shell("app create --plan-file /dev/null") self.assertEqual("ERROR: Artifact content missing\n", out) - def test_app_create_with_artifacts_no_lp(self): - raw_data = 'version: 1\nname: ex_plan1\ndescription: d1.\nartifacts:\n' - raw_data += '- name:asdfds' - raw_data += ' content:asdfds' - mopen = mock.mock_open(read_data=raw_data) - - with mock.patch('%s.open' % solum.__name__, mopen, create=True): - self.make_env() - out = self.shell("app create --plan-file /dev/null") - self.assertEqual("ERROR: Language pack missing\n", out) - # Plan Tests # @mock.patch.object(plan.PlanManager, "create") def test_plan_create(self, mock_plan_create):