← Back to branch summary

~ubuntu-branches/ubuntu/saucy/heat/saucy

« back to all changes in this revision

Viewing changes to heat/engine/resources/vpc.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Yolanda Robla, Chuck Short
  • Date: 2013-07-22 16:22:29 UTC
  • mfrom: (1.1.2)
  • Revision ID: package-import@ubuntu.com-20130722162229-zzvfu40id94ii0hc
Tags: 2013.2~b2-0ubuntu1
[ Yolanda Robla ]
* debian/tests: added autopkg tests

[ Chuck Short ]
* New upstream release
* debian/control:
  - Add python-pbr to build-depends.
  - Add python-d2to to build-depends.
  - Dropped python-argparse.
  - Add python-six to build-depends.
  - Dropped python-sendfile.
  - Dropped python-nose.
  - Added testrepository.
  - Added python-testtools.
* debian/rules: Run testrepository instead of nosetets.
* debian/patches/removes-lxml-version-limitation-from-pip-requires.patch: Dropped
  no longer needed.
* debian/patches/fix-package-version-detection-when-building-doc.patch: Dropped
  no longer needed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/engine/resources/vpc.py
13
13
#    License for the specific language governing permissions and limitations
14
14
#    under the License.
15
15
 
 
16
from heat.common import exception
16
17
from heat.engine import clients
17
18
from heat.openstack.common import log as logging
18
19
from heat.engine import resource
 
20
from heat.engine.resources.quantum import quantum
19
21
 
20
22
logger = logging.getLogger(__name__)
21
23
 
40
42
            'Schema': tags_schema}}
41
43
    }
42
44
 
43
 
    def __init__(self, name, json_snippet, stack):
44
 
        super(VPC, self).__init__(name, json_snippet, stack)
45
 
 
46
45
    def handle_create(self):
47
46
        client = self.quantum()
48
 
        props = {'name': self.physical_resource_name()}
49
 
        # Creates a network with an implicit router
50
 
        net = client.create_network({'network': props})['network']
51
 
        router = client.create_router({'router': props})['router']
52
 
        md = {
53
 
            'router_id': router['id'],
54
 
            'all_router_ids': [router['id']]
55
 
        }
56
 
        self.metadata = md
 
47
        # The VPC's net and router are associated by having identical names.
 
48
        net_props = {'name': self.physical_resource_name()}
 
49
        router_props = {'name': self.physical_resource_name()}
 
50
 
 
51
        net = client.create_network({'network': net_props})['network']
 
52
        client.create_router({'router': router_props})['router']
 
53
 
57
54
        self.resource_id_set(net['id'])
58
55
 
 
56
    @staticmethod
 
57
    def network_for_vpc(client, network_id):
 
58
        return client.show_network(network_id)['network']
 
59
 
 
60
    @staticmethod
 
61
    def router_for_vpc(client, network_id):
 
62
        # first get the quantum net
 
63
        net = VPC.network_for_vpc(client, network_id)
 
64
        # then find a router with the same name
 
65
        routers = client.list_routers(name=net['name'])['routers']
 
66
        if len(routers) == 0:
 
67
            # There may be no router if the net was created manually
 
68
            # instead of in another stack.
 
69
            return None
 
70
        if len(routers) > 1:
 
71
            raise exception.Error(
 
72
                _('Multiple routers found with name %s') % net['name'])
 
73
        return routers[0]
 
74
 
 
75
    def check_create_complete(self, *args):
 
76
        net = self.network_for_vpc(self.quantum(), self.resource_id)
 
77
        if not quantum.QuantumResource.is_built(net):
 
78
            return False
 
79
        router = self.router_for_vpc(self.quantum(), self.resource_id)
 
80
        return quantum.QuantumResource.is_built(router)
 
81
 
59
82
    def handle_delete(self):
60
83
        from quantumclient.common.exceptions import QuantumClientException
61
 
 
62
84
        client = self.quantum()
63
 
        network_id = self.resource_id
64
 
        router_id = self.metadata['router_id']
65
 
        try:
66
 
            client.delete_router(router_id)
67
 
        except QuantumClientException as ex:
68
 
            if ex.status_code != 404:
69
 
                raise ex
70
 
 
71
 
        try:
72
 
            client.delete_network(network_id)
73
 
        except QuantumClientException as ex:
74
 
            if ex.status_code != 404:
75
 
                raise ex
76
 
 
77
 
    def handle_update(self, json_snippet):
78
 
        return self.UPDATE_REPLACE
 
85
        router = self.router_for_vpc(client, self.resource_id)
 
86
        try:
 
87
            client.delete_router(router['id'])
 
88
        except QuantumClientException as ex:
 
89
            if ex.status_code != 404:
 
90
                raise ex
 
91
 
 
92
        try:
 
93
            client.delete_network(self.resource_id)
 
94
        except QuantumClientException as ex:
 
95
            if ex.status_code != 404:
 
96
                raise ex
79
97
 
80
98
 
81
99
def resource_mapping():