← Back to branch summary

~ubuntu-branches/ubuntu/raring/quantum/raring-proposed

« back to all changes in this revision

Viewing changes to quantum/plugins/cisco/models/virt_phy_sw_v2.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Yolanda Robla, James Page, Maru Newby
  • Date: 2013-01-11 09:14:35 UTC
  • mfrom: (2.1.17)
  • Revision ID: package-import@ubuntu.com-20130111091435-vaup7dwmtmajy5oe
Tags: 2013.1~g2-0ubuntu1
https://launchpad.net/bugs/1085038
https://launchpad.net/bugs/1076747
[ Chuck Short ]
* New upstream version. 
* debian/patches/fix-quantum-configuration.patch: Refreshed.

[ Yolanda Robla ]
* debian/quantum-l3-agent.quantum-metadata-agent.upstart: Add
  upstart configuration for Metadata Agent.
* debian/quantum-l3-agent.install: Added quantum-ns-metadata-proxy,
  quantum-metadata-agent and metadata_agent.ini.
* debian/patches/fix-quantum-configuration.patch: Update rootwrap
  configuration in metadata_agent.ini file.
* debian/changelog: Updated package version
* d/p/fix-quantum-configuration.patch: refresh patches

[ James Page ]
* d/*.install: Install entry points from bin directory instead
  of easy-install ones generated during the package build process
  (LP: #1085038).
* d/control: Drop BD on python-dev-all; its not required.
* d/rules: Install multiple upstart configurations for quantum-l3-agent.
* d/control: Tidy package descriptions.
* d/*.postrm: Drop as debhelper will generate update-rc.d calls in
  maintainer scripts if required.
* d/quantum-common.postinst: Tweak permissions setting so that /etc/quantum
  is not owned/writable by the quantum user, ensure that /etc/quantum/rootwrap*
  is owned by root:root.
* d/*agent*.postinst: Dropped as permissions now correctly set in
  quantum-common.
* d/patches/fix-quantum-configuration.patch: Re-add dropped fixes rootwrap and
  sqlite defaults for all plugins.
* d/control: Added new BD on alembic (>= 0.4.1~), version python-mock >= 1.0b1.

[ Maru Newby ]
* debian/control: Remove unnecessary openvswitch-vswitch dependency
  from quantum-plugin-openvswitch (LP: #1076747).

Show diffs side-by-side

added added

removed removed

Lines of Context:
quantum/plugins/cisco/models/virt_phy_sw_v2.py
200
200
            vlanids = self._get_all_segmentation_ids()
201
201
            args = [ovs_output[0]['tenant_id'], ovs_output[0]['name'],
202
202
                    ovs_output[0]['id'], vlan_name, vlan_id,
203
 
                    {'vlan_ids':vlanids}]
 
203
                    {'vlan_ids': vlanids}]
204
204
            nexus_output = self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
205
205
                                                          self._func_name(),
206
206
                                                          args)
227
227
                vlan_name = conf.VLAN_NAME_PREFIX + str(vlan_id)
228
228
                args = [ovs_network['tenant_id'], ovs_network['name'],
229
229
                        ovs_network['id'], vlan_name, vlan_id,
230
 
                        {'vlan_ids':vlanids}]
 
230
                        {'vlan_ids': vlanids}]
231
231
                nexus_output = self._invoke_plugin_per_device(
232
232
                    const.NEXUS_PLUGIN, "create_network", args)
233
233
            return ovs_output
271
271
            ovs_output = self._invoke_plugin_per_device(const.VSWITCH_PLUGIN,
272
272
                                                        self._func_name(),
273
273
                                                        args)
274
 
            args = [tenant_id, id, {const.VLANID:vlan_id},
275
 
                    {const.CONTEXT:context},
276
 
                    {const.BASE_PLUGIN_REF:base_plugin_ref}]
 
274
            args = [tenant_id, id, {const.VLANID: vlan_id},
 
275
                    {const.CONTEXT: context},
 
276
                    {const.BASE_PLUGIN_REF: base_plugin_ref}]
277
277
            if self._validate_vlan_id(vlan_id):
278
278
                self._invoke_plugin_per_device(const.NEXUS_PLUGIN,
279
279
                                               self._func_name(), args)
289
289
        """For this model this method will be delegated to vswitch plugin"""
290
290
        pass
291
291
 
292
 
    def get_networks_count(self, context, filters=None):
293
 
        """For this model this method will be delegated to vswitch plugin"""
294
 
        pass
295
 
 
296
292
    def create_port(self, context, port):
297
293
        """For this model this method will be delegated to vswitch plugin"""
298
294
        pass
305
301
        """For this model this method will be delegated to vswitch plugin"""
306
302
        pass
307
303
 
308
 
    def get_ports_count(self, context, filters=None):
309
 
        """For this model this method will be delegated to vswitch plugin"""
310
 
        pass
311
 
 
312
304
    def update_port(self, context, id, port):
313
305
        """For this model this method will be delegated to vswitch plugin"""
314
306
        pass
336
328
    def get_subnets(self, context, filters=None, fields=None):
337
329
        """For this model this method will be delegated to vswitch plugin"""
338
330
        pass
339
 
 
340
 
    def get_subnets_count(self, context, filters=None):
341
 
        """For this model this method will be delegated to vswitch plugin"""
342
 
        pass