From 1446ffe8b92fc1fcef3ffe89b178fe9ed5c8fefc Mon Sep 17 00:00:00 2001 From: Tamar Ben-Shachar Date: Mon, 29 Feb 2016 12:12:42 -0800 Subject: [PATCH] update `dcos package repo remove` to only take repo-name as paramater --- cli/dcoscli/data/help/package.txt | 8 +------- cli/dcoscli/package/main.py | 8 +++----- cli/tests/data/help/package.txt | 8 +------- cli/tests/integrations/test_package.py | 17 ++++++----------- dcos/cosmospackage.py | 14 ++++++++------ 5 files changed, 19 insertions(+), 36 deletions(-) diff --git a/cli/dcoscli/data/help/package.txt b/cli/dcoscli/data/help/package.txt index 85f7eb2..7a39032 100644 --- a/cli/dcoscli/data/help/package.txt +++ b/cli/dcoscli/data/help/package.txt @@ -17,7 +17,7 @@ Usage: dcos package list [--json --app-id= ] dcos package search [--json ] dcos package repo add [--index=] - dcos package repo remove (--repo-name= | --repo-url=) + dcos package repo remove dcos package repo list [--json] dcos package uninstall [--cli | [--app --app-id= --all]] @@ -62,12 +62,6 @@ Options: values from config.json and --options. If not provided, print the raw templates. - --repo-name= - Name for repository - - --repo-url= - URL of repository of DCOS packages. E.g. https://universe.mesosphere.com/repo - --version Show version diff --git a/cli/dcoscli/package/main.py b/cli/dcoscli/package/main.py index 1349cf5..dfaa6b6 100644 --- a/cli/dcoscli/package/main.py +++ b/cli/dcoscli/package/main.py @@ -65,7 +65,7 @@ def _cmds(): cmds.Command( hierarchy=['package', 'repo', 'remove'], - arg_keys=['--repo-name', '--repo-url'], + arg_keys=[''], function=_remove_repo), cmds.Command( @@ -182,19 +182,17 @@ def _add_repo(repo_name, repo_url, index): return 0 -def _remove_repo(repo_name, repo_url): +def _remove_repo(repo_name): """Remove package repo and update repo with new repo :param repo_name: name to call repo :type repo_name: str - :param repo_url: location of repo to add - :type repo_url: str :returns: Process status :rtype: int """ package_manager = _get_package_manager() - package_manager.remove_repo(repo_name, repo_url) + package_manager.remove_repo(repo_name) return 0 diff --git a/cli/tests/data/help/package.txt b/cli/tests/data/help/package.txt index 85f7eb2..7a39032 100644 --- a/cli/tests/data/help/package.txt +++ b/cli/tests/data/help/package.txt @@ -17,7 +17,7 @@ Usage: dcos package list [--json --app-id= ] dcos package search [--json ] dcos package repo add [--index=] - dcos package repo remove (--repo-name= | --repo-url=) + dcos package repo remove dcos package repo list [--json] dcos package uninstall [--cli | [--app --app-id= --all]] @@ -62,12 +62,6 @@ Options: values from config.json and --options. If not provided, print the raw templates. - --repo-name= - Name for repository - - --repo-url= - URL of repository of DCOS packages. E.g. https://universe.mesosphere.com/repo - --version Show version diff --git a/cli/tests/integrations/test_package.py b/cli/tests/integrations/test_package.py index 837bfb6..8d6e079 100644 --- a/cli/tests/integrations/test_package.py +++ b/cli/tests/integrations/test_package.py @@ -16,14 +16,14 @@ from .common import (assert_command, assert_lines, delete_zk_node, def setup_module(module): assert_command( - ['dcos', 'package', 'repo', 'remove', '--repo-name=Universe']) + ['dcos', 'package', 'repo', 'remove', 'Universe']) repo = "https://github.com/mesosphere/universe/archive/cli-test-4.zip" assert_command(['dcos', 'package', 'repo', 'add', 'test4', repo]) def teardown_module(module): assert_command( - ['dcos', 'package', 'repo', 'remove', '--repo-name=test4']) + ['dcos', 'package', 'repo', 'remove', 'test4']) repo = "https://universe.mesosphere.com/repo" assert_command(['dcos', 'package', 'repo', 'add', 'Universe', repo]) @@ -89,26 +89,21 @@ test: https://github.com/mesosphere/universe/archive/cli-test-3.zip _repo_add(args, repo_list) -def test_repo_remove_by_repo_name(): +def test_repo_remove(): repo_list = b"""\ test4: https://github.com/mesosphere/universe/archive/cli-test-4.zip test2: https://github.com/mesosphere/universe/archive/cli-test-2.zip """ - _repo_remove(['--repo-name=test'], repo_list) - - -def test_repo_remove_by_package_repo(): - repo = \ - "https://github.com/mesosphere/universe/archive/cli-test-2.zip" + _repo_remove(['test'], repo_list) repo_list = b"""\ test4: https://github.com/mesosphere/universe/archive/cli-test-4.zip """ - _repo_remove(['--repo-url={}'.format(repo)], repo_list) + _repo_remove(['test2'], repo_list) def test_repo_empty(): assert_command( - ['dcos', 'package', 'repo', 'remove', '--repo-name=test4']) + ['dcos', 'package', 'repo', 'remove', 'test4']) returncode, stdout, stderr = exec_command( ['dcos', 'package', 'repo', 'list']) diff --git a/dcos/cosmospackage.py b/dcos/cosmospackage.py index 1e1f62f..77bae9d 100644 --- a/dcos/cosmospackage.py +++ b/dcos/cosmospackage.py @@ -173,7 +173,8 @@ class Cosmos(): :type package_repo: str :param index: index to add this repo :type index: int - :rtype: None + :returns: current repo list + :rtype: dict """ params = {"name": name, "uri": package_repo} @@ -182,15 +183,16 @@ class Cosmos(): response = self.cosmos_post("repository/add", params=params) return response.json() - def remove_repo(self, name, package_repo): + def remove_repo(self, name): """Remove package repo and update repo - :param package_repo: location of repo to remove - :type package_repo: str - :rtype: None + :param name: name of repo to remove + :type name: str + :returns: current repo list + :rtype: dict """ - params = {"name": name, "uri": package_repo} + params = {"name": name} response = self.cosmos_post("repository/delete", params=params) return response.json()