12957 Commits

Author SHA1 Message Date
Jenkins
0aa621e774 Merge "Correct the order of assertEqual" 2016-12-22 04:04:11 +00:00
Jenkins
cf6394c2ee Merge "Default implementation parse_live_resource_data" 2016-12-22 04:04:04 +00:00
Jenkins
eb932ace15 Merge "Trivial refactor of session var in reset_stack_status" 2016-12-22 02:32:02 +00:00
huangtianhua
b84e31bd92 Correct the order of assertEqual
The params order of assertEqual is (expected, observed),
some tests in test_server.py are in wrong order.

Change-Id: I95054cac6d9c34dd978fdae2a38823273d8b867d
2016-12-21 23:54:31 +08:00
Jenkins
cb0f5cb0c2 Merge "Set default value for 'metadata' of nova server" 2016-12-21 11:06:54 +00:00
Jenkins
c74fe999d2 Merge "Ephemeral disk size support for server bdm_v2" 2016-12-21 10:55:56 +00:00
Jenkins
ca3ba526a3 Merge "Allows to create x509 keypair" 2016-12-21 08:14:45 +00:00
Jenkins
77d94c2312 Merge "Update the constraint value of schema 'ACCESS_TYPE' for Manila share" 2016-12-21 07:29:01 +00:00
Jenkins
07b156525b Merge "Allow to create admin context for tests" 2016-12-20 19:11:49 +00:00
Jenkins
9ab092652e Merge "Fix typo" 2016-12-20 03:56:48 +00:00
Jenkins
77411ec04c Merge "Refactor batch encrypt/decrpyts of params, props" 2016-12-19 21:37:40 +00:00
Jenkins
104245091d Merge "Nova Flavor Resource Update" 2016-12-19 15:59:40 +00:00
zengchen
c669955b81 Update the constraint value of schema 'ACCESS_TYPE' for Manila share
Update the constaint value to make it up to date. Manila support 4
kinds of access types wich are 'ip', 'user', 'cert', 'cephx', and,
'cephx' is the newer type in Manila which is supported on version '2.13'.
So update the version of Manila client to '2' incidentally.

Change-Id: I230f2bc7268e9f25f77d7b22f7a68b6ca37f6d2a
Closes-Bug: #1649217
2016-12-19 16:53:25 +08:00
huangtianhua
d4307b5d2b Allows to create x509 keypair
Allows to create nova keypair with types x509 or ssh.

Change-Id: I55f1f0270c055f21e79cfb24f94bff7aab4e80f3
Closes-Bug: #1646674
2016-12-19 06:54:42 +00:00
huangtianhua
2d66f746bc Allow to create admin context for tests
Change-Id: I7f3e0d05046d11b0c9d77ab03ca3dc828d6233eb
2016-12-19 11:55:05 +08:00
OpenStack Proposal Bot
3bc38eef3d Updated from global requirements
Change-Id: If3c036a7f6c807d06d88d5103ffc7a08a736e7b1
2016-12-17 21:30:24 +00:00
Jenkins
01441eba9c Merge "Update fedora image in devstack" 2016-12-17 09:26:36 +00:00
Chris
1b64098cdf Nova Flavor Resource Update
Add ability to associate private flavors with multiple tenants.
Also updated 'test_flavor' file to reflect changes and test
functionality.

Change-Id: I841460b936ae52b3a91981029b42212ae484c3e4
Implements: blueprint nova-flavor-resource
2016-12-16 10:37:11 -06:00
OpenStack Proposal Bot
c2c55babc7 Updated from global requirements
Change-Id: Ie6b5835511ea5531e627e0e57d701d9fabd16be3
2016-12-16 09:00:52 +00:00
Jenkins
ec5dff64ba Merge "Add noauth middleware" 2016-12-15 22:08:45 +00:00
Jenkins
6e999a1678 Merge "Correct response of template-version-list" 2016-12-15 06:21:31 +00:00
Crag Wolfe
664735470b Refactor batch encrypt/decrpyts of params, props
A little more DRY.

Change-Id: I062987faa19db493f15ed71c207b7f81ef86cfd8
2016-12-14 21:47:06 -08:00
ricolin
2310d0b3ea Update fedora image in devstack
Current image path is invalid, change to new path. Also update os
version to new version.

Change-Id: I9ef726d7ff3433dcbfb8450ff7a290e5ea10b5cd
2016-12-15 13:05:25 +08:00
OpenStack Proposal Bot
580706467a Updated from global requirements
Change-Id: Idfa62bd545290c43ab6344725cb663c6a6a9dcbf
2016-12-15 03:47:21 +00:00
Jenkins
8fc3489108 Merge "Do not set the mime-type for userdata" 2016-12-15 03:10:04 +00:00
Peter Razumovsky
89336671d1 Default implementation parse_live_resource_data
Add default implementation for parse_live_resource_data
to reduce number of override methods in resource plugins.

Also, add separate method for resolving update_allowed
properties.

implements bp get-reality-for-resources

Change-Id: Ie7ee043d06fbf3bc910fa40dc7f8f17c2fbb4303
2016-12-14 14:41:33 +04:00
Jenkins
f72607dde6 Merge "Cleanup test env after tests" 2016-12-14 08:57:22 +00:00
Jenkins
8c6720eeff Merge "Support composite alarm" 2016-12-14 08:18:15 +00:00
huangtianhua
a3b1b172e8 Correct response of template-version-list
Change-Id: Id5cabce0806ba2423195450c27d00a905d32d13c
2016-12-14 15:35:18 +08:00
Jenkins
99bebb5829 Merge "Remove db.api wrapper" 2016-12-14 06:23:03 +00:00
Jenkins
b92052de40 Merge "Updated from global requirements" 2016-12-14 05:26:18 +00:00
Jenkins
7e7fb406d2 Merge "Allow mark-unhealthy by physical resource ID" 2016-12-14 05:09:47 +00:00
Jenkins
4ffd7b02a9 Merge "Add validation for conflicting merge strategies" 2016-12-14 04:51:27 +00:00
OpenStack Proposal Bot
9ee3a7ea09 Updated from global requirements
Change-Id: Ie35b28530f4946b6ed610a9f2f52dbd4416522d0
2016-12-13 21:41:55 +00:00
Jenkins
d3cf51a10a Merge "Add DeployedServer resource" 2016-12-13 21:07:51 +00:00
Jenkins
7e15316f2b Merge "Use BaseServer base class for Nova Server resource" 2016-12-13 20:54:19 +00:00
Jenkins
54429130a1 Merge "Support new osprofiler API" 2016-12-13 11:42:27 +00:00
James Slagle
f2fb0c1692 Add DeployedServer resource
The DeployedServer resource is a subclass of the BaseServer base class.
It allows for creating Server resources to associate with
SoftwareDeployment's where those servers were not orchestrated via Nova.

This is a use case for TripleO so that the software configuration part
of the deployment can be orchestrated with Heat on servers that were not
provisioned with Nova/Ironic.

Partially-implements: blueprint split-stack-software-configuration
Change-Id: I07b9a053ecd3ef4411b602bbc6ef985224834cf8
2016-12-13 06:35:42 -05:00
James Slagle
6959f4b62a Use BaseServer base class for Nova Server resource
Refactors the Nova Server resource class to use a new base class,
BaseServer.  All of the Nova/Neutron/Glance/etc specific logic for the
Server resource remains in the Server class and not in the base class.

This allows other Server subclasses, such as the DeployedServer resource
(see followup patch) to create Server "like" resources to associate with
SoftwareDeployment resources.

Partially-implements: blueprint split-stack-software-configuration
Change-Id: I585d92dbd29198107464b92ddb0e0b15779b9999
2016-12-13 06:35:42 -05:00
Jenkins
9004b8eb51 Merge "Refactor port tests" 2016-12-13 10:08:48 +00:00
Jenkins
f11337dee5 Merge "Set default value for 'metadata' of cinder volume" 2016-12-13 10:08:05 +00:00
Thomas Herve
84067dba88 Remove db.api wrapper
The db.api module provides a useless indirection to the only
implementation we ever had, sqlalchemy. Let's use that directly instead
of the wrapper.

Change-Id: I80353cfed801b95571523515fd3228eae45c96ae
2016-12-13 09:40:29 +01:00
huangtianhua
d9021d3c22 Support composite alarm
Change-Id: I973c03b08227c1f706504c6ae29ca250c2f79869
Blueprint: add-aodh-composite-alarm
2016-12-13 16:31:16 +08:00
Jenkins
1190b1bead Merge "Handle ambiguous physical resource IDs" 2016-12-13 07:43:24 +00:00
huangtianhua
5cf81b2ae3 Set default value for 'metadata' of cinder volume
Set default value of 'metadata' to {}, to make sure
update cinder volume success when observe_on_update
is enabled.

Change-Id: I006d8612f4d9fd0633695a17ad3c8f0ca37dbb97
Closes-Bug: #1635164
2016-12-13 07:29:51 +00:00
huangtianhua
0fc8e6324c Set default value for 'metadata' of nova server
Set default value of 'metadata' to {}, to make sure
update nova server success when observe_on_update
is enabled.

Change-Id: Iea29b9ce3bbf5dbf7ee33cdd9e2556305fa93ae3
Closes-Bug: #1649222
2016-12-13 15:25:42 +08:00
rabi
5360729c07 Cleanup test env after tests
We create some images, flavors and networks for the test
environment. It would be good to clean them after the tests.

Change-Id: I633328c2952f61426b1350e43fb42e2edbc5ca97
2016-12-13 05:45:34 +00:00
huangtianhua
dbd67845f1 Refactor port tests
This changes:
1. use mock instead of mox
2. correct test_port_needs_update_network()

Change-Id: I51c12a61bc42915da7f50cea4e6a55a07f19e77b
2016-12-13 13:14:41 +08:00
Alexander Ignatyev
4a610e6891 Support new osprofiler API
Notifier initialization moved to osprofiler. Added call
to init_from_conf method that does it.

Change-Id: Ia552b8a40eeea49b9882befaaf41fa9b1ed3da1e
Depends-On: I77d0d3b5e9e725507916724dcd28d5fbc6f7f5c7
2016-12-12 09:39:17 +00:00
LiuNanke
c38f68e745 Use assertIsNone(...) instead of assertEqual(None, ...)
Refer to:http://docs.openstack.org/developer/hacking/#unit-tests-and-assertraises

[H203] Use assertIs(Not)None to check for None (off by default) Unit
test assertions tend to give better messages for more specific assertions.
As a result, assertIsNone(...) is preferred over assertEqual(None, ...)
and assertIs(None, ...)

Change-Id: Id20e7958bc0228577eb73ee390afc80ffcb98d33
2016-12-12 13:55:41 +08:00