-
Notifications
You must be signed in to change notification settings - Fork 386
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge "Added cloudpipe support. Fixes bug 962286" into milestone-prop…
…osed
- Loading branch information
Showing
6 changed files
with
98 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,48 @@ | ||
# Copyright 2012 OpenStack LLC. | ||
# All Rights Reserved. | ||
# | ||
# 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. | ||
|
||
"""Cloudpipe interface.""" | ||
|
||
from novaclient import base | ||
|
||
|
||
class Cloudpipe(base.Resource): | ||
"""A cloudpipe instance is a VPN attached to a proejct's VLAN.""" | ||
|
||
def __repr__(self): | ||
return "<Cloudpipe: %s>" % self.project_id | ||
|
||
def delete(self): | ||
self.manager.delete(self) | ||
|
||
|
||
class CloudpipeManager(base.ManagerWithFind): | ||
resource_class = Cloudpipe | ||
|
||
def create(self, project): | ||
""" | ||
Launch a cloudpipe instance. | ||
:param project: name of the project for the cloudpipe | ||
""" | ||
body = {'cloudpipe': {'project_id': project}} | ||
return self._create('/os-cloudpipe', body, 'instance_id', | ||
return_raw=True) | ||
|
||
def list(self): | ||
""" | ||
Get a list of cloudpipe instances. | ||
""" | ||
return self._list('/os-cloudpipe', 'cloudpipes') |
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,22 @@ | ||
from novaclient import exceptions | ||
from novaclient.v1_1 import cloudpipe | ||
from tests import utils | ||
from tests.v1_1 import fakes | ||
|
||
|
||
cs = fakes.FakeClient() | ||
|
||
|
||
class CloudpipeTest(utils.TestCase): | ||
|
||
def test_list_cloudpipes(self): | ||
cp = cs.cloudpipe.list() | ||
cs.assert_called('GET', '/os-cloudpipe') | ||
[self.assertTrue(isinstance(c, cloudpipe.Cloudpipe)) for c in cp] | ||
|
||
def test_create(self): | ||
project = "test" | ||
cp = cs.cloudpipe.create(project) | ||
body = {'cloudpipe': {'project_id': project}} | ||
cs.assert_called('POST', '/os-cloudpipe', body) | ||
self.assertTrue(isinstance(cp, str)) |