diff --git a/upper-constraints.txt b/upper-constraints.txt
index fa2a732566..e624f65ba8 100644
--- a/upper-constraints.txt
+++ b/upper-constraints.txt
@@ -2,6 +2,8 @@ APScheduler===3.3.1
 Babel===2.3.4
 CouchDB===1.1
 Django===1.8.17
+EditorConfig===0.12.1;python_version=='3.4'
+EditorConfig===0.12.1;python_version=='3.5'
 Flask===0.12
 Flask-RESTful===0.3.5
 GitPython===2.1.1
@@ -69,22 +71,31 @@ aniso8601===1.2.0
 anyjson===0.3.3
 aodhclient===0.8.0
 appdirs===1.4.0
+argh===0.26.2;python_version=='3.4'
+argh===0.26.2;python_version=='3.5'
 astroid===1.3.8
 autobahn===0.17.1
 automaton===1.7.0
+backports-abc===0.5;python_version=='3.4'
+backports-abc===0.5;python_version=='3.5'
 backports.ssl-match-hostname===3.5.0.1
 bandit===1.4.0
 bashate===0.5.1
 beautifulsoup4===4.5.3
 betamax===0.8.0
+blinker===1.4;python_version=='3.4'
+blinker===1.4;python_version=='3.5'
 blockdiag===1.5.3
 boto===2.45.0
-botocore===1.5.9
+botocore===1.5.10
 bottle===0.12.13
+brotlipy===0.6.0;python_version=='3.4'
+brotlipy===0.6.0;python_version=='3.5'
 cachetools===2.0.0
 cassandra-driver===3.7.1
 castellan===0.5.0
 ceilometermiddleware===1.0.0
+certifi===2017.1.23
 cffi===1.9.1
 chardet===2.3.0
 click===6.7
@@ -100,6 +111,8 @@ coverage===4.3.4
 crc16===0.1.1
 croniter===0.3.14
 cryptography===1.7.2
+cssutils===1.0.1;python_version=='3.4'
+cssutils===1.0.1;python_version=='3.5'
 cursive===0.1.1
 ddt===1.1.1
 debtcollector===1.11.0
@@ -151,21 +164,31 @@ glance-store===0.20.0
 gnocchiclient===3.0.0
 google-api-python-client===1.6.2
 graphviz===0.5.2
-greenlet===0.4.11
+greenlet===0.4.12
 gunicorn===19.6.0
+h2===2.5.2;python_version=='3.4'
+h2===2.5.2;python_version=='3.5'
 happybase===0.9;python_version=='2.7'
 heat-translator===0.7.0
 hiredis===0.2.0
-httplib2===0.9.2
+hpack===2.3.0;python_version=='3.4'
+hpack===2.3.0;python_version=='3.5'
+html2text===2016.9.19;python_version=='3.4'
+html2text===2016.9.19;python_version=='3.5'
+httplib2===0.10.3
+hyperframe===4.0.1;python_version=='3.4'
+hyperframe===4.0.1;python_version=='3.5'
 icalendar===3.11.2
 idna===2.2
 imagesize===0.7.1
 influxdb===4.0.0
-ipaddress===1.0.18;python_version=='2.7'
+ipaddress===1.0.18
 ironic-lib===2.5.2
 iso8601===0.1.11
 itsdangerous===0.24
 jmespath===0.9.1
+jsbeautifier===1.6.9;python_version=='3.4'
+jsbeautifier===1.6.9;python_version=='3.5'
 jsonmodels===2.1.5
 jsonpatch===1.15
 jsonpath-rw===1.4.0
@@ -183,7 +206,7 @@ kubernetes===1.0.0b1
 kuryr-lib===0.3.0
 ldap3===2.2.0
 ldappool===2.0.0
-libvirt-python===2.5.0
+libvirt-python===3.0.0
 linecache2===1.0.0
 logilab-common===1.3.0
 logutils===0.3.3
@@ -191,7 +214,8 @@ lxml===3.7.2
 marathon===0.8.10
 microversion-parse===0.1.4
 mistral===3.0.2
-mitmproxy===1.0.2;python_version>'3.0'
+mitmproxy===1.0.2;python_version=='3.4'
+mitmproxy===1.0.2;python_version=='3.5'
 mock===2.0.0
 monasca-common===1.4.0
 monasca-statsd===1.5.0
@@ -262,6 +286,8 @@ paramiko===2.1.1
 passlib===1.7.1
 pathlib===1.0.1;python_version=='2.7'
 pathlib2===2.2.1
+pathtools===0.1.2;python_version=='3.4'
+pathtools===0.1.2;python_version=='3.5'
 pbr===1.10.0
 pecan===1.2.1
 pexpect===4.2.1
@@ -285,6 +311,7 @@ pyasn1-modules===0.0.8
 pycadf===2.5.0
 pycparser===2.17
 pycrypto===2.6.1
+pycryptodome===3.4.5
 pydotplus===2.0.2
 pyeclib===1.4.0
 pyghmi===1.0.18
@@ -299,6 +326,8 @@ pymod2pkg===0.7.1
 pymongo===3.4.0
 pyngus===2.1.4
 pyparsing===2.1.10
+pyperclip===1.5.27;python_version=='3.4'
+pyperclip===1.5.27;python_version=='3.5'
 pypowervm===1.0.0.4
 pyroute2===0.4.12
 pysaml2===4.0.2
@@ -347,7 +376,7 @@ python-swiftclient===3.3.0
 python-tackerclient===0.9.0
 python-troveclient===2.8.0
 python-utils===2.0.1
-python-vitrageclient===1.1.0
+python-vitrageclient===1.1.1
 python-watcherclient===1.0.0
 python-zaqarclient===1.3.0
 pytz===2016.10
@@ -363,7 +392,7 @@ repoze.who===2.3
 requests===2.12.5
 requests-aws===0.1.8
 requests-kerberos===0.11.0
-requests-mock===1.2.0
+requests-mock===1.3.0
 requests-unixsocket===0.1.5
 requestsexceptions===1.1.3
 restructuredtext-lint===0.17.2
@@ -372,6 +401,8 @@ rfc3986===0.4.1
 rjsmin===1.0.12
 rsa===3.4.2
 rtslib-fb===2.1.62
+ruamel.yaml===0.13.14;python_version=='3.4'
+ruamel.yaml===0.13.14;python_version=='3.5'
 ryu===4.11
 scandir===1.4
 scikit-learn===0.18.1
@@ -387,6 +418,8 @@ six===1.10.0
 smmap===0.9.0
 smmap2===2.0.1
 snowballstemmer===1.2.1
+sortedcontainers===1.5.7;python_version=='3.4'
+sortedcontainers===1.5.7;python_version=='3.5'
 spec-cleaner===0.9.1
 sphinx-testing===0.7.1
 sphinxcontrib-blockdiag===1.5.5
@@ -417,6 +450,8 @@ testtools===2.2.0
 thrift===0.10.0;python_version=='2.7'
 tinyrpc===0.5
 tooz===1.48.0
+tornado===4.4.2;python_version=='3.4'
+tornado===4.4.2;python_version=='3.5'
 tosca-parser===0.7.0
 traceback2===1.4.0
 tripleo-common===5.7.0
@@ -429,11 +464,16 @@ unicodecsv===0.14.1;python_version=='2.7'
 unittest2===1.1.0
 uritemplate===3.0.0
 urllib3===1.20
+urwid===1.3.1;python_version=='3.4'
+urwid===1.3.1;python_version=='3.5'
+vine===1.1.3
 virtualenv===15.1.0
 vmware-nsxlib===0.7.1
 voluptuous===0.9.3
 waitress===1.0.2
 warlock===1.2.0
+watchdog===0.8.3;python_version=='3.4'
+watchdog===0.8.3;python_version=='3.5'
 wcwidth===0.1.7
 weakrefmethod===1.0.3;python_version=='2.7'
 webcolors===1.7