starlingx/integ
Code Issues Proposed changes

Open vSwitch integration with host and configuration framework

Browse Source 
Integrates the latest Open vSwitch with DPDK into the host management
and configuration framework and configures the default system
vswitch type to be ovs-dpdk.

Change-Id: Ia6e402c9180d019d1f9f52a531daa571197ea000
Signed-off-by: Matt Peters <matt.peters@windriver.com>
Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
Matt Peters 2018-06-07 09:42:21 -05:00 committed by Scott Little
parent c8d4b55130
commit 3f95486410
3 changed files with 36 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tools/collector/centos/collector.spec
View File

@ -41,7 +41,7 @@ install -m 755 collect_ceph.sh %{buildroot}%{_sysconfdir}/collect.d/collect_ceph
install -m 755 collect_sm.sh %{buildroot}%{_sysconfdir}/collect.d/collect_sm install -m 755 collect_sm.sh %{buildroot}%{_sysconfdir}/collect.d/collect_sm
install -m 755 collect_tc.sh %{buildroot}%{_sysconfdir}/collect.d/collect_tc install -m 755 collect_tc.sh %{buildroot}%{_sysconfdir}/collect.d/collect_tc
install -m 755 collect_nfv_vim.sh %{buildroot}%{_sysconfdir}/collect.d/collect_nfv_vim install -m 755 collect_nfv_vim.sh %{buildroot}%{_sysconfdir}/collect.d/collect_nfv_vim
install -m 755 collect_vswitch.sh %{buildroot}%{_sysconfdir}/collect.d/collect_vswitch install -m 755 collect_ovs.sh %{buildroot}%{_sysconfdir}/collect.d/collect_ovs
install -m 755 collect_patching.sh %{buildroot}%{_sysconfdir}/collect.d/collect_patching install -m 755 collect_patching.sh %{buildroot}%{_sysconfdir}/collect.d/collect_patching
install -m 755 collect_coredump.sh %{buildroot}%{_sysconfdir}/collect.d/collect_coredump install -m 755 collect_coredump.sh %{buildroot}%{_sysconfdir}/collect.d/collect_coredump
install -m 755 collect_crash.sh %{buildroot}%{_sysconfdir}/collect.d/collect_crash install -m 755 collect_crash.sh %{buildroot}%{_sysconfdir}/collect.d/collect_crash

35
tools/collector/scripts/collect_ovs.sh Normal file
View File

@ -0,0 +1,35 @@
#! /bin/bash
########################################################################
#
# Copyright (c) 2018 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
########################################################################
# Loads Up Utilities and Commands Variables
source /usr/local/sbin/collect_parms
source /usr/local/sbin/collect_utils
SERVICE="ovs"
LOGFILE="${extradir}/${SERVICE}.info"
###############################################################################
# Only Compute Nodes
###############################################################################
if [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then
if [[ "$vswitch_type" == *ovs* ]]; then
echo "${hostname}: OVS Info ..........: ${LOGFILE}"
delimiter ${LOGFILE} "ovsdb-client dump"
ovsdb-client dump >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
delimiter ${LOGFILE} "ovs-vsctl show"
ovs-vsctl --timeout 10 show >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
fi
fi
exit 0

108
tools/collector/scripts/collect_vswitch.sh
View File

@ -1,108 +0,0 @@
#! /bin/bash
#
# Copyright (c) 2013-2014 Wind River Systems, Inc.
#
# SPDX-License-Identifier: Apache-2.0
#
# Loads Up Utilities and Commands Variables
source /usr/local/sbin/collect_parms
source /usr/local/sbin/collect_utils
SERVICE="vswitch"
LOGFILE="${extradir}/${SERVICE}.info"
LIST_COMMANDS=(
# keep items sorted alphabetically
"address-list"
"dvr-mac-list"
"dvr-subnet-list"
"engine-list"
"engine-queue-list"
"filter-bindings-list"
"filter-rule-list"
"flow-group-list"
"flow-rule-list"
"igmp-group-list"
"igmp-interface-list"
"interface-list"
"lacp-interface-list"
"lacp-neighbour-list"
"lldp-agent-list"
"lldp-neighbour-list"
"mld-group-list"
"mld-interface-list"
"nat-list"
"neighbour-list"
"network-list"
"network-table-list"
"openflow-controller-list"
"openflow-errors-list"
"ovsdb-manager-list"
"ovsdb-monitor-list"
"port-list"
"route-list"
"router-list"
"router-list"
"snat-list"
"stream-list"
"vxlan-endpoint-list"
"vxlan-ip-endpoint-list"
"vxlan-peer-list")
STATS_COMMANDS=(
# keep below items sorted alphabetically
"arp-stats-list"
"dvr-stats-list"
"engine-stats-list"
"filter-stats-list"
"flow-cache-stats-list"
"flow-event-stats-list"
"flow-switch-stats-list"
"flow-table-stats-list"
"icmp-stats-list"
"igmp-stats-list"
"interface-stats-list"
"ip-stats-list"
"ip-stats-list-errors"
"lacp-stats-list"
"lldp-stats-list"
"memory-stats-list"
"mld-stats-list"
"nat-stats-list"
"ndp-stats-list"
"network-stats-list"
"openflow-stats-list"
"port-queue-stats-list"
"port-rate-list"
"port-stats-list"
"snat-stats-list"
"udp-stats-list"
"vxlan-endpoint-stats-list")
###############################################################################
# Only Compute Nodes
###############################################################################
if [[ "$nodetype" == "compute" || "$subfunction" == *"compute"* ]] ; then
echo "${hostname}: AVS Info ..........: ${LOGFILE}"
for COMMAND in ${LIST_COMMANDS[@]}; do
delimiter ${LOGFILE} "vshell ${COMMAND}"
vshell ${COMMAND} --expanded >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
done
for COMMAND in ${STATS_COMMANDS[@]}; do
delimiter ${LOGFILE} "vshell ${COMMAND}"
vshell ${COMMAND} >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
done
if [[ "$sdn_enabled" == "yes" ]] ; then
delimiter ${LOGFILE} "ovsdb-client dump"
ovsdb-client dump >> ${LOGFILE} 2>>${COLLECT_ERROR_LOG}
fi
fi
exit 0