Fix broken dragonflow gates

This commit is composed of 4 (four) commits that fix various aspects
that were broken in the gate.

Co-Authored-By: Omer Anson <omer.anson@toganetworks.com>

Bump up the version of libzmq for Ubuntu and Suse

This is required as libzmq1 is no longer supported under these
platforms.

Change-Id: I17c73025856c006926ea6b2444c4fde86726db9d

Install ruby via the operating system

As opposed to installing it from source, success of which is a matter of
chance.

Change-Id: I39f13525d9b1d814c90ac898148b9543ed64cd7e

Cleanup registered apps with os-ken

Otherwise, os-ken complains that the apps are already
instantiated. This might be causing the get failure.

Change-Id: Iad8f76aafe98be443b0efa34e2f9cef8f40a9588

Disable test TestNeighborAdvertiser

It isn't working. Reported in bug 1820977.

Change-Id: Ie1f9c05c3847320ba1892c52182d3e7d856f4957
Related-Bug: #1820977
This commit is contained in:
Shachar Snapiri 2019-03-18 11:31:29 +02:00
parent bc821f0250
commit 8fd27641b0
4 changed files with 16 additions and 13 deletions

View File

@ -335,9 +335,9 @@ function install_zeromq {
if is_fedora; then
install_package zeromq
elif is_ubuntu; then
install_package libzmq1
install_package libzmq3-dev
elif is_suse; then
install_package libzmq1
install_package libzmq3-dev
fi
# Necessary directory for socket location.
sudo mkdir -p /var/run/openstack

View File

@ -11,7 +11,6 @@
# - nb_db_driver_configure
REDIS_VERSION=3.0.6
RUBY_VERSION=2.3
function _redis_env {
# REMOTE_DB_* initialized after sourcing
@ -74,15 +73,7 @@ function nb_db_driver_install_server {
_configure_redis
fi
mkdir -p $DEST/ruby
if [ ! -f "$DEST/ruby/ruby-$RUBY_VERSION.0.tar.gz" ]; then
wget https://cache.ruby-lang.org/pub/ruby/$RUBY_VERSION/ruby-$RUBY_VERSION.0.tar.gz -O $DEST/ruby/ruby-$RUBY_VERSION.0.tar.gz
fi
tar xzvf $DEST/ruby/ruby-$RUBY_VERSION.0.tar.gz -C $DEST/ruby
cd $DEST/ruby/ruby-$RUBY_VERSION.0
sudo ./configure
sudo make
sudo make install
install_package -y ruby
if ! sudo gem list redis | grep -q redis; then
sudo gem source -a $DF_RUBY_SOURCE_ADD

View File

@ -42,6 +42,13 @@ class DfOvsDriver(df_switch_driver.DfSwitchDriver):
def initialize(self, db_change_callback, neutron_notifier):
super(DfOvsDriver, self).initialize(db_change_callback,
neutron_notifier)
self._initialize_app()
# The OfctlService is needed to support the 'get_flows' method
self._initialize_service()
def _initialize_app(self):
if self.open_flow_app:
self.app_mgr.uninstantiate(self.open_flow_app.name)
self.open_flow_app = self.app_mgr.instantiate(
os_ken_base_app.OsKenDFAdapter,
nb_api=self.nb_api,
@ -49,7 +56,10 @@ class DfOvsDriver(df_switch_driver.DfSwitchDriver):
neutron_server_notifier=self.neutron_notifier,
db_change_callback=self.db_change_callback
)
# The OfctlService is needed to support the 'get_flows' method
def _initialize_service(self):
if self.open_flow_service:
self.app_mgr.uninstantiate(self.open_flow_service.name)
self.open_flow_service = self.app_mgr.instantiate(
of_service.OfctlService)

View File

@ -10,6 +10,7 @@
# License for the specific language governing permissions and limitations
# under the License.
import testtools
import time
from neutron.agent.common import utils
@ -225,6 +226,7 @@ class TestNeighborAdvertiser(test_base.DFTestBase):
'net.ipv6.conf.default.router_solicitations={}'.
format(self.router_solicit_conf)], run_as_root=True)
@testtools.skip('bug/1820977')
def test_simple_response(self):
"""
2 ports on 1 subnet. 1 port asks for MAC of other.