Code Review
/
openstack-build
/
neutron-build.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Update rpm to 8.0.0.0b2
[openstack-build/neutron-build.git]
/
tests
/
runtests.sh
diff --git
a/tests/runtests.sh
b/tests/runtests.sh
index 372e4add2e67067bdafe23189b2035acc5b33a15..ba8e0322ace82add9c19faabc394867b8d9c9870 100755
(executable)
--- a/
tests/runtests.sh
+++ b/
tests/runtests.sh
@@
-216,7
+216,7
@@
check_neutron_openvswitch () {
if ! $SERVICE_STARTED ; then
if $UBUNTU; then
restart_service openvswitch-switch
if ! $SERVICE_STARTED ; then
if $UBUNTU; then
restart_service openvswitch-switch
- restart_service neutron-
plugin-
openvswitch-agent
+ restart_service neutron-openvswitch-agent
else
restart_service openvswitch
restart_service neutron-openvswitch-agent
else
restart_service openvswitch
restart_service neutron-openvswitch-agent
@@
-225,7
+225,7
@@
check_neutron_openvswitch () {
fi
sleep 10
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $
5
}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Open vSwitch agent" | awk -F "|" '{print $
6
}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "OVS agent check failed"; FAILURE=true; fi
}
if [ "$STATUS" != ":-)" ]; then echo "OVS agent check failed"; FAILURE=true; fi
}
@@
-236,7
+236,7
@@
check_neutron_l3_agent () {
fi
#This sleep here and in other functions is intended to let the agent add information to the queue
sleep 10
fi
#This sleep here and in other functions is intended to let the agent add information to the queue
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $
5
}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "L3 agent" | awk -F "|" '{print $
6
}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "L3 agent check failed"; FAILURE=true; fi
}
if [ "$STATUS" != ":-)" ]; then echo "L3 agent check failed"; FAILURE=true; fi
}
@@
-246,7
+246,7
@@
check_neutron_dhcp_agent () {
SERVICE_STARTED=true
fi
sleep 10
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $
5
}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "DHCP agent" | awk -F "|" '{print $
6
}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "DHCP agent check failed"; FAILURE=true; fi
}
if [ "$STATUS" != ":-)" ]; then echo "DHCP agent check failed"; FAILURE=true; fi
}
@@
-256,7
+256,7
@@
check_neutron_metadata_agent () {
SERVICE_STARTED=true
fi
sleep 10
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $
5
}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metadata agent" | awk -F "|" '{print $
6
}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "Metadata agent check failed"; FAILURE=true; fi
}
if [ "$STATUS" != ":-)" ]; then echo "Metadata agent check failed"; FAILURE=true; fi
}
@@
-266,7
+266,7
@@
check_neutron_metering_agent () {
SERVICE_STARTED=true
fi
sleep 10
SERVICE_STARTED=true
fi
sleep 10
- STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $
5
}' | tr -d " ")
+ STATUS=$(neutron $NEUTRON_AUTH agent-list | grep "Metering agent" | awk -F "|" '{print $
6
}' | tr -d " ")
if [ "$STATUS" != ":-)" ]; then echo "Metering agent check failed"; FAILURE=true; fi
}
if [ "$STATUS" != ":-)" ]; then echo "Metering agent check failed"; FAILURE=true; fi
}
@@
-322,7
+322,7
@@
case $PACKAGE in
try check_neutron_server
check_error
;;
try check_neutron_server
check_error
;;
- openstack-neutron-openvswitch|neutron-
plugin-
openvswitch-agent)
+ openstack-neutron-openvswitch|neutron-openvswitch-agent)
install_packages
install_neutron_server
setup_database
install_packages
install_neutron_server
setup_database
@@
-370,7
+370,7
@@
case $PACKAGE in
try check_neutron_metadata_agent
check_error
;;
try check_neutron_metadata_agent
check_error
;;
- openstack-neutron-metering-agent|neutron-
plugin-
metering-agent)
+ openstack-neutron-metering-agent|neutron-metering-agent)
install_neutron_server
install_packages
setup_database
install_neutron_server
install_packages
setup_database