Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
23 changed files
with
510 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
{ | ||
"shelve": null | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<shelve/> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"server" : { | ||
"name" : "new-server-test", | ||
"imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b", | ||
"flavorRef" : "http://openstack.example.com/openstack/flavors/1", | ||
"metadata" : { | ||
"My Server Name" : "Apache1" | ||
}, | ||
"personality" : [ | ||
{ | ||
"path" : "/etc/banner.txt", | ||
"contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA==" | ||
} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
<?xml version="1.0" encoding="UTF-8"?> | ||
<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test"> | ||
<metadata> | ||
<meta key="My Server Name">Apache1</meta> | ||
</metadata> | ||
<personality> | ||
<file path="/etc/banner.txt"> | ||
ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp | ||
dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k | ||
IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs | ||
c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g | ||
QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo | ||
ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv | ||
dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy | ||
c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 | ||
b25zLiINCg0KLVJpY2hhcmQgQmFjaA== | ||
</file> | ||
</personality> | ||
</server> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
{ | ||
"server": { | ||
"adminPass": "bGZzzzeaSp9z", | ||
"id": "9582b762-0964-4509-8fff-0146c02abe31", | ||
"links": [ | ||
{ | ||
"href": "http://openstack.example.com/v2/openstack/servers/9582b762-0964-4509-8fff-0146c02abe31", | ||
"rel": "self" | ||
}, | ||
{ | ||
"href": "http://openstack.example.com/openstack/servers/9582b762-0964-4509-8fff-0146c02abe31", | ||
"rel": "bookmark" | ||
} | ||
] | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
<?xml version='1.0' encoding='UTF-8'?> | ||
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="380d8ce9-bd82-4182-b643-b72232cd11d0" adminPass="LePA926cLP3R"> | ||
<metadata/> | ||
<atom:link href="http://openstack.example.com/v2/openstack/servers/380d8ce9-bd82-4182-b643-b72232cd11d0" rel="self"/> | ||
<atom:link href="http://openstack.example.com/openstack/servers/380d8ce9-bd82-4182-b643-b72232cd11d0" rel="bookmark"/> | ||
</server> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,100 @@ | ||
# Copyright 2013 Rackspace Hosting | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
|
||
"""The shelved mode extension.""" | ||
|
||
import webob | ||
from webob import exc | ||
|
||
from nova.api.openstack import common | ||
from nova.api.openstack import extensions as exts | ||
from nova.api.openstack import wsgi | ||
from nova import compute | ||
from nova import exception | ||
|
||
|
||
auth_shelve = exts.extension_authorizer('compute', 'shelve') | ||
auth_shelve_offload = exts.extension_authorizer('compute', 'shelveOffload') | ||
auth_unshelve = exts.extension_authorizer('compute', 'unshelve') | ||
|
||
|
||
class ShelveController(wsgi.Controller): | ||
def __init__(self, *args, **kwargs): | ||
super(ShelveController, self).__init__(*args, **kwargs) | ||
self.compute_api = compute.API() | ||
|
||
def _get_instance(self, context, instance_id): | ||
try: | ||
return self.compute_api.get(context, instance_id, | ||
want_objects=True) | ||
except exception.InstanceNotFound: | ||
msg = _("Server not found") | ||
raise exc.HTTPNotFound(msg) | ||
|
||
@wsgi.action('shelve') | ||
def _shelve(self, req, id, body): | ||
"""Move an instance into shelved mode.""" | ||
context = req.environ["nova.context"] | ||
auth_shelve(context) | ||
|
||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.shelve(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'shelve') | ||
|
||
return webob.Response(status_int=202) | ||
|
||
@wsgi.action('shelveOffload') | ||
def _shelve_offload(self, req, id, body): | ||
"""Force removal of a shelved instance from the compute node.""" | ||
context = req.environ["nova.context"] | ||
auth_shelve_offload(context) | ||
|
||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.shelve_offload(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'shelveOffload') | ||
|
||
return webob.Response(status_int=202) | ||
|
||
@wsgi.action('unshelve') | ||
def _unshelve(self, req, id, body): | ||
"""Restore an instance from shelved mode.""" | ||
context = req.environ["nova.context"] | ||
auth_unshelve(context) | ||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.unshelve(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'unshelve') | ||
return webob.Response(status_int=202) | ||
|
||
|
||
class Shelve(exts.ExtensionDescriptor): | ||
"""Instance shelve mode.""" | ||
|
||
name = "Shelve" | ||
alias = "os-shelve" | ||
namespace = "http://docs.openstack.org/compute/ext/shelve/api/v1.1" | ||
updated = "2013-04-06T00:00:00+00:00" | ||
|
||
def get_controller_extensions(self): | ||
controller = ShelveController() | ||
extension = exts.ControllerExtension(self, 'servers', controller) | ||
return [extension] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,105 @@ | ||
# Copyright 2013 Rackspace Hosting | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); you may | ||
# not use this file except in compliance with the License. You may obtain | ||
# a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT | ||
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the | ||
# License for the specific language governing permissions and limitations | ||
# under the License. | ||
|
||
"""The shelved mode extension.""" | ||
|
||
import webob | ||
from webob import exc | ||
|
||
from nova.api.openstack import common | ||
from nova.api.openstack import extensions as exts | ||
from nova.api.openstack import wsgi | ||
from nova import compute | ||
from nova import exception | ||
|
||
|
||
ALIAS = 'os-shelve' | ||
auth_shelve = exts.extension_authorizer('compute', 'v3:%s:shelve' % ALIAS) | ||
auth_shelve_offload = exts.extension_authorizer('compute', | ||
'v3:%s:shelve_offload' % ALIAS) | ||
auth_unshelve = exts.extension_authorizer('compute', 'v3:%s:unshelve' % ALIAS) | ||
|
||
|
||
class ShelveController(wsgi.Controller): | ||
def __init__(self, *args, **kwargs): | ||
super(ShelveController, self).__init__(*args, **kwargs) | ||
self.compute_api = compute.API() | ||
|
||
def _get_instance(self, context, instance_id): | ||
try: | ||
return self.compute_api.get(context, instance_id, | ||
want_objects=True) | ||
except exception.InstanceNotFound: | ||
msg = _("Server not found") | ||
raise exc.HTTPNotFound(msg) | ||
|
||
@wsgi.action('shelve') | ||
def _shelve(self, req, id, body): | ||
"""Move an instance into shelved mode.""" | ||
context = req.environ["nova.context"] | ||
auth_shelve(context) | ||
|
||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.shelve(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'shelve') | ||
|
||
return webob.Response(status_int=202) | ||
|
||
@wsgi.action('shelve_offload') | ||
def _shelve_offload(self, req, id, body): | ||
"""Force removal of a shelved instance from the compute node.""" | ||
context = req.environ["nova.context"] | ||
auth_shelve_offload(context) | ||
|
||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.shelve_offload(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'shelve_offload') | ||
|
||
return webob.Response(status_int=202) | ||
|
||
@wsgi.action('unshelve') | ||
def _unshelve(self, req, id, body): | ||
"""Restore an instance from shelved mode.""" | ||
context = req.environ["nova.context"] | ||
auth_unshelve(context) | ||
instance = self._get_instance(context, id) | ||
try: | ||
self.compute_api.unshelve(context, instance) | ||
except exception.InstanceInvalidState as state_error: | ||
common.raise_http_conflict_for_instance_invalid_state(state_error, | ||
'unshelve') | ||
return webob.Response(status_int=202) | ||
|
||
|
||
class Shelve(exts.V3APIExtensionBase): | ||
"""Instance shelve mode.""" | ||
|
||
name = "Shelve" | ||
alias = ALIAS | ||
namespace = "http://docs.openstack.org/compute/ext/shelve/api/v3" | ||
version = 1 | ||
|
||
def get_controller_extensions(self): | ||
controller = ShelveController() | ||
extension = exts.ControllerExtension(self, 'servers', controller) | ||
return [extension] | ||
|
||
def get_resources(self): | ||
return [] |
Oops, something went wrong.