[build] Remove o2-aliecs-odc-shim, the legacy ODC client implementation

Author: teo

Makefile

@@ -43,20 +43,19 @@ DD_PROTO="https://raw.githubusercontent.com/AliceO2Group/DataDistribution/master
 VERBOSE_1 := -v
 VERBOSE_2 := -v -x
 
-WHAT := o2-aliecs-core o2-aliecs-executor coconut peanut o2-aliecs-odc-shim walnut o2-apricot
+WHAT := o2-aliecs-core o2-aliecs-executor coconut peanut walnut o2-apricot
 WHAT_o2-aliecs-core_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 WHAT_o2-aliecs-executor_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 WHAT_coconut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 WHAT_peanut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
-WHAT_o2-aliecs-odc-shim_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 WHAT_walnut_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 WHAT_o2-apricot_BUILD_FLAGS=$(BUILD_ENV_FLAGS)
 
 INSTALL_WHAT:=$(patsubst %, install_%, $(WHAT))
 
 
-GENERATE_DIRS := ./apricot ./coconut/cmd ./common/runtype ./common/system ./core ./core/integration/dcs ./core/integration/ddsched ./core/integration/odc ./executor ./odcshim ./walnut
-SRC_DIRS := ./apricot ./cmd/* ./core ./coconut ./executor ./common ./configuration ./occ/peanut ./odcshim ./walnut
+GENERATE_DIRS := ./apricot ./coconut/cmd ./common/runtype ./common/system ./core ./core/integration/dcs ./core/integration/ddsched ./core/integration/odc ./executor ./walnut
+SRC_DIRS := ./apricot ./cmd/* ./core ./coconut ./executor ./common ./configuration ./occ/peanut ./walnut
 
 # Use linker flags to provide version/build settings to the target
 PROD :=-X=$(REPOPATH)/common/product
@@ -131,8 +130,6 @@ vendor:
 	@echo -e "\033[1;33mcurl odc.proto\033[0m"
 	@mkdir -p core/integration/odc/protos
 	@curl -s -L $(ODC_PROTO) -o core/integration/odc/protos/odc.proto
-	@mkdir -p odcshim/odcprotos
-	@curl -s -L $(ODC_PROTO) -o odcshim/odcprotos/odc.proto
 
 	@echo -e "\033[1;33mcurl ddsched.proto\033[0m"
 	@mkdir -p core/integration/ddsched/protos
@@ -145,7 +142,6 @@ vendor:
 # after we download it.
 	@echo -e "\033[1;33mpatch odc.proto\033[0m"
 	@perl -pi -e '$$_.="option go_package = \"protos;odc\";\n" if (/^package/)' core/integration/odc/protos/odc.proto
-	@perl -pi -e '$$_.="option go_package = \"odcprotos;odc\";\n" if (/^package/)' odcshim/odcprotos/odc.proto
 
 # vendor: tools/dep
 #	@echo -e "\033[1;33mdep ensure\033[0m"

cmd/o2-aliecs-odc-shim/main.go

@@ -13,7 +13,6 @@ AliECS consists of:
 * process control plugin + library (OCC) - C++, runs throughout the cluster linked by user processes
 * peanut - Go, local debugging tool
 * walnut - Go, local workflow conversion tool
-* o2-aliecs-odc-shim - Go, runs on the cluster as an intermediary between AliECS and the EPN cluster
 
 ## Building with aliBuild
 
@@ -30,7 +29,7 @@ For development purposes, due to the significant differences in building and dep
 $ aliBuild init --defaults o2-dataflow Control-OCCPlugin
 $ aliBuild build --defaults o2-dataflow Control-OCCPlugin
 
-# Includes core, executor and o2-aliecs-odc-shim in default build, can be used to build coconut, peanut and walnut locally
+# Includes core and executor in default build, can be used to build coconut, peanut and walnut locally
 $ aliBuild init --defaults o2-dataflow Control-Core
 $ aliBuild build --defaults o2-dataflow Control-Core
 ```

docs/building.md

@@ -15,7 +15,6 @@ AliECS in a distributed application, using Apache Mesos as toolkit. It integrate
 | configuration | A Consul data store, running on the head node on port 8500. Used for AliECS configuration as well as application-specific component configuration. |
 | Mesos master | Main service of the Mesos resource management system, running on the head node on port 5050. |
 | Mesos agent  | Agent service of the Mesos RMS, running on every FLP. |
-| O²/EPN cluster control | Instance of Online Device Control (ODC) running on the O²/EPN cluster. Used for workflows that include `o2-aliecs-odc-shim` as controlled task. |
 | AliECS GUI  | Instance of the user-facing web interface for AliECS (`cog`), running on the head node. This is the main entry point for regular users. |
 | AliECS CLI  | The `coconut` command, provided by the package with the same name. This is the reference client for advanced users and developers. |