Merge "Fixed the streams and the imports issues"

diff --git a/dcae-cli/ChangeLog.md b/dcae-cli/ChangeLog.md
index e5be3a6..707e9a8 100644 (file)
--- a/dcae-cli/ChangeLog.md
+++ b/dcae-cli/ChangeLog.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/) 
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2.11.3]
+
+* Fix Format class definition of "description" to match JSON schema
+
+## [2.11.2]
+
+* Upgrade to use docker 4.x.x from docker-py 1.x.x
+
 ## [2.11.1]
 
 * Change to policy reconfiguration functions to pass consul_host as a parameter

diff --git a/dcae-cli/dcae_cli/_version.py b/dcae-cli/dcae_cli/_version.py
index a0e51bf..5f3d51b 100644 (file)
--- a/dcae-cli/dcae_cli/_version.py
+++ b/dcae-cli/dcae_cli/_version.py
@@ -19,4 +19,4 @@
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 
 # -*- coding: utf-8 -*-
-__version__ = "2.11.1"
+__version__ = "2.11.3"

diff --git a/dcae-cli/dcae_cli/catalog/mock/tables.py b/dcae-cli/dcae_cli/catalog/mock/tables.py
index 8278190..0e10b79 100644 (file)
--- a/dcae-cli/dcae_cli/catalog/mock/tables.py
+++ b/dcae-cli/dcae_cli/catalog/mock/tables.py
@@ -118,7 +118,7 @@ class Format(Base):
 
     name = Column(String(), nullable=False)
     version = Column(String(), nullable=False)
-    description = Column(Text(), nullable=False)
+    description = Column(Text(), nullable=True)
     spec = Column(Text(), nullable=False)
 
     when_added = Column(DateTime, default=datetime_now, nullable=True)

diff --git a/dcae-cli/dcae_cli/util/docker_util.py b/dcae-cli/dcae_cli/util/docker_util.py
index 3e29f5c..90a6811 100644 (file)
--- a/dcae-cli/dcae_cli/util/docker_util.py
+++ b/dcae-cli/dcae_cli/util/docker_util.py
@@ -85,7 +85,7 @@ def get_docker_client(profile, logins=[]):
 
 def image_exists(image):
     '''Returns True if the image exists locally'''
-    client = docker.from_env(version="auto")
+    client = docker.APIClient(version="auto", **docker.utils.kwargs_from_env())
     return True if client.images(image) else False
 
 

diff --git a/dcae-cli/pom.xml b/dcae-cli/pom.xml
index e9a5a91..bfc1b6f 100644 (file)
--- a/dcae-cli/pom.xml
+++ b/dcae-cli/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.platform.cli</groupId>
   <artifactId>dcae-cli</artifactId>
   <name>dcaegen2-platform-cli-dcae-cli</name>
-  <version>2.11.1</version>
+  <version>2.11.3</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>

diff --git a/dcae-cli/requirements.txt b/dcae-cli/requirements.txt
deleted file mode 100644 (file)
index 4ca45e2..0000000
--- a/dcae-cli/requirements.txt
+++ /dev/null
@@ -1,21 +0,0 @@
-certifi==2018.4.16
-chardet==3.0.4
-click==6.7
-docker-py==1.10.6
-docker-pycreds==0.3.0
-genson==1.0.1
-idna==2.7
-jsonschema==2.6.0
--e git+ssh://researchmike@gerrit.onap.org:29418/dcaegen2/platform/cli@4f039724360fbf13a8295c2074180fa5c9c0320b#egg=onap_dcae_cli&subdirectory=dcae-cli
-onap-dcae-discovery-client==2.1.0
-onap-dcae-dockering==1.4.0
-psycopg2==2.7.5
-psycopg2-binary==2.7.5
-python-consul==0.7.2
-requests==2.19.1
-six==1.11.0
-SQLAlchemy==1.2.10
-SQLAlchemy-Utils==0.33.3
-terminaltables==3.1.0
-urllib3==1.23
-websocket-client==0.48.0

diff --git a/dcae-cli/setup.py b/dcae-cli/setup.py
index 7211700..b0c3899 100644 (file)
--- a/dcae-cli/setup.py
+++ b/dcae-cli/setup.py
@@ -53,7 +53,7 @@ setup(
                       'psycopg2-binary==2.7.5',
                       'genson',
                       'onap-dcae-discovery-client>=2.0.0',
-                      'onap-dcae-dockering>=1.0.0,<2.0.0'
+                      'onap-dcae-dockering>=1.4.1,<2.0.0'
                       ],
     tests_require=['pytest',
                    'mock'],

diff --git a/dcae-cli/tox.ini b/dcae-cli/tox.ini
index 5c62fe9..87ea7c9 100644 (file)
--- a/dcae-cli/tox.ini
+++ b/dcae-cli/tox.ini
@@ -1,6 +1,6 @@
 # content of: tox.ini , put in same dir as setup.py
 [tox]
-envlist = py27,py35
+envlist = py27,py36
 
 [testenv]
 deps=