Since 'net' is of nova.network.model.VIF class and 'ips' is an empty
list, net needs to be pulled from hydrated nw_info.fixed_ips(), and
appended to ips.

bug 942593

Change-Id: I9c2f55e300d1dad503b15c261027d988073e8e61
Merge "Switch all xenapi async plugin calls to be sync"
Reduce duplicated code in xenapi

Reduce three implementations of creating VBDs to one. Use helper
functions in other places.

Change-Id: I34ea03fc1fb3cb5d5d343cffa28da5bf3dff888b
Use utils.temporary_chown to ensure permissions get reset

Change-Id: I8df1851acebf62f633e8422a2549a8d0227b307d
Merge "Fixes os-volume/snapshot delete"
Allow soft_reboot to work from more states:

 * update sync_power_states to update other states
 * only attempt to shutdown the domain if it is running
 * attempt to start the domain from shutoff and crashed
 * fixes bug 951235

Change-Id: Icaa071ac59700385d9985315b99c0468415e444a
Merge "Since 'net' is of nova.network.model.VIF class and 'ips' is an empty list, net needs to be pulled from hydrated nw_info.fixed_ips(), and appended to ips."
Replaced use of webob.Request.str_GET

 * Changed webob.Request.str_GET => webob.Request.GET to
   ensure compatibility with WebOb >= 1.2.
 * Fixes bug 950478

Change-Id: I21d0d477340d31caa4c92fa76270a392b5eb2cca
Fix issues with security group auths without ports.

Fix bug 946427.

There was a bug where a security group would get completely opened in
cases where only icmp, udp, or tcp should be opened.  For example, any
of the following three commands would result in opening everything:

    euca-authorize -P icmp -o test-ports test-ports
    euca-authorize -P tcp -o test-ports test-ports
    euca-authorize -P udp -o test-ports test-ports

This patch resolves this and these commands now only open the protocol
that was specified.  Unit tests have been added to verify the fix and
also verify that this only works when a source group is specified.
While the bug was originally reported against the EC2 API, the same
updates and similar unit tests have gone in to the equivalent code for
the OpenStack API.

Change-Id: I4c87c5f5f4ccee60c6c16da4e659d73ab3f4a34f
EC2 KeyName validation.

According to EC2 API Documentation, the keyname
is acccetable as a  alphanumeric characters,
spaces, dashes, and underscores.

As well as make sure that the keyname doesnt
exceed 255 characters.

Make sure that the key that is being created is valid.
Fixes bug 947750.

Change-Id: I083af7f2cbc417150fadb79b307083bb3ba229d6
Signed-off-by: Chuck Short <chuck.short@canonical.com>
Display owner in ec2 describe images

 * use owner field from glance
 * remove unneccessary project_id field in s3 registration
 * fixes bug 798998

Change-Id: I8d88ff258b914899212d63a7d31d83722d0cb559
Merge "Use utils.temporary_chown to ensure permissions get reset"
Merge "Add pybasedir and bindir options"
Merge "Update cfg from openstack-common"
Merge "Use cache='none' for all disks"
Clean up setup and teardown for dhcp managers

 * use update_dhcp on teardown, not release_dhcp
 * clean up setup / teardown to not require vif and address
 * make dnsmasq only configure allocated ips
 * prepares the fix for bug 939060

Change-Id: Ie85860c5549339befee74c951ccb0d72a92f6d6c
Merge "Fix issues with security group auths without ports."
Merge "Clean up setup and teardown for dhcp managers"
Merge "Use a high number for our default mac addresses"
Merge "Display owner in ec2 describe images"