Error in flat and local network creation in Cisco plugin

[Sumit Naiksatam]

When creating a network of flat network type, see the following error:

2012-09-19 00:44:32 ERROR [quantum.api.v2.resource] create failed
Traceback (most recent call last): File "/opt/stack/quantum/quantum/api/v2/resource.py", line 95, in resource
    result = method(request=request, **args) File "/opt/stack/quantum/quantum/api/v2/base.py", line 328, in create
    obj = obj_creator(request.context, **kwargs)
  File "/opt/stack/quantum/quantum/plugins/cisco/models/virt_phy_sw_v2.py", line 194, in create_network
    args) File "/opt/stack/quantum/quantum/plugins/cisco/models/virt_phy_sw_v2.py", line 123, in _invoke_plugin_per_device
    device_params)]
  File "/opt/stack/quantum/quantum/plugins/cisco/models/virt_phy_sw_v2.py", line 160, in _invoke_plugin
    return func(*func_args, **kwargs) File "/opt/stack/quantum/quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py", line 81, in create_network
    self._nexus_ports, self._nexus_ssh_port, vlan_ids) File "/opt/stack/quantum/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py", line 121, in create_vlan
    self.enable_vlan(man, vlan_id, vlan_name) File "/opt/stack/quantum/quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py", line 64, in enable_vlan
    mgr.edit_config(target='running', config=confstr)
  File "/usr/local/lib/python2.7/dist-packages/ncclient/manager.py", line 76, in wrapper
    return self.execute(op_cls, *args, **kwds)
  File "/usr/local/lib/python2.7/dist-packages/ncclient/manager.py", line 130, in execute
    raise_mode=self._raise_mode).request(*args, **kwds)
  File "/usr/local/lib/python2.7/dist-packages/ncclient/operations/edit.py", line 58, in request
    return self._request(node)
  File "/usr/local/lib/python2.7/dist-packages/ncclient/operations/rpc.py", line 294, in _request
    raise self._reply.error
RPCError: Syntax error while parsing 'vlan -1'

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/13340

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/13340
Committed: http://github.com/openstack/quantum/commit/abc129701d0271e7838285403a662ce872479c63
Submitter: Jenkins
Branch: master

commit abc129701d0271e7838285403a662ce872479c63
Author: Sumit Naiksatam <email address hidden>
Date: Wed Sep 19 13:20:12 2012 -0700

    Fix for flat network creation in Cisco plugin

    Bug #1053154

    Checks for the validity of the VLAN ID needed to be performed. In cases where
    segmentation ID is not greater than zero, the Nexus sub-plugin does not
    need to be invoked for that network.

    Change-Id: I813d569c0c3d26c08554bf3599633b700a98c739

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: milestone-proposed
Review: https://review.openstack.org/13451

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/13451
Committed: http://github.com/openstack/quantum/commit/e860c013f9f1d54ed5ac5f572f27513ab1ad487d
Submitter: Jenkins
Branch: milestone-proposed

commit e860c013f9f1d54ed5ac5f572f27513ab1ad487d
Author: Sumit Naiksatam <email address hidden>
Date: Wed Sep 19 13:20:12 2012 -0700

    Fix for flat network creation in Cisco plugin

    Bug #1053154

    Checks for the validity of the VLAN ID needed to be performed. In cases where
    segmentation ID is not greater than zero, the Nexus sub-plugin does not
    need to be invoked for that network.

    Change-Id: I813d569c0c3d26c08554bf3599633b700a98c739