From 7142aa734c1e77a6efacac5bff918b44240b7a1a Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Thu, 30 Jun 2011 16:49:03 -0500 Subject: Merge from trunk --- bin/nova-ajax-console-proxy | 0 bin/nova-api | 0 bin/nova-compute | 0 bin/nova-console | 0 bin/nova-dhcpbridge | 0 bin/nova-direct-api | 0 bin/nova-import-canonical-imagestore | 0 bin/nova-instancemonitor | 0 bin/nova-manage | 0 bin/nova-network | 0 bin/nova-objectstore | 0 bin/nova-scheduler | 0 bin/nova-vncproxy | 0 bin/nova-volume | 0 bin/stack | 0 doc/source/devref/down.sh | 0 doc/source/devref/up.sh | 0 nova/cloudpipe/bootscript.template | 0 plugins/xenserver/networking/etc/init.d/host-rules | 0 plugins/xenserver/networking/etc/init.d/openvswitch-nova | 0 .../networking/etc/xensource/scripts/ovs_configure_base_flows.py | 0 .../xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 0 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py | 0 tools/ajaxterm/ajaxterm.py | 0 tools/ajaxterm/configure | 0 tools/clean-vlans | 0 tools/euca-get-ajax-console | 0 tools/nova-debug | 0 31 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 bin/nova-ajax-console-proxy mode change 100755 => 100644 bin/nova-api mode change 100755 => 100644 bin/nova-compute mode change 100755 => 100644 bin/nova-console mode change 100755 => 100644 bin/nova-dhcpbridge mode change 100755 => 100644 bin/nova-direct-api mode change 100755 => 100644 bin/nova-import-canonical-imagestore mode change 100755 => 100644 bin/nova-instancemonitor mode change 100755 => 100644 bin/nova-manage mode change 100755 => 100644 bin/nova-network mode change 100755 => 100644 bin/nova-objectstore mode change 100755 => 100644 bin/nova-scheduler mode change 100755 => 100644 bin/nova-vncproxy mode change 100755 => 100644 bin/nova-volume mode change 100755 => 100644 bin/stack mode change 100644 => 100755 doc/source/devref/down.sh mode change 100644 => 100755 doc/source/devref/up.sh mode change 100755 => 100644 nova/cloudpipe/bootscript.template mode change 100755 => 100644 plugins/xenserver/networking/etc/init.d/host-rules mode change 100755 => 100644 plugins/xenserver/networking/etc/init.d/openvswitch-nova mode change 100755 => 100644 plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py mode change 100755 => 100644 plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py mode change 100755 => 100644 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py mode change 100755 => 100644 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent mode change 100755 => 100644 plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py mode change 100755 => 100644 plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py mode change 100755 => 100644 tools/ajaxterm/ajaxterm.py mode change 100755 => 100644 tools/ajaxterm/configure mode change 100755 => 100644 tools/clean-vlans mode change 100755 => 100644 tools/euca-get-ajax-console mode change 100755 => 100644 tools/nova-debug diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy old mode 100755 new mode 100644 diff --git a/bin/nova-api b/bin/nova-api old mode 100755 new mode 100644 diff --git a/bin/nova-compute b/bin/nova-compute old mode 100755 new mode 100644 diff --git a/bin/nova-console b/bin/nova-console old mode 100755 new mode 100644 diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge old mode 100755 new mode 100644 diff --git a/bin/nova-direct-api b/bin/nova-direct-api old mode 100755 new mode 100644 diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore old mode 100755 new mode 100644 diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor old mode 100755 new mode 100644 diff --git a/bin/nova-manage b/bin/nova-manage old mode 100755 new mode 100644 diff --git a/bin/nova-network b/bin/nova-network old mode 100755 new mode 100644 diff --git a/bin/nova-objectstore b/bin/nova-objectstore old mode 100755 new mode 100644 diff --git a/bin/nova-scheduler b/bin/nova-scheduler old mode 100755 new mode 100644 diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy old mode 100755 new mode 100644 diff --git a/bin/nova-volume b/bin/nova-volume old mode 100755 new mode 100644 diff --git a/bin/stack b/bin/stack old mode 100755 new mode 100644 diff --git a/doc/source/devref/down.sh b/doc/source/devref/down.sh old mode 100644 new mode 100755 diff --git a/doc/source/devref/up.sh b/doc/source/devref/up.sh old mode 100644 new mode 100755 diff --git a/nova/cloudpipe/bootscript.template b/nova/cloudpipe/bootscript.template old mode 100755 new mode 100644 diff --git a/plugins/xenserver/networking/etc/init.d/host-rules b/plugins/xenserver/networking/etc/init.d/host-rules old mode 100755 new mode 100644 diff --git a/plugins/xenserver/networking/etc/init.d/openvswitch-nova b/plugins/xenserver/networking/etc/init.d/openvswitch-nova old mode 100755 new mode 100644 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py old mode 100755 new mode 100644 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py old mode 100755 new mode 100644 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py old mode 100755 new mode 100644 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent old mode 100755 new mode 100644 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py old mode 100755 new mode 100644 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py old mode 100755 new mode 100644 diff --git a/tools/ajaxterm/ajaxterm.py b/tools/ajaxterm/ajaxterm.py old mode 100755 new mode 100644 diff --git a/tools/ajaxterm/configure b/tools/ajaxterm/configure old mode 100755 new mode 100644 diff --git a/tools/clean-vlans b/tools/clean-vlans old mode 100755 new mode 100644 diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console old mode 100755 new mode 100644 diff --git a/tools/nova-debug b/tools/nova-debug old mode 100755 new mode 100644 -- cgit From 47c7a43ffcac3518543fdcc94ab54577249d9ced Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Mon, 11 Jul 2011 15:08:53 -0500 Subject: Tests --- nova/tests/api/openstack/test_servers.py | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index b6b5a1e76..e5b9dd766 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -1433,6 +1433,42 @@ class ServersTest(test.TestCase): self.assertEqual(res.status, '202 Accepted') self.assertEqual(self.server_delete_called, True) + def test_rescue_accepted(self): + FLAGS.allow_admin_api = True + body = {} + + self.called = False + + def rescue_mock(*args, **kwargs): + self.called = True + + self.stubs.Set(nova.compute.api.API, 'rescue', rescue_mock) + req = webob.Request.blank('/v1.0/servers/1/rescue') + req.method = 'POST' + req.content_type = 'application/json' + + res = req.get_response(fakes.wsgi_app()) + + self.assertEqual(self.called, True) + self.assertEqual(res.status_int, 202) + + def test_rescue_raises_handled(self): + FLAGS.allow_admin_api = True + body = {} + + def rescue_mock(*args, **kwargs): + raise Exception('Who cares?') + + self.stubs.Set(nova.compute.api.API, 'rescue', rescue_mock) + req = webob.Request.blank('/v1.0/servers/1/rescue') + req.method = 'POST' + req.content_type = 'application/json' + req.body = json.dumps(body) + + res = req.get_response(fakes.wsgi_app()) + + self.assertEqual(res.status_int, 400) + def test_resize_server(self): req = self.webreq('/1/action', 'POST', dict(resize=dict(flavorId=3))) -- cgit From e20e6a88c66aac240f18e6da604fc1e048f5b5ce Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Mon, 11 Jul 2011 15:31:39 -0500 Subject: Changed broken perms --- bin/nova-ajax-console-proxy | 0 bin/nova-api | 0 bin/nova-compute | 0 bin/nova-console | 0 bin/nova-dhcpbridge | 0 bin/nova-direct-api | 0 bin/nova-import-canonical-imagestore | 0 bin/nova-instancemonitor | 0 bin/nova-manage | 0 bin/nova-network | 0 bin/nova-objectstore | 0 bin/nova-scheduler | 0 bin/nova-vncproxy | 0 bin/nova-volume | 0 bin/stack | 0 doc/source/devref/down.sh | 0 doc/source/devref/up.sh | 0 nova/cloudpipe/bootscript.template | 0 plugins/xenserver/networking/etc/init.d/host-rules | 0 plugins/xenserver/networking/etc/init.d/openvswitch-nova | 0 .../networking/etc/xensource/scripts/ovs_configure_base_flows.py | 0 .../xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py | 0 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py | 0 plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py | 0 tools/ajaxterm/ajaxterm.py | 0 tools/ajaxterm/configure | 0 tools/clean-vlans | 0 tools/euca-get-ajax-console | 0 tools/nova-debug | 0 31 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 bin/nova-ajax-console-proxy mode change 100644 => 100755 bin/nova-api mode change 100644 => 100755 bin/nova-compute mode change 100644 => 100755 bin/nova-console mode change 100644 => 100755 bin/nova-dhcpbridge mode change 100644 => 100755 bin/nova-direct-api mode change 100644 => 100755 bin/nova-import-canonical-imagestore mode change 100644 => 100755 bin/nova-instancemonitor mode change 100644 => 100755 bin/nova-manage mode change 100644 => 100755 bin/nova-network mode change 100644 => 100755 bin/nova-objectstore mode change 100644 => 100755 bin/nova-scheduler mode change 100644 => 100755 bin/nova-vncproxy mode change 100644 => 100755 bin/nova-volume mode change 100644 => 100755 bin/stack mode change 100755 => 100644 doc/source/devref/down.sh mode change 100755 => 100644 doc/source/devref/up.sh mode change 100644 => 100755 nova/cloudpipe/bootscript.template mode change 100644 => 100755 plugins/xenserver/networking/etc/init.d/host-rules mode change 100644 => 100755 plugins/xenserver/networking/etc/init.d/openvswitch-nova mode change 100644 => 100755 plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py mode change 100644 => 100755 plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py mode change 100644 => 100755 plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py mode change 100644 => 100755 plugins/xenserver/xenapi/etc/xapi.d/plugins/agent mode change 100644 => 100755 plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py mode change 100644 => 100755 plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py mode change 100644 => 100755 tools/ajaxterm/ajaxterm.py mode change 100644 => 100755 tools/ajaxterm/configure mode change 100644 => 100755 tools/clean-vlans mode change 100644 => 100755 tools/euca-get-ajax-console mode change 100644 => 100755 tools/nova-debug diff --git a/bin/nova-ajax-console-proxy b/bin/nova-ajax-console-proxy old mode 100644 new mode 100755 diff --git a/bin/nova-api b/bin/nova-api old mode 100644 new mode 100755 diff --git a/bin/nova-compute b/bin/nova-compute old mode 100644 new mode 100755 diff --git a/bin/nova-console b/bin/nova-console old mode 100644 new mode 100755 diff --git a/bin/nova-dhcpbridge b/bin/nova-dhcpbridge old mode 100644 new mode 100755 diff --git a/bin/nova-direct-api b/bin/nova-direct-api old mode 100644 new mode 100755 diff --git a/bin/nova-import-canonical-imagestore b/bin/nova-import-canonical-imagestore old mode 100644 new mode 100755 diff --git a/bin/nova-instancemonitor b/bin/nova-instancemonitor old mode 100644 new mode 100755 diff --git a/bin/nova-manage b/bin/nova-manage old mode 100644 new mode 100755 diff --git a/bin/nova-network b/bin/nova-network old mode 100644 new mode 100755 diff --git a/bin/nova-objectstore b/bin/nova-objectstore old mode 100644 new mode 100755 diff --git a/bin/nova-scheduler b/bin/nova-scheduler old mode 100644 new mode 100755 diff --git a/bin/nova-vncproxy b/bin/nova-vncproxy old mode 100644 new mode 100755 diff --git a/bin/nova-volume b/bin/nova-volume old mode 100644 new mode 100755 diff --git a/bin/stack b/bin/stack old mode 100644 new mode 100755 diff --git a/doc/source/devref/down.sh b/doc/source/devref/down.sh old mode 100755 new mode 100644 diff --git a/doc/source/devref/up.sh b/doc/source/devref/up.sh old mode 100755 new mode 100644 diff --git a/nova/cloudpipe/bootscript.template b/nova/cloudpipe/bootscript.template old mode 100644 new mode 100755 diff --git a/plugins/xenserver/networking/etc/init.d/host-rules b/plugins/xenserver/networking/etc/init.d/host-rules old mode 100644 new mode 100755 diff --git a/plugins/xenserver/networking/etc/init.d/openvswitch-nova b/plugins/xenserver/networking/etc/init.d/openvswitch-nova old mode 100644 new mode 100755 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_base_flows.py old mode 100644 new mode 100755 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py b/plugins/xenserver/networking/etc/xensource/scripts/ovs_configure_vif_flows.py old mode 100644 new mode 100755 diff --git a/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py b/plugins/xenserver/networking/etc/xensource/scripts/vif_rules.py old mode 100644 new mode 100755 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/agent old mode 100644 new mode 100755 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/pluginlib_nova.py old mode 100644 new mode 100755 diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py old mode 100644 new mode 100755 diff --git a/tools/ajaxterm/ajaxterm.py b/tools/ajaxterm/ajaxterm.py old mode 100644 new mode 100755 diff --git a/tools/ajaxterm/configure b/tools/ajaxterm/configure old mode 100644 new mode 100755 diff --git a/tools/clean-vlans b/tools/clean-vlans old mode 100644 new mode 100755 diff --git a/tools/euca-get-ajax-console b/tools/euca-get-ajax-console old mode 100644 new mode 100755 diff --git a/tools/nova-debug b/tools/nova-debug old mode 100644 new mode 100755 -- cgit From 232bff13a0363a09f9b12551c4cd02787cc73702 Mon Sep 17 00:00:00 2001 From: "matt.dietz@rackspace.com" <> Date: Mon, 11 Jul 2011 16:26:46 -0500 Subject: Bad test --- nova/tests/api/openstack/test_servers.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nova/tests/api/openstack/test_servers.py b/nova/tests/api/openstack/test_servers.py index 0afe9a8ea..775f66ad0 100644 --- a/nova/tests/api/openstack/test_servers.py +++ b/nova/tests/api/openstack/test_servers.py @@ -1463,11 +1463,10 @@ class ServersTest(test.TestCase): req = webob.Request.blank('/v1.0/servers/1/rescue') req.method = 'POST' req.content_type = 'application/json' - req.body = json.dumps(body) res = req.get_response(fakes.wsgi_app()) - self.assertEqual(res.status_int, 400) + self.assertEqual(res.status_int, 422) def test_delete_server_instance_v1_1(self): req = webob.Request.blank('/v1.1/servers/1') -- cgit