Updated from global requirements

Change-Id: Ia4001c53f4c2c3d1076fa7533dfd095245ef8082

requirements.txt

@@ -1,29 +1,29 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=1.6
+pbr>=1.6 # Apache-2.0
 
-Paste
-PasteDeploy>=1.5.0
-Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7'
-Routes!=2.0,>=1.12.3;python_version!='2.7'
+Paste # MIT
+PasteDeploy>=1.5.0 # MIT
+Routes!=2.0,!=2.1,>=1.12.3;python_version=='2.7' # MIT
+Routes!=2.0,>=1.12.3;python_version!='2.7' # MIT
 debtcollector>=0.3.0 # Apache-2.0
-eventlet>=0.17.4
-pecan>=1.0.0
-greenlet>=0.3.2
-httplib2>=0.7.5
-requests!=2.9.0,>=2.8.1
+eventlet>=0.17.4 # MIT
+pecan>=1.0.0 # BSD
+greenlet>=0.3.2 # MIT
+httplib2>=0.7.5 # MIT
+requests!=2.9.0,>=2.8.1 # Apache-2.0
 Jinja2>=2.8 # BSD License (3 clause)
-keystonemiddleware>=4.0.0
-netaddr!=0.7.16,>=0.7.12
-python-neutronclient>=2.6.0
+keystonemiddleware>=4.0.0 # Apache-2.0
+netaddr!=0.7.16,>=0.7.12 # BSD
+python-neutronclient>=2.6.0 # Apache-2.0
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
 ryu!=3.29,>=3.23.2 # Apache-2.0
-SQLAlchemy<1.1.0,>=1.0.10
-WebOb>=1.2.3
-keystoneauth1>=2.1.0
-alembic>=0.8.0
-six>=1.9.0
+SQLAlchemy<1.1.0,>=1.0.10 # MIT
+WebOb>=1.2.3 # MIT
+keystoneauth1>=2.1.0 # Apache-2.0
+alembic>=0.8.0 # MIT
+six>=1.9.0 # MIT
 stevedore>=1.5.0 # Apache-2.0
 oslo.concurrency>=2.3.0 # Apache-2.0
 oslo.config>=3.2.0 # Apache-2.0
@@ -39,7 +39,7 @@ oslo.rootwrap>=2.0.0 # Apache-2.0
 oslo.serialization>=1.10.0 # Apache-2.0
 oslo.service>=1.0.0 # Apache-2.0
 oslo.utils>=3.2.0 # Apache-2.0
-oslo.versionedobjects>=0.13.0
-ovs>=2.4.0;python_version=='2.7'        # Apache-2.0
+oslo.versionedobjects>=0.13.0 # Apache-2.0
+ovs>=2.4.0;python_version=='2.7' # Apache-2.0
 
-python-novaclient!=2.33.0,>=2.29.0
+python-novaclient!=2.33.0,>=2.29.0 # Apache-2.0

test-requirements.txt

@@ -4,22 +4,22 @@
 hacking<0.11,>=0.10.0
 
 cliff>=1.15.0 # Apache-2.0
-coverage>=3.6
-fixtures>=1.3.1
-mock>=1.2
-python-subunit>=0.0.18
+coverage>=3.6 # Apache-2.0
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
 requests-mock>=0.7.0 # Apache-2.0
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-testresources>=0.2.4
-testscenarios>=0.4
-WebTest>=2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+testresources>=0.2.4 # Apache-2.0/BSD
+testscenarios>=0.4 # Apache-2.0/BSD
+WebTest>=2.0 # MIT
 oslotest>=1.10.0 # Apache-2.0
-os-testr>=0.4.1
-tempest-lib>=0.13.0
-ddt>=1.0.1
+os-testr>=0.4.1 # Apache-2.0
+tempest-lib>=0.13.0 # Apache-2.0
+ddt>=1.0.1 # MIT
 pylint==1.4.5 # GNU GPL v2
 reno>=0.1.1 # Apache2
 # Needed to run DB commands in virtualenvs