[ofa-general] [PATCH] opensm: remove testability_mode option

[Sasha Khapyorsky]

Remove testability_mode option - it is not something suitable for main
stream.

Signed-off-by: Sasha Khapyorsky <sashak at voltaire.com>
---
 opensm/include/opensm/osm_subnet.h |   20 --------------------
 opensm/opensm/main.c               |    4 ----
 opensm/opensm/osm_state_mgr.c      |   10 ----------
 opensm/opensm/osm_subnet.c         |    1 -
 4 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/opensm/include/opensm/osm_subnet.h b/opensm/include/opensm/osm_subnet.h
index b67add3..cf52b49 100644
--- a/opensm/include/opensm/osm_subnet.h
+++ b/opensm/include/opensm/osm_subnet.h
@@ -156,22 +156,6 @@ typedef void
 *
 *********/
 
-/****d* OpenSM: Subnet/osm_testability_modes_t
-* NAME
-*	osm_testability_modes_t
-*
-* DESCRIPTION
-*	Enumerates the possible testability modes.
-*
-* SYNOPSIS
-*/
-typedef enum _osm_testability_modes {
-	OSM_TEST_MODE_NONE = 0,
-	OSM_TEST_MODE_EXIT_BEFORE_SEND_HANDOVER,
-	OSM_TEST_MODE_MAX
-} osm_testability_modes_t;
-/***********/
-
 /****s* OpenSM: Subnet/osm_qos_options_t
 * NAME
 *	osm_qos_options_t
@@ -270,7 +254,6 @@ typedef struct _osm_subn_opt {
 	osm_pfn_ui_mcast_extension_t pfn_ui_mcast_fdb_assign;
 	void *ui_mcast_fdb_assign_ctx;
 	boolean_t sweep_on_trap;
-	osm_testability_modes_t testability_mode;
 	char *routing_engine_name;
 	boolean_t connect_roots;
 	char *lid_matrix_dump_file;
@@ -440,9 +423,6 @@ typedef struct _osm_subn_opt {
 *	sweep_on_trap
 *		Received traps will initiate a new sweep.
 *
-*	testability_mode
-*		Object that indicates if we are running in a special testability mode.
-*
 *	routing_engine_name
 *		Name of used routing engine
 *		(other than default Min Hop Algorithm)
diff --git a/opensm/opensm/main.c b/opensm/opensm/main.c
index 4b99dd0..0bc9238 100644
--- a/opensm/opensm/main.c
+++ b/opensm/opensm/main.c
@@ -754,10 +754,6 @@ int main(int argc, char *argv[])
 			 */
 			else if (dbg_lvl == 5)
 				vendor_debug++;
-			else if (dbg_lvl >= 10)
-				/* Please look at osm_subnet.h for list
-				 * of testability modes. */
-				opt.testability_mode = dbg_lvl - 9;
 			else
 				printf(" OpenSM: Unknown debug option %d"
 				       " ignored\n", dbg_lvl);
diff --git a/opensm/opensm/osm_state_mgr.c b/opensm/opensm/osm_state_mgr.c
index 1ff8eb7..5c39f11 100644
--- a/opensm/opensm/osm_state_mgr.c
+++ b/opensm/opensm/osm_state_mgr.c
@@ -1175,16 +1175,6 @@ __osm_state_mgr_send_handover(IN osm_state_mgr_t * const p_mgr,
 
 	OSM_LOG_ENTER(p_mgr->p_log, __osm_state_mgr_send_handover);
 
-	if (p_mgr->p_subn->opt.testability_mode ==
-	    OSM_TEST_MODE_EXIT_BEFORE_SEND_HANDOVER) {
-		osm_log(p_mgr->p_log, OSM_LOG_ERROR,
-			"__osm_state_mgr_send_handover: ERR 3315: "
-			"Exit on testability mode OSM_TEST_MODE_EXIT_BEFORE_SEND_HANDOVER\n");
-		osm_exit_flag = TRUE;
-		sleep(3);
-		exit(1);
-	}
-
 	/*
 	 * Send a query of SubnSet(SMInfo) HANDOVER to the remote sm given.
 	 */
diff --git a/opensm/opensm/osm_subnet.c b/opensm/opensm/osm_subnet.c
index 5887819..17c166a 100644
--- a/opensm/opensm/osm_subnet.c
+++ b/opensm/opensm/osm_subnet.c
@@ -470,7 +470,6 @@ void osm_subn_set_default_opt(IN osm_subn_opt_t * const p_opt)
 	p_opt->pfn_ui_mcast_fdb_assign = NULL;
 	p_opt->ui_mcast_fdb_assign_ctx = NULL;
 	p_opt->sweep_on_trap = TRUE;
-	p_opt->testability_mode = OSM_TEST_MODE_NONE;
 	p_opt->routing_engine_name = NULL;
 	p_opt->connect_roots = FALSE;
 	p_opt->lid_matrix_dump_file = NULL;
-- 
1.5.3.4.206.g58ba4