← Back to branch summary

~markmc/nova/flat-dhcp-without-bridge-iface

« back to all changes in this revision

Viewing changes to nova/compute/api.py

  • Committer: Tarmac
  • Author(s): Alex Meade
  • Date: 2011-08-22 03:17:04 UTC
  • mfrom: (1450.6.17 servers-accessip)
  • Revision ID: tarmac-20110822031704-3m2u6o62ut0gqyzo
Adds accessIPv4 and accessIPv6 to servers requests and responses as per the current spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/compute/api.py
153
153
               key_name=None, key_data=None, security_group='default',
154
154
               availability_zone=None, user_data=None, metadata=None,
155
155
               injected_files=None, admin_password=None, zone_blob=None,
156
 
               reservation_id=None):
 
156
               reservation_id=None, access_ip_v4=None, access_ip_v6=None):
157
157
        """Verify all the input parameters regardless of the provisioning
158
158
        strategy being performed."""
159
159
 
247
247
            'key_data': key_data,
248
248
            'locked': False,
249
249
            'metadata': metadata,
 
250
            'access_ip_v4': access_ip_v4,
 
251
            'access_ip_v6': access_ip_v6,
250
252
            'availability_zone': availability_zone,
251
253
            'os_type': os_type,
252
254
            'architecture': architecture,
437
439
               key_name=None, key_data=None, security_group='default',
438
440
               availability_zone=None, user_data=None, metadata=None,
439
441
               injected_files=None, admin_password=None, zone_blob=None,
440
 
               reservation_id=None, block_device_mapping=None):
 
442
               reservation_id=None, block_device_mapping=None,
 
443
               access_ip_v4=None, access_ip_v6=None):
441
444
        """Provision the instances by passing the whole request to
442
445
        the Scheduler for execution. Returns a Reservation ID
443
446
        related to the creation of all of these instances."""
453
456
                               key_name, key_data, security_group,
454
457
                               availability_zone, user_data, metadata,
455
458
                               injected_files, admin_password, zone_blob,
456
 
                               reservation_id)
 
459
                               reservation_id, access_ip_v4, access_ip_v6)
457
460
 
458
461
        self._ask_scheduler_to_create_instance(context, base_options,
459
462
                                      instance_type, zone_blob,
471
474
               key_name=None, key_data=None, security_group='default',
472
475
               availability_zone=None, user_data=None, metadata=None,
473
476
               injected_files=None, admin_password=None, zone_blob=None,
474
 
               reservation_id=None, block_device_mapping=None):
 
477
               reservation_id=None, block_device_mapping=None,
 
478
               access_ip_v4=None, access_ip_v6=None):
475
479
        """
476
480
        Provision the instances by sending off a series of single
477
481
        instance requests to the Schedulers. This is fine for trival
495
499
                               key_name, key_data, security_group,
496
500
                               availability_zone, user_data, metadata,
497
501
                               injected_files, admin_password, zone_blob,
498
 
                               reservation_id)
 
502
                               reservation_id, access_ip_v4, access_ip_v6)
499
503
 
500
504
        block_device_mapping = block_device_mapping or []
501
505
        instances = []