d2055d6998
Squashed commit of the following: commit 6c4995736a56349923d34353031eb301780fc6d2 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sat Jan 21 22:31:09 2012 -0800 Some more explanation in the README. Changing defaults in the conf file. commit 924b118468d7bd21737e9e2cf468ff83d0a20764 Author: Shweta <shpadubi@cisco.com> Date: Sat Jan 21 20:58:39 2012 -0500 Adding Unit Tests for LinuxBridge Agent commit 12115650257483172c5e2bc889634dbdf3596d27 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sat Jan 21 05:21:24 2012 -0800 Adding sqlite requirement Changing default mysql port number Fixing log statement commit 0ad1400e5dfc445b94e9024d92321eb3cd0588a5 Merge: 1b7ba8f9c5c2ca
Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sat Jan 21 05:12:44 2012 -0800 Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin commit 1b7ba8f7e7b6657734b669194ddfdcfcbfc833be Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sat Jan 21 04:04:50 2012 -0800 Fixes to get the tests to run correctly. Also incorporated changes to be able to run both sqlite and mysql DBs. commit 4cead17576c293319dfdfd363dd18e81ba196b3b Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Fri Jan 20 15:32:35 2012 -0800 Fixed inccorect calls to the DB commit c4f325729fbd06ee3f5d3520da4d23b2cd8c353b Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Fri Jan 20 12:18:18 2012 -0800 Removing the specialized db modules (which used InnoDB engine) and instead using the Quantum DB now. Incorporated changes to setup so that the Linux Bridge plugin can be installed. Other changes to README and tests. commit b9498939d723e353808cface87f4453e33e94b41 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Mon Jan 16 20:00:14 2012 -0800 Adding unit tests commit a0ab990fdcbf67a950d08c6b5b6d20ceb850619a Merge: 60e38ccf268b5e
Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Mon Jan 16 18:02:55 2012 -0800 Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin commit 60e38cc44886b5c8c9e47d89d8912d1dee23fbd1 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Mon Jan 16 13:44:37 2012 -0800 This contains a fix for the earlier reported issue with the DHCP failing. The gateway IP address is now applied both to the bridge, and the gateway interface. commit ffea86a3465b8a5ed93b13f818e0afaefa6787ee Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sun Jan 15 20:00:38 2012 -0800 Fixing an issue in the agent, sometimes the bridges for deleted networks were not getting cleaned up commit 87f76fc34f1c70cd82576b8698d704853c892422 Merge: c8b097a60d171e
Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sun Jan 15 19:40:33 2012 -0800 Merge remote branch 'upstream/master' into snaiksat/linux-bridge-plugin commit c8b097abc2060b2eae01d84f9fed2c89851d93fd Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sun Jan 15 19:37:08 2012 -0800 Simplified the logic for creating the bridge on the nova network host. commit 499dbacd4c5352c5320f3b6e5e8cd7f3629dbcc8 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Fri Jan 13 16:07:53 2012 -0800 Fix for the DHCP issue, now applying Gateway IP to the bridge Also MAC address from original tap device are applied to bridge and vlan subinterface commit 6b4a2aea59702e2c12eeacc86101df9f6770d5ec Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sat Jan 7 14:29:00 2012 -0800 Optimizations for processing in the loop commit 01aa47d3572439b193077432c63bf2b85c629edb Merge: 184f5dd 05df087 Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Sun Jan 1 19:04:17 2012 -0800 Changes to incorporate Operational Status Merge remote branch 'origin' into snaiksat/linux-bridge-plugin Conflicts: quantum/db/api.py commit 05df0870191fac0353fe12a33efff68ef7ed0784 Merge: 31d586b5b23b5e
Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Fri Dec 30 12:30:05 2011 -0800 Merge remote branch 'upstream/master' commit 184f5dd8b73bc51025509792c15203ee73cd015e Author: Sumit Naiksatam <snaiksat@cisco.com> Date: Mon Dec 12 02:09:12 2011 -0800 Initial checkin for Linux Bridge L2 plugin. Change-Id: I5b27538be6a768a6f7eb77409197f7d8b4bbc628
19 lines
731 B
Python
19 lines
731 B
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
#
|
|
# Copyright 2012 Cisco Systems, Inc. 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.
|
|
#
|
|
# @author: Sumit Naiksatam, Cisco Systems, Inc.
|
|
#
|