2059 Commits

Author SHA1 Message Date
Tang Chen
c57fc41c33 Initialize _keys in __init__() in FakeFlavorResource
_keys is defined as a class attribute in FakeFlavorResource. So when
we call set_keys() to update it, it changes. And this change may bring
trouble to the other tests afterward.

So define and initialize it in __init__() as an object attribute.

Change-Id: Ib18c03877b67e1b7c2e107f598076b928a58e4fb
Closes-bug: #1548378
2016-02-23 00:14:56 +08:00
Jenkins
ba08683d90 Merge "Add unit test for "flavor show" command" 2016-02-22 03:24:56 +00:00
Jenkins
ac53fc5eb6 Merge "gitignore .idea" 2016-02-22 01:42:51 +00:00
Jenkins
a121361bac Merge "Add functional tests for "image" command v2" 2016-02-22 01:24:26 +00:00
Jenkins
b503734de0 Merge "Clean redundant argument to dict.get" 2016-02-22 01:24:20 +00:00
Jenkins
30e2643d23 Merge "Refactor: Set "project_id" for FakeXXX in a consistent style" 2016-02-21 06:16:55 +00:00
ting.wang
e2158b7ef4 Clean redundant argument to dict.get
`dict.get()` returns `None` by default, if a key wasn't found.
Removing `None` as second argument to avoid redundancy.

Change-Id: Ia82f7469cd019509bbeccbfe54b15eeedc7bb6ea
2016-02-21 13:21:31 +08:00
Jenkins
867bcb0db8 Merge "Support unscoped token request" 2016-02-21 04:31:51 +00:00
Jenkins
f4ca06cad6 Merge "Fix Mutable default argument" 2016-02-21 01:31:34 +00:00
Tang Chen
86cae7e170 Add functional tests for "image" command v2
The tests for image v2 are quite similar to the tests for v1.
The only difference things are:
1. v2 "image set" command only allows to change the disk format
   for a queued image
2. v2 "image show" command output is different from v1

Change-Id: Ieb6bec7467887aab567743153ea3181afa49537d
2016-02-21 08:25:27 +08:00
OpenStack Proposal Bot
097d35e130 Updated from global requirements
Change-Id: I387ac9f75fd542ade62869efaf173a4f8d769fe1
2016-02-20 22:00:37 +00:00
Jenkins
d01525f5e5 Merge "Trivial: Rename subnet_pool.rst to subnet-pool.rst" 2016-02-20 13:09:15 +00:00
Tang Chen
b4edbd55f2 Add unit test for "flavor show" command
Change-Id: I1591649e5b97a885707042fcccad3335ee8c7aec
2016-02-20 17:16:01 +08:00
Tang Chen
6af2883885 Refactor: Set "project_id" for FakeXXX in a consistent style
OpenStack SDK will translate "project_id" into "tenant_id" automatically
when referring to "tenant_id" attribute with the name "project_id". So
when faking an object returned fron SDK, we need to fake this behavior.

The original way is ugly. This patch turns it into a consistent style,
and give better comments.

Change-Id: I0dfb1f7552fc28eb4e7ebf5c614c9f3bde79ad80
2016-02-20 16:39:06 +08:00
ting.wang
dc5a8faddd Fix Mutable default argument
Python’s default arguments are evaluated once when the function is defined,
not each time the function is called. This means that if you use a mutable
default argument (like list and dict) and mutate it, you will and have mutated
that object for all future calls to the function as well.

more details about this wrong usage here:
http://docs.python-guide.org/en/latest/writing/gotchas/#mutable-default-arguments

Change-Id: If187f16bfb305ac4fe6e4177e498a06c49c3f946
2016-02-20 16:35:11 +08:00
ting.wang
eb6da5f0ba gitignore .idea
Directory .idea  is produces by pycharm.
We'd better ignore it.

Change-Id: Ia3cbca09398caeb88dd66f89adcd0fcfff8dac4c
2016-02-20 16:25:56 +08:00
Tang Chen
53e058fabc Trivial: Rename subnet_pool.rst to subnet-pool.rst
File names under doc/source/command-objects/ are words connected
with "-". So rename subnet_pool.rst to subnet-pool.rst to keep
the consistence.

Also use "display" instead of "show" in the comment to keep the
consistence.

Change-Id: If486f6cec34b4572a8245af865267b063c1e877d
2016-02-20 15:05:59 +08:00
ting.wang
5a978b9ec1 Replace string format arguments with function parameters
There are files containing string format arguments inside logging messages.
Using logging function parameters should be preferred.

Change-Id: I15b405bf4d4715263fe1e1262982467b3d4bc1f4
Closes-Bug: #1321274
2016-02-20 14:16:25 +08:00
guang-yee
41e1bd0be6 Support unscoped token request
Make scope check optional for the "token issue" command as unscoped token is
a valid Keystone V2/V3 API.

Change-Id: Ie1cded4dbfdafd3a78c0ebdf89e3f66762509930
Closes-Bug: #1543214
2016-02-19 16:07:13 -08:00
Jenkins
ab6ba385a2 Merge "Subnet Pool: Add "subnet pool show" command" 2016-02-19 18:17:00 +00:00
Jenkins
0a8137f773 Merge "Don't use Mock.called_once_with that does not exist" 2016-02-19 17:44:56 +00:00
Jenkins
20f86465af Merge "Use assertIsNone() instead of assertEqual(None, xxx)" 2016-02-19 16:13:40 +00:00
Jenkins
61d9604f8a Merge "Subnet Pool: Add "subnet pool list" command" 2016-02-19 15:55:29 +00:00
Tang Chen
ef64a8b47d Use assertIsNone() instead of assertEqual(None, xxx)
Change-Id: Ibbd7d6d27b2ff20304e3121fbadd5d50c1836d9b
2016-02-19 17:14:08 +08:00
Tang Chen
48681af86a Don't use Mock.called_once_with that does not exist
Class mock.Mock does not exist method "called_once_with()", it just
exists method "assert_called_once_with()". "called_once_with()" does
nothing because it's a mock object.

In OSC, only one place is still using "called_once_with()". Fix it.

Change-Id: Ib890e95d775c3fc43df80fa05c82d726e78cdac8
Partial Bug: 1544522
2016-02-19 13:44:54 +08:00
Tang Chen
ca34aa1587 Floating IP: Fix "ip floating list" in neutron network
The implementation of "ip floating list" in the commit below
is incorrect:

    Change-Id: I253f66f6bc64470e1a18ffea506048eb53f67d5c

This is because the FloatingIP objects returned from Nova and
Neutron network are different. They need different handling.

This patch fixes this problem.

The output for Neutron network would be:

+--------------------------------------+---------------------+------------------+------+
| ID                                   | Floating IP Address | Fixed IP Address | Port |
+--------------------------------------+---------------------+------------------+------+
| 1976df86-e66a-4f96-81bd-c6ffee6407f1 | 172.24.4.3          | None             | None |
+--------------------------------------+---------------------+------------------+------+

The output for Neutron network would be:

+----+---------------------+------------------+-----------+--------+
| ID | Floating IP Address | Fixed IP Address | Server ID | Pool   |
+----+---------------------+------------------+-----------+--------+
|  1 | 172.24.4.1          | None             | None      | public |
+----+---------------------+------------------+-----------+--------+

Change-Id: I1295e922df695414511d9a07ca4a8e2428040064
Partial-Bug: 1519502
Related-to: blueprint neutron-client
2016-02-19 11:10:53 +08:00
Tang Chen
3c8bb16513 Subnet Pool: Add "subnet pool show" command
Change-Id: I8dda7bbf1e27b0ac773f62a5cd293387da96f8df
Closes-Bug: 1544590
Implements: blueprint neutron-client
2016-02-19 11:05:28 +08:00
Tang Chen
a04012c3d5 Subnet Pool: Add "subnet pool list" command
Change-Id: I7935be2488fb728ced9680d75880870e5d315655
Closes-Bug: 1544589
Implements: blueprint neutron-client
2016-02-19 11:00:33 +08:00
Chaozhe.Chen
444fc6149d Remove unused test-requirments
WebOb is not needed in our test code.
So remove it to make less dependences.

Change-Id: I4910263449ff3d49c4ee44a6ef7a7762875fe76f
2016-02-18 22:51:04 +08:00
Jenkins
00a1dddc2a Merge "Subnet Pool: Add "subnet pool delete" command" 2016-02-18 09:58:22 +00:00
Jenkins
088f2446f2 Merge "Support "network show" command in nova network" 2016-02-18 09:03:56 +00:00
Jenkins
36b21461d9 Merge "Support "network list" command in nova network" 2016-02-18 09:03:49 +00:00
Jenkins
bb153b705a Merge "Refactor security group rule delete to use SDK" 2016-02-18 09:03:27 +00:00
Tang Chen
79fd6d3f20 Subnet Pool: Add "subnet pool delete" command
Change-Id: Ic5ba5effcaea2410421a81da8ffce7c0295179e7
Closes-Bug: 1544587
Partially implements: blueprint neutron-client
2016-02-18 08:53:39 +08:00
Jenkins
272ac55776 Merge "Return names in list role assignments" 2016-02-17 22:23:51 +00:00
Jenkins
f1ae75aa01 Merge "Add release note for "network delete" command for nova network" 2016-02-17 20:42:33 +00:00
Jenkins
713a9d7de9 Merge "Add release note for "ip floating delete/list" commands for neutron network" 2016-02-17 20:36:22 +00:00
Jenkins
f15a75428d Merge "Add "token revoke" for identity v3" 2016-02-17 20:31:07 +00:00
Jenkins
a517b1e9a6 Merge "Fix 'openstack --help' fails if clouds.yaml cannot be read" 2016-02-17 20:30:49 +00:00
Tang Chen
d9d1809907 Support "network show" command in nova network
"network show" command is not implemented in nova network.
This patch implements it.

Change-Id: I1fadd890fe36c4e3ac5c9ed389b20c5b2fff8aca
partial-Bug: 1543672
2016-02-17 17:09:51 +08:00
Tang Chen
ddc97c6dc5 Support "network list" command in nova network
"network list" command is not implemented in nova network.
This patch implements it.

The Network object in novaclient is quite different from
the one in sdk. And the output of "network list" using
Nova network is also quite different from using Neutron.

It is like this:

# openstack network list
+--------------------------------------+---------+-------------+
| ID                                   | Name    | Subnet      |
+--------------------------------------+---------+-------------+
| 96a98ec4-31f6-45f6-99e6-9384569b3bb5 | private | 10.0.0.0/24 |
+--------------------------------------+---------+-------------+

--long and --external options have not been implemented because
the attrs in Network object in novaclient is too much different.

This patch also introduces a new FakeNetwork class in compute/v2/fake.py
to fake nova network.

Change-Id: Id1fdf81fb2fa8b39f2c76b7bae37ac4fecafd0f7
Depends-On: I1b59264cd40aaf1062f4e8db233ccb7fd0e95f0e
partial-Bug: 1543672
2016-02-17 17:04:43 +08:00
Tang Chen
0a3ba91d53 Add release note for "network delete" command for nova network
Change-Id: Idb8a24465e447e90315c0f614ad91bd7eabd6878
partial-Bug: 1543672
2016-02-17 17:04:32 +08:00
Tang Chen
da3d65299b Define FakeFloatingIP class in tests/compute for nova network commands
"ip floating list" command is not available for Neutron now because
the implementation is incorrect.

The FloatingIP objects returned from Nova and Neutron network are
quite different. So they need different FakeFloatingIP class to
do the tests.

This patch copies class FakeFloatingIP in tests/network to tests/compute
for Nova network tests.

Will fix the problem in "ip floating list" command and change FakeFloatingIP
in tests/network to fit Neutron network tests.

Change-Id: Ia29d257868e0f1dc6cd7cfe3819875e5913f76ec
Partial-Bug: 1519502
Partially implements: blueprint neutron-client
2016-02-16 15:14:34 +08:00
Tang Chen
5f40e1ea45 Add release note for "ip floating delete/list" commands for neutron network
Change-Id: Ic90abf106a06edf9af4fe4c8938ab92bfdd8bb42
partial-Bug: 1519502
Related-to: blueprint neutron-client
2016-02-16 13:38:20 +08:00
Jenkins
c8753808a2 Merge "Refactor security group functional tests" 2016-02-15 20:46:51 +00:00
Jenkins
67bec569f8 Merge "Rename parameter "identifier" to "network" in network commands" 2016-02-15 17:16:30 +00:00
Jenkins
5543857381 Merge "Use assertRaises() to check if an exception is raised" 2016-02-15 17:14:42 +00:00
Hideki Saito
e5b8e08eb1 Fix 'openstack --help' fails if clouds.yaml cannot be read
'openstack --help' can display the basic information, even if
 openstack command does not have permission to read clouds.yaml.

Change-Id: I7d5255c5ce3bd60af77fc70f433ca78dc011a79f
Closes-Bug: #1541047
2016-02-14 22:08:01 +09:00
Tang Chen
324e026f57 Rename parameter "identifier" to "network" in network commands
In other commands, the name or ID of an object is just the name
of the object. For example, name or ID of a server is "server",
router is "router". So, do not use "identifier" in network commands.

Also, the parameter in doc file network.rst is not "identifier",
but "network".

Change-Id: I1ec3beefbb878a207bca280b994ca176ef04ee2d
2016-02-14 18:57:34 +08:00
Tang Chen
cfcb750a97 Use assertRaises() to check if an exception is raised
In some test cases, try/except is used to check if an exception
has been raised. We should use assertRaises() instead.

Change-Id: I15c8e757dcab77fd6f895feb018184e1eb7e617b
2016-02-14 18:43:19 +08:00