[6683] Removing unnecessary files and update gitignore
VOL-507, VOL-463: Protobuf upgrade to 3.3 and Chameleon Removal
Update the Protobuf version from 3.1 to 3.3 to alleviate
a protobuf issue when loading protobuf extensions. The following
tests have been performed:
- Create a local Vagrant VM
- Voltha ensemble startup and check for errors/exceptions
- Manual compilations of the protos in voltha, ofagent, netconf and
chameleon directory
- Manual tests with ONOS/Voltha/Ponsim using Netconf, Curl and CLI
- Run the integration tests (known issues have Jiras already raised
against them.
- Run the make jenkins-test and make utest-with-coverage
Chameleon has been removed entirely from Voltha projects. Basic tests
have run to verify chameleon dependency has been removed. Some
documents (like README) will need to be changed under a separate Jiras
as they are referenced in different adapters. Some integration tests
will also need to be updated as well.
Change-Id: I2b266719a6825fb07ece3a79f7f81881ab3b9761
diff --git a/Makefile b/Makefile
index dc06a23..2f98ccf 100644
--- a/Makefile
+++ b/Makefile
@@ -22,7 +22,7 @@
VENVDIR := venv-$(shell uname -s | tr '[:upper:]' '[:lower:]')
-.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha chameleon ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd tools opennms logstash unum
+.PHONY: $(DIRS) $(DIRS_CLEAN) $(DIRS_FLAKE8) flake8 docker-base voltha ofagent podder netconf shovel onos dashd vcli portainer grafana nginx consul registrator envoy golang envoyd tools opennms logstash unum
# This should to be the first and default target in this Makefile
help:
@@ -45,7 +45,6 @@
@echo "containers : Build all the docker containers"
@echo "docker-base : Build the base docker container used by all other dockers"
@echo "voltha : Build the voltha docker container"
- @echo "chameleon : Build the chameleon docker container"
@echo "ofagent : Build the ofagent docker container"
@echo "podder : Build the podder docker container"
@echo "netconf : Build the netconf docker container"
@@ -98,11 +97,11 @@
jenkins : protos jenkins-containers
-jenkins-containers: docker-base voltha chameleon ofagent netconf consul registrator unum
+jenkins-containers: docker-base voltha ofagent netconf consul registrator unum
-prod-containers: docker-base voltha chameleon ofagent netconf shovel dashd vcli grafana consul tools golang envoyd envoy fluentd unum
+prod-containers: docker-base voltha ofagent netconf shovel dashd vcli grafana consul tools golang envoyd envoy fluentd unum
-containers: docker-base voltha chameleon ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy fluentd unum
+containers: docker-base voltha ofagent podder netconf shovel onos tester config-push dashd vcli portainer grafana nginx consul registrator tools golang envoyd envoy fluentd unum
docker-base:
docker build -t cord/voltha-base -f docker/Dockerfile.base .
@@ -113,12 +112,6 @@
voltha-adapters:
make -C voltha/adapters/asfvolt16_olt
-chameleon:
- mkdir tmp.chameleon
- cp -R chameleon/* tmp.chameleon
- docker build -t cord/chameleon -f docker/Dockerfile.chameleon .
- rm -rf tmp.chameleon
-
ofagent:
docker build -t cord/ofagent -f docker/Dockerfile.ofagent .
@@ -191,7 +184,6 @@
protos:
make -C voltha/protos
- make -C chameleon/protos
make -C ofagent/protos
make -C netconf/protos
@@ -262,7 +254,7 @@
@ echo "Executing all unit tests and producing coverage results"
. ${VENVDIR}/bin/activate && \
for d in $$(find ./tests/utests -type d|sort -nr); do echo $$d:; \
- nosetests --with-xcoverage --with-xunit --cover-package=voltha,common,ofagent,chameleon $$d; done
+ nosetests --with-xcoverage --with-xunit --cover-package=voltha,common,ofagent $$d; done
itest: venv run-as-root-tests
@ echo "Executing all integration tests"