← Back to branch summary

~ubuntu-branches/ubuntu/wily/heat/wily

« back to all changes in this revision

Viewing changes to heat/tests/neutron/test_neutron_provider_net.py

  • Committer: Package Import Robot
  • Author(s): Corey Bryant, Corey Bryant, James Page
  • Date: 2015-07-07 17:06:19 UTC
  • mfrom: (1.1.26) (45.1.1 vivid-proposed)
  • Revision ID: package-import@ubuntu.com-20150707170619-hra2dbjpfofpou4s
Tags: 1:5.0.0~b1-0ubuntu1
[ Corey Bryant ]
* New upstream milestone for OpenStack Liberty:
  - d/control: Align (build-)depends with upstream.
  - d/p/fix-requirements.patch: Rebased.
  - d/p/sudoers_patch.patch: Rebased.

[ James Page ]
* d/s/options: Ignore any removal of egg-info data during package clean.
* d/control: Drop MySQL and PostgreSQL related BD's, not required for unit
  testing.

Show diffs side-by-side

added added

removed removed

Lines of Context:
heat/tests/neutron/test_neutron_provider_net.py
88
88
        ).AndReturn(stpna)
89
89
 
90
90
        t = template_format.parse(provider_network_template)
91
 
        stack = utils.parse_stack(t)
92
 
        resource_defns = stack.t.resource_definitions(stack)
 
91
        self.stack = utils.parse_stack(t)
 
92
        resource_defns = self.stack.t.resource_definitions(self.stack)
93
93
        rsrc = provider_net.ProviderNet(
94
 
            'provider_net', resource_defns['provider_network_vlan'], stack)
 
94
            'provider_net', resource_defns['provider_network_vlan'],
 
95
            self.stack)
95
96
 
96
97
        return rsrc
97
98