projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into paas
[osm/osmclient.git]
/
osmclient
/
scripts
/
tests
/
tests_vca.py
diff --git
a/osmclient/scripts/tests/tests_vca.py
b/osmclient/scripts/tests/tests_vca.py
index
030a51f
..
f1ebb5f
100644
(file)
--- a/
osmclient/scripts/tests/tests_vca.py
+++ b/
osmclient/scripts/tests/tests_vca.py
@@
-13,21
+13,20
@@
# limitations under the License.
# limitations under the License.
+from click.testing import CliRunner
import json
import unittest
from unittest.mock import Mock, patch
import yaml
import json
import unittest
from unittest.mock import Mock, patch
import yaml
-
-from click.testing import CliRunner
-from osmclient.scripts import osm
+from osmclient.cli_commands import vca
@patch("builtins.print")
@patch("builtins.print")
-@patch("osmclient.
scripts.osm
.PrettyTable")
+@patch("osmclient.
cli_commands.vca
.PrettyTable")
@patch("osmclient.scripts.osm.client.Client")
@patch("osmclient.scripts.osm.client.Client")
-@patch("osmclient.
scripts.osm
.check_client_version")
-@patch("osmclient.
scripts.osm
.get_project")
+@patch("osmclient.
cli_commands.utils
.check_client_version")
+@patch("osmclient.
cli_commands.vca.utils
.get_project")
class TestVca(unittest.TestCase):
def setUp(self):
self.runner = CliRunner()
class TestVca(unittest.TestCase):
def setUp(self):
self.runner = CliRunner()
@@
-55,8
+54,9
@@
class TestVca(unittest.TestCase):
mock_get_project.return_value = ("5678", "project")
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
mock_get_project.return_value = ("5678", "project")
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
- osm.cli_osm,
- ["vca-list", "--filter", "somefilter"],
+ vca.vca_list,
+ obj=self.ctx_obj,
+ args=["--filter", "somefilter"],
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called_with("somefilter")
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called_with("somefilter")
@@
-77,8
+77,9
@@
class TestVca(unittest.TestCase):
mock_get_project.return_value = ("5678", "project")
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
mock_get_project.return_value = ("5678", "project")
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
- osm.cli_osm,
- ["vca-list", "--filter", "somefilter", "--long"],
+ vca.vca_list,
+ obj=self.ctx_obj,
+ args=["--filter", "somefilter", "--long"],
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called_with("somefilter")
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called_with("somefilter")
@@
-101,8
+102,9
@@
class TestVca(unittest.TestCase):
mock_client.return_value = self.ctx_obj
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
mock_client.return_value = self.ctx_obj
self.ctx_obj.vca.list.return_value = [self.vca_data]
self.runner.invoke(
- osm.cli_osm,
- ["vca-list", "--literal"],
+ vca.vca_list,
+ obj=self.ctx_obj,
+ args=["--literal"],
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called()
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.list.assert_called()
@@
-124,8
+126,9
@@
class TestVca(unittest.TestCase):
mock_pretty_table.return_value = self.table
self.ctx_obj.vca.get.return_value = self.vca_data
self.runner.invoke(
mock_pretty_table.return_value = self.table
self.ctx_obj.vca.get.return_value = self.vca_data
self.runner.invoke(
- osm.cli_osm,
- ["vca-show", "name"],
+ vca.vca_show,
+ obj=self.ctx_obj,
+ args=["name"],
)
self.ctx_obj.vca.get.assert_called_with("name")
mock_pretty_table.assert_called_with(["key", "attribute"])
)
self.ctx_obj.vca.get.assert_called_with("name")
mock_pretty_table.assert_called_with(["key", "attribute"])
@@
-143,8
+146,9
@@
class TestVca(unittest.TestCase):
mock_client.return_value = self.ctx_obj
self.ctx_obj.vca.get.return_value = self.vca_data
self.runner.invoke(
mock_client.return_value = self.ctx_obj
self.ctx_obj.vca.get.return_value = self.vca_data
self.runner.invoke(
- osm.cli_osm,
- ["vca-show", "name", "--literal"],
+ vca.vca_show,
+ obj=self.ctx_obj,
+ args=["name", "--literal"],
)
self.ctx_obj.vca.get.assert_called_with("name")
mock_pretty_table.assert_not_called()
)
self.ctx_obj.vca.get.assert_called_with("name")
mock_pretty_table.assert_not_called()
@@
-163,8
+167,9
@@
class TestVca(unittest.TestCase):
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
- osm.cli_osm,
- ["vca-update", "name"],
+ vca.vca_update,
+ obj=self.ctx_obj,
+ args=["name"],
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.update.assert_called_with("name", {"name": "name"})
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.update.assert_called_with("name", {"name": "name"})
@@
-182,9
+187,9
@@
class TestVca(unittest.TestCase):
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
-
osm.cli_osm
,
- [
- "vca-update",
+
vca.vca_update
,
+ obj=self.ctx_obj,
+ args=[
"name",
"--endpoints",
"1.2.3.4:17070",
"name",
"--endpoints",
"1.2.3.4:17070",
@@
-239,9
+244,9
@@
class TestVca(unittest.TestCase):
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
-
osm.cli_osm
,
- [
- "vca-add",
+
vca.vca_add
,
+ obj=self.ctx_obj,
+ args=[
"name",
"--endpoints",
"1.2.3.4:17070",
"name",
"--endpoints",
"1.2.3.4:17070",
@@
-296,8
+301,9
@@
class TestVca(unittest.TestCase):
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
):
mock_client.return_value = self.ctx_obj
self.runner.invoke(
- osm.cli_osm,
- ["vca-delete", "name"],
+ vca.vca_delete,
+ obj=self.ctx_obj,
+ args=["name"],
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.delete.assert_called_with("name", force=False)
)
mock_check_client_version.assert_called()
self.ctx_obj.vca.delete.assert_called_with("name", force=False)
@@
-313,5
+319,5
@@
class TestVca(unittest.TestCase):
mock_pretty_table,
mock_print,
):
mock_pretty_table,
mock_print,
):
- data =
osm
.load(json.dumps({"juju-https-proxy": "http://squid:3128"}))
+ data =
vca
.load(json.dumps({"juju-https-proxy": "http://squid:3128"}))
self.assertEqual(data, {"juju-https-proxy": "http://squid:3128"})
self.assertEqual(data, {"juju-https-proxy": "http://squid:3128"})