merge trunk

Authors

@@ -34,6 +34,7 @@ Jonathan Bryce <jbryce@jbryce.com>
 Jordan Rinke <jordan@openstack.org>
 Josh Durgin <joshd@hq.newdream.net>
 Josh Kearney <josh@jk0.org>
+Josh Kleinpeter <josh@kleinpeter.org>
 Joshua McKenty <jmckenty@gmail.com>
 Justin Santa Barbara <justin@fathomdb.com>
 Kei Masumoto <masumotok@nttdata.co.jp>

bin/nova-manage

@@ -518,11 +518,12 @@ class NetworkCommands(object):
                network_size=None, vlan_start=None,
                vpn_start=None, fixed_range_v6=None, label='public'):
         """Creates fixed ips for host by range
-        arguments: [fixed_range=FLAG], [num_networks=FLAG],
+        arguments: fixed_range=FLAG, [num_networks=FLAG],
                    [network_size=FLAG], [vlan_start=FLAG],
                    [vpn_start=FLAG], [fixed_range_v6=FLAG]"""
         if not fixed_range:
-            fixed_range = FLAGS.fixed_range
+            raise TypeError(_('Fixed range in the form of 10.0.0.0/8 is '
+                              'required to create networks.'))
         if not num_networks:
             num_networks = FLAGS.num_networks
         if not network_size:

nova/tests/test_xenapi.py

@@ -432,11 +432,8 @@ class XenAPIVMTestCase(test.TestCase):
             # When mounting, create real files under the mountpoint to simulate
             # files in the mounted filesystem
 
-            # RegExp extracts the path of the mountpoint
-            cmd_str = ' '.join(cmd)
-            match = re.match(r'(sudo\s+)?mount[^"]*"[^"]*"\s+"([^"]*)"',
-                             cmd_str)
-            self._tmpdir = match.group(2)
+            # mount point will be the last item of the command list
+            self._tmpdir = cmd[len(cmd) - 1]
             LOG.debug(_('Creating files in %s to simulate guest agent' %
                 self._tmpdir))
             os.makedirs(os.path.join(self._tmpdir, 'usr', 'sbin'))