diff --git a/setup.cfg b/setup.cfg index fc3099392..be30186aa 100644 --- a/setup.cfg +++ b/setup.cfg @@ -53,6 +53,7 @@ openstack.tripleoclient.v2 = overcloud_image_build = tripleoclient.v1.overcloud_image:BuildOvercloudImage overcloud_image_upload = tripleoclient.v1.overcloud_image:UploadOvercloudImage overcloud_network_extract = tripleoclient.v2.overcloud_network:OvercloudNetworkExtract + overcloud_network_provision = tripleoclient.v2.overcloud_network:OvercloudNetworkProvision overcloud_node_configure = tripleoclient.v1.overcloud_node:ConfigureNode overcloud_node_delete = tripleoclient.v1.overcloud_node:DeleteNode overcloud_node_import = tripleoclient.v2.overcloud_node:ImportNode diff --git a/tripleoclient/tests/v2/overcloud_network/test_overcloud_network.py b/tripleoclient/tests/v2/overcloud_network/test_overcloud_network.py index 39ba95bc2..4c1011652 100644 --- a/tripleoclient/tests/v2/overcloud_network/test_overcloud_network.py +++ b/tripleoclient/tests/v2/overcloud_network/test_overcloud_network.py @@ -65,3 +65,57 @@ class TestOvercloudNetworkExtract(fakes.FakePlaybookExecution): parsed_args = self.check_parser(self.cmd, arglist, []) self.assertRaises(osc_lib_exc.CommandError, self.cmd.take_action, parsed_args) + + +class TestOvercloudNetworkProvision(fakes.FakePlaybookExecution): + + def setUp(self): + super(TestOvercloudNetworkProvision, self).setUp() + + # Get the command object to test + app_args = mock.Mock() + app_args.verbose_level = 1 + self.app.options = fakes.FakeOptions() + self.cmd = overcloud_network.OvercloudNetworkProvision(self.app, None) + self.cmd.app_args = mock.Mock(verbose_level=1) + + @mock.patch('tripleoclient.utils.TempDirs', autospect=True) + @mock.patch('os.path.abspath', autospect=True) + @mock.patch('os.path.exists', autospect=True) + @mock.patch('tripleoclient.utils.run_ansible_playbook', autospec=True) + def test_overcloud_network_provision(self, mock_playbook, mock_path_exists, + mock_abspath, mock_tempdirs): + arglist = ['--output', 'deployed_networks.yaml', '--yes', + 'network_data_v2.yaml'] + parsed_args = self.check_parser(self.cmd, arglist, []) + + mock_abspath.side_effect = ['/test/network_data_v2.yaml', + '/test/deployed_networks.yaml'] + mock_path_exists.side_effect = [True, True] + self.cmd.take_action(parsed_args) + mock_playbook.assert_called_once_with( + workdir=mock.ANY, + playbook='cli-overcloud-network-provision.yaml', + inventory=mock.ANY, + playbook_dir=mock.ANY, + verbosity=3, + extra_vars={ + "network_data_path": '/test/network_data_v2.yaml', + "network_deployed_path": '/test/deployed_networks.yaml', + "overwrite": True + } + ) + + @mock.patch('os.path.abspath', autospect=True) + @mock.patch('os.path.exists', autospect=True) + def test_overcloud_network_extract_no_overwrite(self, mock_abspath, + mock_path_exists): + arglist = ['--output', 'deployed_networks.yaml', 'network-data.yaml'] + parsed_args = self.check_parser(self.cmd, arglist, []) + + mock_abspath.side_effect = ['/test/network_data_v2.yaml', + '/test/deployed_networks.yaml'] + mock_path_exists.side_effect = [True, True] + + self.assertRaises(osc_lib_exc.CommandError, + self.cmd.take_action, parsed_args) diff --git a/tripleoclient/v2/overcloud_network.py b/tripleoclient/v2/overcloud_network.py index 9082c3294..f57df2b94 100644 --- a/tripleoclient/v2/overcloud_network.py +++ b/tripleoclient/v2/overcloud_network.py @@ -76,3 +76,62 @@ class OvercloudNetworkExtract(command.Command): verbosity=oooutils.playbook_verbosity(self=self), extra_vars=extra_vars, ) + + +class OvercloudNetworkProvision(command.Command): + + log = logging.getLogger(__name__ + ".OvercloudNetworkProvision") + + def get_parser(self, prog_name): + parser = super(OvercloudNetworkProvision, self).get_parser(prog_name) + + parser.add_argument('networks_file', + metavar='', + help=_('Configuration file describing the network ' + 'deployment.')) + parser.add_argument('-o', '--output', required=True, + metavar='', + help=_('The output network environment file ' + 'path.')) + parser.add_argument('-y', '--yes', default=False, action='store_true', + help=_('Skip yes/no prompt for existing files ' + '(assume yes).')) + + return parser + + def take_action(self, parsed_args): + self.log.debug("take_action(%s)" % parsed_args) + + networks_file_path = os.path.abspath(parsed_args.networks_file) + output_path = os.path.abspath(parsed_args.output) + + if not os.path.exists(networks_file_path): + raise oscexc.CommandError( + "Network configuration file does not exist:" + " %s" % parsed_args.networks_file) + + overwrite = parsed_args.yes + if (os.path.exists(output_path) and not overwrite + and not oooutils.prompt_user_for_confirmation( + 'Overwrite existing file %s [y/N]?' % parsed_args.output, + self.log)): + raise oscexc.CommandError("Will not overwrite existing file:" + " %s" % parsed_args.output) + else: + overwrite = True + + extra_vars = { + "network_data_path": networks_file_path, + "network_deployed_path": output_path, + "overwrite": overwrite + } + + with oooutils.TempDirs() as tmp: + oooutils.run_ansible_playbook( + playbook='cli-overcloud-network-provision.yaml', + inventory='localhost,', + workdir=tmp, + playbook_dir=constants.ANSIBLE_TRIPLEO_PLAYBOOKS, + verbosity=oooutils.playbook_verbosity(self=self), + extra_vars=extra_vars, + )