--- a/components/python/novaclient/novaclient-PYVER.p5m	Fri Feb 05 11:09:10 2016 -0800
+++ b/components/python/novaclient/novaclient-PYVER.p5m	Fri Feb 05 17:54:17 2016 -0500
@@ -17,6 +17,7 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
+#
 
 #
 # Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved.
@@ -58,97 +59,79 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/crypto.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/_i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/auth.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/exceptions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/fake_client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/apiclient/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/cliutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/gettextutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/jsonutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/strutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/timeutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/uuidutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/service_catalog.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/utils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/agents.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/aggregates.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/availability_zones.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/certs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/cloudpipe.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/assisted_volume_snapshots.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/baremetal.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/cells.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/deferred_delete.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/host_evacuate.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/host_servers_migrate.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/instance_action.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/list_extensions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/metadata_extensions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/migrations.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/server_external_events.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/contrib/tenant_networks.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/fixed_ips.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/flavor_access.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/flavors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ip_dns.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ip_pools.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ips.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/floating_ips_bulk.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/fping.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/hosts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/hypervisors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/images.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/keypairs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/limits.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/networks.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/quota_classes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/quotas.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/security_group_default_rules.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/security_group_rules.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/security_groups.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/server_groups.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/servers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/services.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/shell.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/usage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/versions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/virtual_interfaces.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volume_snapshots.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volume_types.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v1_1/volumes.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/agents.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/aggregates.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/availability_zones.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/certs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/client.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/flavor_access.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/flavors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/hosts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/hypervisors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/images.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/keypairs.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/list_extensions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/quotas.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/servers.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/services.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/shell.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/usage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v3/volumes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/agents.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/aggregates.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/availability_zones.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/certs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/cloudpipe.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/assisted_volume_snapshots.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/baremetal.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/cells.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/deferred_delete.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/host_evacuate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/host_evacuate_live.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/host_servers_migrate.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/instance_action.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/list_extensions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/metadata_extensions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/migrations.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/server_external_events.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/contrib/tenant_networks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/fixed_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/flavor_access.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/flavors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/floating_ip_dns.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/floating_ip_pools.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/floating_ips.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/floating_ips_bulk.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/fping.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/hypervisors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/images.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/keypairs.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/networks.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/quota_classes.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/quotas.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/security_group_default_rules.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/security_group_rules.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/security_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/server_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/servers.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/services.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/usage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/versions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/virtual_interfaces.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/volume_snapshots.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/volume_types.py
+file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/v2/volumes.py
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/entry_points.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 #