summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | gitignore .ideating.wang2016-02-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Directory .idea is produces by pycharm. We'd better ignore it. Change-Id: Ia3cbca09398caeb88dd66f89adcd0fcfff8dac4c
* | | | | | Merge "Add functional tests for "image" command v2"Jenkins2016-02-222-0/+67
|\ \ \ \ \ \
| * | | | | | Add functional tests for "image" command v2Tang Chen2016-02-212-0/+67
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Clean redundant argument to dict.get"Jenkins2016-02-225-47/+42
|\ \ \ \ \ \
| * | | | | | Clean redundant argument to dict.getting.wang2016-02-215-47/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `dict.get()` returns `None` by default, if a key wasn't found. Removing `None` as second argument to avoid redundancy. Change-Id: Ia82f7469cd019509bbeccbfe54b15eeedc7bb6ea
* | | | | | | Merge "Refactor: Set "project_id" for FakeXXX in a consistent style"Jenkins2016-02-211-10/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refactor: Set "project_id" for FakeXXX in a consistent styleTang Chen2016-02-201-10/+9
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Support unscoped token request"Jenkins2016-02-2111-6/+125
|\ \ \ \ \ \
| * | | | | | Support unscoped token requestguang-yee2016-02-1911-6/+125
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Merge "Fix Mutable default argument"Jenkins2016-02-211-2/+12
|\ \ \ \ \ \
| * | | | | | Fix Mutable default argumentting.wang2016-02-201-2/+12
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | Updated from global requirementsOpenStack Proposal Bot2016-02-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I387ac9f75fd542ade62869efaf173a4f8d769fe1
* | | | | | Merge "Trivial: Rename subnet_pool.rst to subnet-pool.rst"Jenkins2016-02-202-4/+4
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Trivial: Rename subnet_pool.rst to subnet-pool.rstTang Chen2016-02-202-4/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Replace string format arguments with function parametersting.wang2016-02-204-6/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are files containing string format arguments inside logging messages. Using logging function parameters should be preferred. Change-Id: I15b405bf4d4715263fe1e1262982467b3d4bc1f4 Closes-Bug: #1321274
* | | | Merge "Subnet Pool: Add "subnet pool show" command"Jenkins2016-02-196-1/+147
|\ \ \ \
| * | | | Subnet Pool: Add "subnet pool show" commandTang Chen2016-02-196-1/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8dda7bbf1e27b0ac773f62a5cd293387da96f8df Closes-Bug: 1544590 Implements: blueprint neutron-client
* | | | | Merge "Don't use Mock.called_once_with that does not exist"Jenkins2016-02-191-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Don't use Mock.called_once_with that does not existTang Chen2016-02-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Merge "Use assertIsNone() instead of assertEqual(None, xxx)"Jenkins2016-02-193-7/+7
|\ \ \ \ \
| * | | | | Use assertIsNone() instead of assertEqual(None, xxx)Tang Chen2016-02-193-7/+7
| |/ / / / | | | | | | | | | | | | | | | Change-Id: Ibbd7d6d27b2ff20304e3121fbadd5d50c1836d9b
* | | | | Merge "Subnet Pool: Add "subnet pool list" command"Jenkins2016-02-196-1/+145
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Subnet Pool: Add "subnet pool list" commandTang Chen2016-02-196-1/+145
| |/ / / | | | | | | | | | | | | | | | | | | | | Change-Id: I7935be2488fb728ced9680d75880870e5d315655 Closes-Bug: 1544589 Implements: blueprint neutron-client
* | | | Floating IP: Fix "ip floating list" in neutron networkTang Chen2016-02-193-17/+51
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Remove unused test-requirmentsChaozhe.Chen2016-02-181-1/+0
| | | | | | | | | | | | | | | | | | | | | WebOb is not needed in our test code. So remove it to make less dependences. Change-Id: I4910263449ff3d49c4ee44a6ef7a7762875fe76f
* | | Merge "Subnet Pool: Add "subnet pool delete" command"Jenkins2016-02-187-0/+179
|\ \ \
| * | | Subnet Pool: Add "subnet pool delete" commandTang Chen2016-02-187-0/+179
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic5ba5effcaea2410421a81da8ffce7c0295179e7 Closes-Bug: 1544587 Partially implements: blueprint neutron-client
* | | | Merge "Support "network show" command in nova network"Jenkins2016-02-184-5/+153
|\ \ \ \
| * | | | Support "network show" command in nova networkTang Chen2016-02-174-5/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "network show" command is not implemented in nova network. This patch implements it. Change-Id: I1fadd890fe36c4e3ac5c9ed389b20c5b2fff8aca partial-Bug: 1543672
* | | | | Merge "Support "network list" command in nova network"Jenkins2016-02-185-10/+136
|\ \ \ \ \ | |/ / / /
| * | | | Support "network list" command in nova networkTang Chen2016-02-175-10/+136
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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
* | | | | Merge "Refactor security group rule delete to use SDK"Jenkins2016-02-187-33/+266
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Refactor security group rule delete to use SDKRichard Theis2016-02-107-33/+266
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactored the 'os security group rule delete' command to use the SDK when neutron is enabled, but continue to use the nova client when nova network is enabled. This patch set also introduces new FakeSecurityGroupRule classes for testing network and compute security group rules. And fixes were made to the network FakeSecurityGroup class. Change-Id: I8d0917925aa464e8255defae95a2a2adfb6cfb75 Partial-Bug: #1519512 Related-to: blueprint neutron-client
* | | | Merge "Return names in list role assignments"Jenkins2016-02-175-13/+162
|\ \ \ \
| * | | | Return names in list role assignmentsTom Cocozzello2016-01-275-13/+162
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Utilize the new include names functionality added to list role assignments (GET /role_assignments?include_names=True). Which will return the names of the entities instead of their IDs. Change-Id: I6dc03baf61ef9354a8a259a9f17ff47ce1665ce7 Depends-On: I4aa77c08660a0cbd021502155938a46121ca76ef Closes-Bug: #1479569 Implements: blueprint list-assignment-with-names
* | | | | Merge "Add release note for "network delete" command for nova network"Jenkins2016-02-171-0/+4
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Add release note for "network delete" command for nova networkTang Chen2016-02-171-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idb8a24465e447e90315c0f614ad91bd7eabd6878 partial-Bug: 1543672
* | | | | Merge "Add release note for "ip floating delete/list" commands for neutron ↵Jenkins2016-02-171-0/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | network"
| * | | | | Add release note for "ip floating delete/list" commands for neutron networkTang Chen2016-02-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ic90abf106a06edf9af4fe4c8938ab92bfdd8bb42 partial-Bug: 1519502 Related-to: blueprint neutron-client
* | | | | | Merge "Add "token revoke" for identity v3"Jenkins2016-02-176-2/+48
|\ \ \ \ \ \
| * | | | | | Add "token revoke" for identity v3lin-hua-cheng2016-02-096-2/+48
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie631600d02942fe6ce035f31af46abe44e543631 Closes-bug: #1543226
* | | | | | Merge "Fix 'openstack --help' fails if clouds.yaml cannot be read"Jenkins2016-02-171-4/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fix 'openstack --help' fails if clouds.yaml cannot be readHideki Saito2016-02-141-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | '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
* | | | | | Define FakeFloatingIP class in tests/compute for nova network commandsTang Chen2016-02-162-2/+81
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "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
* | | | | Merge "Refactor security group functional tests"Jenkins2016-02-152-0/+0
|\ \ \ \ \
| * | | | | Refactor security group functional testsRichard Theis2016-02-052-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved the functional tests for "os security group" and "os security group rule" from the compute to the network directory to align with the refactoring to the commands. Change-Id: Ief6ab17775c6d7e3bef58d9fa025d9dd520b7370 Partial-Bug: #1519511 Partial-Bug: #1519512 Related-to: blueprint neutron-client
* | | | | | Merge "Rename parameter "identifier" to "network" in network commands"Jenkins2016-02-152-8/+8
|\ \ \ \ \ \
| * | | | | | Rename parameter "identifier" to "network" in network commandsTang Chen2016-02-142-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Use assertRaises() to check if an exception is raised"Jenkins2016-02-153-29/+19
|\ \ \ \ \ \ \
| * | | | | | | Use assertRaises() to check if an exception is raisedTang Chen2016-02-143-29/+19
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some test cases, try/except is used to check if an exception has been raised. We should use assertRaises() instead. Change-Id: I15c8e757dcab77fd6f895feb018184e1eb7e617b
View Lorry Controller Status