diff options
| author |   Ethan Lynn <ethanlynnl@vmware.com> | 2019-02-12 13:29:04 +0800 |
|---|---|---|
| committer | Ethan Lynn <ethanlynnl@vmware.com> | 2019-02-12 14:09:51 +0800 |
| commit | 4023da169cdfa91674b06d6dcbc9d703480b8d8b (patch) | |
| tree | 627756521e83902c272d64fb5a595afe4b33816e | |
| parent | 014d38cd2e2431b08e53c1ea8dbc1d82f59257d3 (diff) | |
Fix vio vesagent docker version
This patch fix vio vesagent docker image build.
Change-Id: I815bcbecc116854a158854a3c105087563626ea7
Issue-ID: MULTICLOUD-482
Signed-off-by: Ethan Lynn <ethanlynnl@vmware.com>
| -rwxr-xr-x | vesagent/docker/docker-build.sh | 2 | ||||
| -rw-r--r-- | vio/requirements.txt | 2 | ||||
| -rw-r--r-- | vio/vio/swagger/views/fakeplugin/fakeData/fakeResponse.py | 4 | ||||
| -rw-r--r-- | vio/vio/swagger/views/image/views.py | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/vesagent/docker/docker-build.sh b/vesagent/docker/docker-build.sh index d696e66..8eb2346 100755 --- a/vesagent/docker/docker-build.sh +++ b/vesagent/docker/docker-build.sh @@ -64,7 +64,7 @@ DOCKER_REPOSITORY="nexus3.onap.org:10003" ORG="onap" PROJECT="multicloud" IMAGE="vio-vesagent" -VERSION="${VERSION//[^0-9.]/}" +# VERSION="${VERSION//[^0-9.]/}" IMAGE_NAME="${DOCKER_REPOSITORY}/${ORG}/${PROJECT}/${IMAGE}" if [ $HTTP_PROXY ]; then diff --git a/vio/requirements.txt b/vio/requirements.txt index 0cb1b52..c972b0c 100644 --- a/vio/requirements.txt +++ b/vio/requirements.txt @@ -24,7 +24,7 @@ mock==2.0.0 unittest_xml_reporting==1.12.0 # for onap logging -onappylog>=1.0.6 +onappylog==1.0.6 # for event oslo_messaging diff --git a/vio/vio/swagger/views/fakeplugin/fakeData/fakeResponse.py b/vio/vio/swagger/views/fakeplugin/fakeData/fakeResponse.py index 80fd637..ba431d8 100644 --- a/vio/vio/swagger/views/fakeplugin/fakeData/fakeResponse.py +++ b/vio/vio/swagger/views/fakeplugin/fakeData/fakeResponse.py @@ -381,7 +381,7 @@ def keystone_token(teanatid=None): def keystone_tokenV2(): - data = \ + data = \ { "access": { "token": { @@ -664,7 +664,7 @@ def keystone_tokenV2(): } } - return data + return data def list_projects(token=None): diff --git a/vio/vio/swagger/views/image/views.py b/vio/vio/swagger/views/image/views.py index 09f68eb..34e3ffa 100644 --- a/vio/vio/swagger/views/image/views.py +++ b/vio/vio/swagger/views/image/views.py @@ -261,7 +261,7 @@ class GetImageFileView(APIView): image_data = image_instance.download_vim_image(image) imagePath = req_body.get('imagePath') - if imagePath[-1:] is not '/': + if imagePath[-1:] != '/': imagePath += '/' file_name = "%s%s.%s" % (imagePath, image.name, image.disk_format) image_file = open(file_name, 'w+') |