1. devstack
  2. Commit 65006913532c9e8fe344314a1152a9ae3ccef269
Browse code

Merge "Add sanity check framework to verify neutron server/backend integration"

Jenkins authored on 2014/01/17 17:33:45
Showing 8 changed files
lib/neutron
History View file @ 6500691
... ... 
@@ -958,6 +958,11 @@ function stop_neutron_third_party() {
958 958 
     _neutron_third_party_do stop
959 959 
 }
960 960
961 
+# check_neutron_third_party_integration() - Check that third party integration is sane
962 
+function check_neutron_third_party_integration() {
963 
+    _neutron_third_party_do check
964 
+}
965 
+
961 966
962 967 
 # Restore xtrace
963 968 
 $XTRACE
lib/neutron_thirdparty/README.md
History View file @ 6500691
... ... 
@@ -34,3 +34,6 @@ functions to be implemented
34 34
35 35 
 * ``stop_<third_party>``:
36 36 
   stop running processes (non-screen)
37 
+
38 
+* ``check_<third_party>``:
39 
+  verify that the integration between neutron server and third-party components is sane
lib/neutron_thirdparty/bigswitch_floodlight
History View file @ 6500691
... ... 
@@ -45,5 +45,9 @@ function stop_bigswitch_floodlight() {
45 45 
     :
46 46 
 }
47 47
48 
+function check_bigswitch_floodlight() {
49 
+    :
50 
+}
51 
+
48 52 
 # Restore xtrace
49 53 
 $MY_XTRACE
lib/neutron_thirdparty/midonet
History View file @ 6500691
... ... 
@@ -56,5 +56,9 @@ function stop_midonet() {
56 56 
     :
57 57 
 }
58 58
59 
+function check_midonet() {
60 
+    :
61 
+}
62 
+
59 63 
 # Restore xtrace
60 64 
 $MY_XTRACE
lib/neutron_thirdparty/ryu
History View file @ 6500691
... ... 
@@ -75,5 +75,9 @@ function stop_ryu() {
75 75 
     :
76 76 
 }
77 77
78 
+function check_ryu() {
79 
+    :
80 
+}
81 
+
78 82 
 # Restore xtrace
79 83 
 $MY_XTRACE
lib/neutron_thirdparty/trema
History View file @ 6500691
... ... 
@@ -109,5 +109,9 @@ function stop_trema() {
109 109 
     sudo TREMA_TMP=$TREMA_TMP_DIR trema killall
110 110 
 }
111 111
112 
+function check_trema() {
113 
+    :
114 
+}
115 
+
112 116 
 # Restore xtrace
113 117 
 $MY_XTRACE
lib/neutron_thirdparty/vmware_nsx
History View file @ 6500691
... ... 
@@ -78,5 +78,9 @@ function stop_vmware_nsx() {
78 78 
     done
79 79 
 }
80 80
81 
+function check_vmware_nsx() {
82 
+    :
83 
+}
84 
+
81 85 
 # Restore xtrace
82 86 
 $MY_XTRACE
stack.sh
History View file @ 6500691
... ... 
@@ -1116,6 +1116,7 @@ fi
1116 1116 
 if is_service_enabled q-svc; then
1117 1117 
     echo_summary "Starting Neutron"
1118 1118 
     start_neutron_service_and_check
1119 
+    check_neutron_third_party_integration
1119 1120 
 elif is_service_enabled $DATABASE_BACKENDS && is_service_enabled n-net; then
1120 1121 
     NM_CONF=${NOVA_CONF}
1121 1122 
     if is_service_enabled n-cell; then