summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Making pep8 output less verbose.Rick Harris2011-12-141-3/+2
| |/ / | | | | | | | | | | | | | | | Fixes bug #904559 Change-Id: I078b060483890bf8bfc9b78d3174370dea4d6bbc
* | | Merge "floating-ip: return UUID of instance rather than ID"Jenkins2011-12-152-6/+11
|\ \ \
| * | | floating-ip: return UUID of instance rather than IDJulien Danjou2011-12-132-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Returning the database ID seems useless now that instances are identified by UUID. So it seems more reasonable to return UUID here too. Change-Id: I36fa6ded284158facb891dd081aa3d3f45c7c5ee Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
* | | | Merge "Make various methods static"Jenkins2011-12-153-13/+26
|\ \ \ \
| * | | | Make various methods staticJulien Danjou2011-12-143-13/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A lot of stuff in nova.virt contain methods that are actually static. Marking them this way makes the code clearer. Change-Id: I287058d3b2315562f2980999239fcd3240d2b1ec Signed-off-by: Julien Danjou <julien.danjou@enovance.com>
* | | | | Fixes bug 887402Dean Troyer2011-12-142-9/+15
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change utils.execute to accept a list or a single integer in check_exit_code. In libvirt.disconnect_volume() return codes 0 and 255 are both valid for logout/delete, where 255 is returned if the volume is already disconnected. Change-Id: Icffeb0fe8269a02d95ac6ed180ba0bb9f458a6ed
* | | | Bug 902626jakedahn2011-12-141-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixing typo which breaks floating_ip_get_all_by_project. Change-Id: Ic586455b202ece5a9fb61e78d243502069d39242
* | | | Merge "Make sure the rxtx_cap is used to set qos info"Jenkins2011-12-143-5/+10
|\ \ \ \
| * | | | Make sure the rxtx_cap is used to set qos infoAaron Lee2011-12-133-5/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: Id06d12a24756ce865e3b7e1b79185dddbdb71582
* | | | | Merge "Pass additional information from nova to Quantum"Jenkins2011-12-143-7/+30
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Pass additional information from nova to QuantumBrad Hall2011-12-133-7/+30
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Some of the Quantum plugins will require this information Change-Id: I957b5546b8c16d44d587bd73da975a1bb4a0b630
* | | | Merge "Added support for creating nova volume snapshots using OS API."Jenkins2011-12-145-5/+460
|\ \ \ \
| * | | | Added support for creating nova volume snapshots using OS API.Gaurav Gupta2011-12-125-5/+460
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 883676 blueprint nova-volume-snapshot-backup-api Change-Id: Id3e1ad39ef791b93dd014cada87c2d295454701f
* | | | | Merge "Fix tgtadm off by one error. Fixes bug #871278"Jenkins2011-12-142-6/+16
|\ \ \ \ \
| * | | | | Fix tgtadm off by one error. Fixes bug #871278Chuck Short2011-12-132-6/+16
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Change-Id: Ia359045465ada9753b86d1a08cc947966b3ac899 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | Merge "Follow-on to I665f402f to convert rxtx_quota to rxtx_factor in ↵Jenkins2011-12-143-13/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | nova-manage and a couple of tests."
| * | | | | Follow-on to I665f402f to convert rxtx_quota to rxtx_factor inDean Troyer2011-12-133-13/+8
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | nova-manage and a couple of tests. Change-Id: I1c72dbef6173e4c08006e36fa90565a724528b7c
* | | / / Refactor vm_state and task_state checkingJohannes Erdfelt2011-12-139-348/+106
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This branch refactors the recently merged code for checking vm_state and task_state. The list of allowed states is merged to the method being checked, more methods are being checked and cleans up the general usage of them to be easier to read. Change-Id: If6130dbab947f7bd037e37af9827b6a7c9a193d4
* | | | Merge "Fix error when subnet doesn't have a cidr set"Jenkins2011-12-131-2/+3
|\ \ \ \
| * | | | Fix error when subnet doesn't have a cidr setBrad Hall2011-12-121-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If it isn't set in the subnet just take it from the network_ref. Change-Id: Id9b4a25b369884f4f4d5527b44d1215d3c244d70
* | | | | Merge "Renaming instance_actions.instance_id column to instance_uuid. ↵Jenkins2011-12-1312-66/+133
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | blueprint: internal-uuids"
| * | | | | Renaming instance_actions.instance_id column to instance_uuid.Naveed Massjouni2011-12-1312-66/+133
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | blueprint: internal-uuids Change-Id: I204c3fd49278c509a9bc32353445ede086cfadb2
* | | | | Merge "Fix some errors found by pychecker"Jenkins2011-12-134-5/+7
|\ \ \ \ \
| * | | | | Fix some errors found by pycheckerBrad Hall2011-12-134-5/+7
| | |_|/ / | |/| | | | | | | | | | | | | Change-Id: I6ae8776fcfd7fbae1d6555d2e33ae807a9daccb2
* | | | | Merge "bug 899767: fix vif-plugging with live migration"Jenkins2011-12-139-9/+50
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | bug 899767: fix vif-plugging with live migrationDan Wendlandt2011-12-129-9/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose vif_unplug method in virt layer, as the compute manager has to explicitly call it on during live migration, so that network devices are torn down even if the disk image is not. Change-Id: Iae88c72f4fd2c7c097c23ef9e5f8fd392052f73e
* | | | | Merge "Fix for bug 902175"Jenkins2011-12-133-6/+46
|\ \ \ \ \
| * | | | | Fix for bug 902175Brad Hall2011-12-133-6/+46
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the gateway port when deleting the network (if it's the only one left), and kill dnsmasq if the network is deleted. Change-Id: If6b4798ddb4d21fe6c32ac20e6237494b799ecbd
* | | | | Merge "Fix network forwarding rule initialization in QuantumManager"Jenkins2011-12-132-7/+18
|\ \ \ \ \
| * | | | | Fix network forwarding rule initialization in QuantumManagerBrad Hall2011-12-092-7/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This moves the network init code from init to init_host() and breaks the snat rule cmd out of driver.init_host(). The network_create call can now just call the add_snat_rule function to set up the rule for the network when it is created. Change-Id: Id36dc42edd8b49938f85e16f16fce0416039fd50
* | | | | | Sanitize EC2 manifests and image tarballsThierry Carrez2011-12-135-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevent potential directory traversal with malicious EC2 image tarballs, by making sure the tarfile is safe before unpacking it. Fixes bug 894755 Prevent potential directory traversal with malicious file names in EC2 image manifests. Fixes bug 885167 Change-Id: If6109047307bd6e654ee9d1254f0d7f31cf741c1
* | | | | | fixed typos. removed an unused importYun Mao2011-12-122-3/+3
| |/ / / / |/| | | | | | | | | | | | | | Change-Id: I3cc1d2b2e89f5f4bd82dd8a259363d4e88708531
* | | | | Vm state management and error statesDavid Subiros2011-12-1211-100/+533
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this implements the blueprint nova-vm-state-management It implements the following functionalities: - Filter compute api calls according to state of the VM (defined in compute/state_checker). - Sets error state if the scheduler cannot allocate the VM in any host - Handles the create/delete concurrency in the compute manager Change-Id: Ie6d016b7d4781f70bb5967f204fa88a6412bd727
* | | | Merge "Fixing snapshot failure task_state"Jenkins2011-12-122-2/+32
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixing snapshot failure task_stateDavid Subiros2011-12-122-2/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 898162 If a snapshot fails now the instance task_state is set back to None. Change-Id: I5ed8850a35aea901adf253f3f4adc590efd3a075
* | | | Merge "Imported Translations from Launchpad"OpenStack Jenkins2011-12-123-1146/+1188
|\ \ \ \ | |_|_|/ |/| | |
| * | | Imported Translations from LaunchpadOpenStack Jenkins2011-12-113-1146/+1188
| | | | | | | | | | | | | | | | Change-Id: I3c05064b43f71f0d38bceee7e7e25ced567deea9
* | | | Merge "fixed_ips by vif does not raise"Jenkins2011-12-124-21/+13
|\ \ \ \ | |_|/ / |/| | |
| * | | fixed_ips by vif does not raiseAaron Lee2011-12-094-21/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It makes more sense if this method returns an empty array instead of raising when it finds no ips. This lets the iteration over that array handle the 0 case, and we can use a conditional on the len(of the ips) if really needed. I'm not sure that log is needed to say "No fixed IPs deallocated" or if that is an artifact of needing something to put in the exception handler. Change-Id: Ib9f66affb5360fb11a3ab5f415a0e57602cec886
* | | Merge "Add preparation for asynchronous instance faults"Jenkins2011-12-127-2/+262
|\ \ \
| * | | Add preparation for asynchronous instance faultsAlex Meade2011-12-097-2/+262
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add InstanceFault model Migration for new instance_faults table Functions to add and get instance faults A single example of how faults should be added Change-Id: I439e2419240de24a728045046153451eb8a0d267
* | | | Merge "Add templates for selected resource extensions."Jenkins2011-12-122-49/+444
|\ \ \ \ | |_|_|/ |/| | |
| * | | Add templates for selected resource extensions.Kevin L. Mitchell2011-12-092-49/+444
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | Related to bug 852141; adds XML serialization and deserialization for the following extensions: * VSAs (zadr-vsa) Change-Id: Id9e9888758d02085a603fccfba1987a624da55c9
* / | Moves find config to utils because it is usefulVishvananda Ishaya2011-12-104-26/+27
|/ / | | | | | | | | | | | | This is to prepare for a future patch will will use find config to load other config files. Change-Id: Ic9bd9027baf518734c3f51f516651b80d1e752f2
* | Merge "_check_image_size returns are consistent"Jenkins2011-12-091-2/+2
|\ \
| * | _check_image_size returns are consistentAaron Lee2011-12-091-2/+2
| | | | | | | | | | | | | | | | | | fixes lp902288 Change-Id: I5be64b97428c19dcc8fb687cebfbcbd66c7cddb4
* | | Merge "Port nova.flags to cfg"Jenkins2011-12-092-73/+45
|\ \ \ | |/ / |/| |
| * | Port nova.flags to cfgMark McLoughlin2011-12-082-73/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This modifies nova.flags to emulate gflags using the new cfg module instead of optparse. One side effect of this is that nova now has a --config-file argument which allows a .ini style config file to be used instead of a gflags style file. Downstream packagers may choose to switch to using this new config file by default, or stick with the gflags style file for now. We may, in time, choose to deprecate --flagfile. Obviously, this change is just a stepping stone towards having Nova use the cfg API throughout the codebase. Next steps might include: - Adding a DEFINE_opt() function and starting to convert all the option definitions to the cfg.Opt schema types - Passing a ConfigOpts instance around rather than referring to the global flags.FLAGS variable - Adding a default .ini style config file with the default values commented out and an explanation of each option. This could potentially be autogenerated from the option schemas in the code. - Making use of option groups to organize options - In time, deprecating --flagfile - In time, also deprecating most of the options as CLI options and only allowing them to be set via config files There are two hacks in the current code where we directly access the OptionParser instance which is technically just a private implementation detail of the ConfigOpts class: - We need to use optparse's disable_interspersed_args(). I think it's needed for nova-manage - We still need the gross hack for handling unknown CLI args. We should either make sure they are registered at startup, or just wait until we make them unavailable via the CLI before removing the hack. This would also allow us to remove the gross hack to allow CLI opts to be registered after the CLI args have been parsed. One final note - the cfg module doesn't have support yet for multistr opts where values are spread across the command line and config files. This isn't a regression as it still works fine with the CLI and --flagfile, and it should be straightforward to support later. Change-Id: I173b99ffd645b8ac5babd68e5c2ed521b98ec2ca
* | | Merge "Fixed the perms on the linux test case file so that nose will run it."Jenkins2011-12-091-0/+0
|\ \ \
| * | | Fixed the perms on the linux test case file so that nose will run it.Duncan McGreggor2011-12-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 902282 Change-Id: Ic35292f36adc059064b1600dd4b300fb8c6db7f6