diff -r 1a27f000029f -r 56ac2df1785b components/python/novaclient/novaclient-PYVER.p5m
--- a/components/python/novaclient/novaclient-PYVER.p5m	Tue Jun 10 14:07:48 2014 -0700
+++ b/components/python/novaclient/novaclient-PYVER.p5m	Wed Jun 11 17:13:12 2014 -0700
@@ -17,7 +17,6 @@
 # information: Portions Copyright [yyyy] [name of copyright owner]
 #
 # CDDL HEADER END
-#
 
 #
 # Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved.
@@ -31,7 +30,7 @@
     value="A client for the OpenStack Compute API. There's a Python API (the 'novaclient' module) and a command-line script ('nova'). Each implements 100% of the OpenStack Compute API."
 set name=com.oracle.info.description \
     value="novaclient, the Python bindings to the OpenStack Compute API"
-set name=com.oracle.info.tpno value=16352
+set name=com.oracle.info.tpno value=17872
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python \
     value="org.opensolaris.category.2008:System/Administration and Configuration" \
@@ -53,7 +52,16 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/extension.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/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/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/py3kcompat/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/py3kcompat/urlutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/novaclient/openstack/common/strutils.py
@@ -80,8 +88,8 @@
 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/coverage_ext.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
@@ -109,8 +117,24 @@
 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/quota_classes.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/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
@@ -120,6 +144,14 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/python_novaclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 license novaclient.license license="Apache v2.0"
 
+# force a group dependency on the optional anyjson; pkgdepend work is needed to
+# flush this out.
+depend type=group fmri=library/python/anyjson-$(PYV)
+
+# force a group dependency on the optional simplejson; pkgdepend work is needed
+# to flush this out.
+depend type=group fmri=library/python/simplejson-$(PYV)
+
 # force a dependency on argparse; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/argparse-$(PYV)
 
@@ -147,3 +179,6 @@
 
 # force a dependency on six; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/six-$(PYV)
+
+# force a dependency on stevedore; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/stevedore-$(PYV)