Merge branch 'master' of https://github.com/Azure/sonic-sairedis into rel_6_0

kram · kram · commit c48a7a20de2f · 2017-11-03T13:06:39.000-07:00
diff --git a/syncd/scripts/syncd_init_common.sh b/syncd/scripts/syncd_init_common.sh
@@ -92,8 +92,6 @@ config_syncd_cavium()
     until [ $(redis-cli ping | grep -c PONG) -gt 0 ]; do
         sleep 1
     done
-
-    redis-cli FLUSHALL
 }
 
 config_syncd_marvell()
diff --git a/vslib/src/sai_vs_hostintf.cpp b/vslib/src/sai_vs_hostintf.cpp
@@ -314,7 +314,11 @@ sai_status_t vs_create_hostif_int(
 
     if (g_vs_hostif_use_tap_device == false)
     {
-        return SAI_STATUS_SUCCESS;
+        return vs_generic_create(object_type,
+                hostif_id,
+                switch_id,
+                attr_count,
+                attr_list);
     }
 
     // validate SAI_HOSTIF_ATTR_TYPE

Original file line number	Diff line number	Diff line change
`@@ -92,8 +92,6 @@ config_syncd_cavium()`
`92`	`92`	`until [ $(redis-cli ping \| grep -c PONG) -gt 0 ]; do`
`93`	`93`	`sleep 1`
`94`	`94`	`done`
`95`		`-`
`96`		`- redis-cli FLUSHALL`
`97`	`95`	`}`
`98`	`96`
`99`	`97`	`config_syncd_marvell()`
Original file line number	Diff line number	Diff line change
`@@ -314,7 +314,11 @@ sai_status_t vs_create_hostif_int(`
`314`	`314`
`315`	`315`	`if (g_vs_hostif_use_tap_device == false)`
`316`	`316`	`{`
`317`		`- return SAI_STATUS_SUCCESS;`
	`317`	`+ return vs_generic_create(object_type,`
	`318`	`+ hostif_id,`
	`319`	`+ switch_id,`
	`320`	`+ attr_count,`
	`321`	`+ attr_list);`
`318`	`322`	`}`
`319`	`323`
`320`	`324`	`// validate SAI_HOSTIF_ATTR_TYPE`