Various clean up items
- Clean up after xos-migrate tests
- Remove legacy dockerfiles
- Install xos-genx from local copy in Dockerfile.client, as otherwise it
pulls an older version from pypi as xos-api requires it.
Change-Id: Id613d269c2825e06a83cb50eef7c98125b9cff7a
diff --git a/.gitignore b/.gitignore
index 20ecd3e..f5310c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,10 +28,6 @@
*.retry
# tmp files
-containers/chameleon/tmp.chameleon/
-containers/xos/local_certs.crt
-containers/xos/tmp.chameleon/
-containers/xos/BUILD/
venv-xos*
_book/
.noseids
@@ -44,6 +40,7 @@
*coverage.xml
cover
.tox
+lib/xos-migrate/xosmigrate/django.log
# python module build files
*.egg-info
diff --git a/Dockerfile.client b/Dockerfile.client
index 6d60f3e..fb649a2 100644
--- a/Dockerfile.client
+++ b/Dockerfile.client
@@ -23,6 +23,7 @@
# Install python using pip so their dependencies are installed
RUN pip install -e /opt/xos/lib/xos-util \
&& pip install -e /opt/xos/lib/xos-config \
+ && pip install -e /opt/xos/lib/xos-genx \
&& pip install -e /opt/xos/lib/xos-api \
&& pip freeze > /var/xos/pip_freeze_xos-client_`date -u +%Y%m%dT%H%M%S`
diff --git a/Makefile b/Makefile
index 08299be..353494f 100644
--- a/Makefile
+++ b/Makefile
@@ -115,6 +115,7 @@
lib/*/coverage.xml \
lib/*/*results.xml \
lib/*/*/VERSION \
+ lib/xos-migrate/xosmigrate/django.log \
lib/xos-genx/xos-genx-tests/out/* \
lib/xos-util/tests/test_version.py
diff --git a/containers/chameleon/Dockerfile.chameleon b/containers/chameleon/Dockerfile.chameleon
deleted file mode 100644
index 0d1a050..0000000
--- a/containers/chameleon/Dockerfile.chameleon
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# xosproject/chameleon
-FROM xosproject/xos-base:3.2.2
-
-# xos-base already has protoc and dependencies installed
-
-# Bundle app source
-RUN mkdir /chameleon && touch /chameleon/__init__.py
-ENV PYTHONPATH=/chameleon
-COPY tmp.chameleon /chameleon/chameleon
-
-# Build the protos
-RUN pip install \
- Jinja2==2.10 \
- PyYAML==5.1 \
- docker==3.7.0 \
- fluent-logger==0.9.3 \
- grpcio-tools==1.12.0 \
- grpcio==1.12.0 \
- klein==17.10.0 \
- netifaces==0.10.9 \
- pyOpenSSL==19.0.0 \
- python-consul==1.1.0 \
- service_identity==18.1.0 \
- simplejson==3.16.0 \
- && chdir chameleon/chameleon/protos \
- && VOLTHA_BASE=anything make
-
-# Label image
-ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=chameleon
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-ARG org_opencord_component_chameleon_version=unknown
-ARG org_opencord_component_chameleon_vcs_url=unknown
-ARG org_opencord_component_chameleon_vcs_ref=unknown
-
-LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
- org.label-schema.name=$org_label_schema_name \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
- org.opencord.component.chameleon.version=$org_opencord_component_chameleon_version \
- org.opencord.component.chameleon.vcs-url=$org_opencord_component_chameleon_vcs_url \
- org.opencord.component.chameleon.vcs-ref=$org_opencord_component_chameleon_vcs_ref
-
-# Exposing process and default entry point
-CMD ["python", "/chameleon/chameleon/main.py"]
diff --git a/containers/xos/Dockerfile.client b/containers/xos/Dockerfile.client
deleted file mode 100644
index 4b3b932..0000000
--- a/containers/xos/Dockerfile.client
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# xosproject/xos-client
-FROM xosproject/xos-libraries:3.2.2
-
-# Label image
-ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=xos-client
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-ARG org_opencord_component_chameleon_version=unknown
-ARG org_opencord_component_chameleon_vcs_url=unknown
-ARG org_opencord_component_chameleon_vcs_ref=unknown
-
-LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
- org.label-schema.name=$org_label_schema_name \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
- org.opencord.component.chameleon.version=$org_opencord_component_chameleon_version \
- org.opencord.component.chameleon.vcs-url=$org_opencord_component_chameleon_vcs_url \
- org.opencord.component.chameleon.vcs-ref=$org_opencord_component_chameleon_vcs_ref
-
-CMD ["xossh"]
diff --git a/containers/xos/Dockerfile.synchronizer-base b/containers/xos/Dockerfile.synchronizer-base
deleted file mode 100644
index 49b4b54..0000000
--- a/containers/xos/Dockerfile.synchronizer-base
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2017-present Open Networking Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# xosproject/xos-synchronizer-base
-FROM xosproject/xos-client:3.2.2
-
-RUN mkdir -p /opt/xos/synchronizers
-
-# Copy over ansible hosts
-COPY containers/xos/ansible-hosts /etc/ansible/hosts
-
-# Label image
-ARG org_label_schema_schema_version=1.0
-ARG org_label_schema_name=xos-synchronizer-base
-ARG org_label_schema_version=unknown
-ARG org_label_schema_vcs_url=unknown
-ARG org_label_schema_vcs_ref=unknown
-ARG org_label_schema_build_date=unknown
-ARG org_opencord_vcs_commit_date=unknown
-ARG org_opencord_component_chameleon_version=unknown
-ARG org_opencord_component_chameleon_vcs_url=unknown
-ARG org_opencord_component_chameleon_vcs_ref=unknown
-
-LABEL org.label-schema.schema-version=$org_label_schema_schema_version \
- org.label-schema.name=$org_label_schema_name \
- org.label-schema.version=$org_label_schema_version \
- org.label-schema.vcs-url=$org_label_schema_vcs_url \
- org.label-schema.vcs-ref=$org_label_schema_vcs_ref \
- org.label-schema.build-date=$org_label_schema_build_date \
- org.opencord.vcs-commit-date=$org_opencord_vcs_commit_date \
- org.opencord.component.chameleon.version=$org_opencord_component_chameleon_version \
- org.opencord.component.chameleon.vcs-url=$org_opencord_component_chameleon_vcs_url \
- org.opencord.component.chameleon.vcs-ref=$org_opencord_component_chameleon_vcs_ref