Updated from global requirements

Change-Id: I88e8ae8fca4e0ddb6eb7c2e2ffab8fdfaa827b37

requirements.txt

@@ -1,15 +1,15 @@
 # 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
 
-enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3'
-eventlet>=0.17.4
-httplib2>=0.7.5
-netaddr!=0.7.16,>=0.7.12
+enum34;python_version=='2.7' or python_version=='2.6' or python_version=='3.3' # BSD
+eventlet>=0.17.4 # MIT
+httplib2>=0.7.5 # MIT
+netaddr!=0.7.16,>=0.7.12 # BSD
 retrying!=1.3.0,>=1.2.3 # Apache-2.0
-SQLAlchemy<1.1.0,>=1.0.10
-six>=1.9.0
+SQLAlchemy<1.1.0,>=1.0.10 # 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
@@ -20,5 +20,5 @@ 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.vmware>=1.16.0 # Apache-2.0
-PrettyTable<0.8,>=0.7
+PrettyTable<0.8,>=0.7 # BSD
 tooz>=1.28.0 # Apache-2.0

test-requirements.txt

@@ -4,18 +4,18 @@
 
 hacking<0.10,>=0.9.2
 
-coverage>=3.6
-discover
-fixtures>=1.3.1
-mock>=1.2
-python-subunit>=0.0.18
-sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+coverage>=3.6 # Apache-2.0
+discover # BSD
+fixtures>=1.3.1 # Apache-2.0/BSD
+mock>=1.2 # BSD
+python-subunit>=0.0.18 # Apache-2.0/BSD
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 # BSD
 oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0
 oslotest>=1.10.0 # Apache-2.0
-testrepository>=0.0.18
-testtools>=1.4.0
-testscenarios>=0.4
-WebTest>=2.0
+testrepository>=0.0.18 # Apache-2.0/BSD
+testtools>=1.4.0 # MIT
+testscenarios>=0.4 # Apache-2.0/BSD
+WebTest>=2.0 # MIT
 # This is needed for subunit-trace
-tempest-lib>=0.13.0
+tempest-lib>=0.13.0 # Apache-2.0
 reno>=0.1.1 # Apache2