FOGL-3168: python north plugin removed / c++ north plugin renamed

C/plugins/north/ocs_V2/CMakeLists.txt → C/plugins/north/ocs/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6.0)
 
-project(ocs_V2)
+project(ocs)
 
 set(CMAKE_CXX_FLAGS "-std=c++11 -O3")
 # Add here all needed FogLAMP libraries as list

C/plugins/north/ocs_V2/plugin.cpp → C/plugins/north/ocs/plugin.cpp

@@ -25,7 +25,7 @@
 using namespace std;
 using namespace rapidjson;
 
-#define PLUGIN_NAME "ocs_V2"
+#define PLUGIN_NAME "ocs"
 #define TYPE_ID_KEY "type-id"
 #define TYPE_ID_DEFAULT 1
 
@@ -136,7 +136,7 @@ extern "C" {
  */
 static PLUGIN_INFORMATION info = {
 	PLUGIN_NAME,		        // Name
-	"1.0.0",			// Version
+	"1.7.0",			// Version
 	SP_PERSIST_DATA,		// Flags
 	PLUGIN_TYPE_NORTH,		// Type
 	"1.0.0",			// Interface version
@@ -275,6 +275,9 @@ void plugin_start(const PLUGIN_HANDLE handle,
 	Logger* logger = Logger::getLogger();
 	CONNECTOR_INFO* connInfo = (CONNECTOR_INFO *)handle;
 
+        if (storedData.compare("{}") == 0)
+                return;
+
 	// Parse JSON plugin_data
 	Document JSONData;
 	JSONData.Parse(storedData.c_str());

C/plugins/north/PI_Server_V2/CMakeLists.txt → C/plugins/north/pi_server/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.6.0)
 
-project(PI_Server_V2)
+project(pi_server)
 
 set(CMAKE_CXX_FLAGS "-std=c++11 -O3")
 # Add here all needed FogLAMP libraries as list

C/plugins/north/PI_Server_V2/plugin.cpp → C/plugins/north/pi_server/plugin.cpp

@@ -34,7 +34,7 @@ using namespace std;
 using namespace rapidjson;
 using namespace SimpleWeb;
 
-#define PLUGIN_NAME "PI_Server_V2"
+#define PLUGIN_NAME "pi_server"
 #define TYPE_ID_KEY "type-id"
 #define SENT_TYPES_KEY "sentDataTypes"
 #define DATA_KEY "dataTypes"
@@ -258,7 +258,7 @@ extern "C" {
  */
 static PLUGIN_INFORMATION info = {
 	PLUGIN_NAME,		   // Name
-	"1.0.0",		   // Version
+	"1.7.0",		   // Version
 	SP_PERSIST_DATA,	   // Flags
 	PLUGIN_TYPE_NORTH,	   // Type
 	"1.0.0",		   // Interface version

CMakeLists.txt

@@ -22,6 +22,6 @@ add_subdirectory(C/services/filter-plugin-interfaces/python)
 add_subdirectory(C/services/filter-plugin-interfaces/python/filter_ingest_pymodule)
 add_subdirectory(C/tasks/north)
 add_subdirectory(C/plugins/utils)
-add_subdirectory(C/plugins/north/PI_Server_V2)
-add_subdirectory(C/plugins/north/ocs_V2)
+add_subdirectory(C/plugins/north/pi_server)
+add_subdirectory(C/plugins/north/ocs)