summaryrefslogtreecommitdiffstats
path: root/nova
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge lp:~tpatil/nova/add-options-network-create-os-apisHisaharu Ishii2011-08-1861-1075/+4855
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed broken unit testcasesTushar Patil2011-08-171-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved conflicts and merged with trunkTushar Patil2011-08-1625-367/+953
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'm taking Thierry at his word that I should merge early and merge often :) Dan Wendlandt2011-08-163-145/+253
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix missing 'run_as_root' from bad mergeDan Wendlandt2011-08-141-2/+4
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have NetworkManager generate MAC address and pass it to the driver for pluggi...Dan Wendlandt2011-08-133-41/+54
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix issue introduced in mergeDan Wendlandt2011-08-121-2/+2
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge trunk, fix conflict frim dprince's branch to remove hostname from bin/n...Dan Wendlandt2011-08-1215-43/+1376
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge in trunk, resolving conflicts with ttx's branch to switch from using su...Dan Wendlandt2011-08-12123-2056/+6370
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | move ensure_vlan_bridge,ensure_bridge,ensure_vlan to the bridge/vlan specific...Dan Wendlandt2011-08-042-82/+90
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another mergeDan Wendlandt2011-08-0444-1638/+1978
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge trunkDan Wendlandt2011-08-0244-1638/+1978
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | modify _setup_network for flatDHCP as wellDan Wendlandt2011-08-042-10/+15
| | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix LinuxBridgeInterfaceDriverDan Wendlandt2011-08-011-4/+4
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge trunk, resolve conflict in net/manater.py in favor of vif-plugDan Wendlandt2011-08-01104-1892/+4123
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initial commit of vif-plugging for network-service interfacesDan Wendlandt2011-08-014-82/+162
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mergeDan Wendlandt2011-07-221-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes issue with exceptions getting eaten in image/s3.py if there is a failur...Vishvananda Ishaya2011-08-161-12/+14
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | log the full exception so we don't lose traceback through eventletVishvananda Ishaya2011-08-151-12/+12
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix error logging in s3.pyVishvananda Ishaya2011-08-151-4/+6
| | | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merged trunk.Josh Kearney2011-08-162-112/+125
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use netaddr's subnet features to calculate subnets.Jason Koelker2011-08-164-114/+129
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ merge the trunkJason Koelker2011-08-1613-91/+207
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pep8Jason Koelker2011-08-151-1/+2
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pep8Jason Koelker2011-08-151-1/+2
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add noteJason Koelker2011-08-151-0/+2
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | have the tests call create_networks directlyJason Koelker2011-08-152-35/+65
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allow for finding a network that fits the size, also format string correctlyJason Koelker2011-08-151-6/+14
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | return the created networksJason Koelker2011-08-151-0/+4
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pep8 fixJason Koelker2011-08-151-1/+0
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge trunkJason Koelker2011-08-1522-591/+819
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | i hate these exceptions where it should just return an empty listJason Koelker2011-08-151-1/+4
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix typo where I forgot a commaJason Koelker2011-08-151-1/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge trunk, remove _validate_cidrs and replace functionality with a double f...Jason Koelker2011-08-1522-81/+636
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | merge the trunkJason Koelker2011-08-122-6/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | need to actually assign the v4 networkJason Koelker2011-08-121-1/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only run if the subnet and cidr existJason Koelker2011-08-121-1/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | only run if the subnet and cidr existJason Koelker2011-08-121-2/+2
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | forgot the closing parenJason Koelker2011-08-121-1/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use subnet iteration from netaddr for subnet calculationJason Koelker2011-08-121-26/+29
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Review feedback.Josh Kearney2011-08-161-1/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updated note.Josh Kearney2011-08-161-3/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow local_gb to be 0; PEP8 fixes.Josh Kearney2011-08-162-3/+12
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added search instance by metadata.vladimir.p2011-08-162-1/+82
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added search instance by metadata. get_all_by_filters should filter deletedvladimir.p2011-08-112-1/+82
| | | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing pep8 issueJake Dahn2011-08-161-1/+0
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | defaults now is referred to using a tenantJake Dahn2011-08-161-2/+2
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing up the show quotas tests, and extensionJake Dahn2011-08-162-5/+19
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | making get project quotas require context which has access to the project/ten...Jake Dahn2011-08-161-0/+1
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixing pep8 issues againJake Dahn2011-08-161-6/+6