diff -r 4be1f488dda8 -r db0cec748ec0 components/python/troveclient/troveclient-PYVER.p5m
--- a/components/python/troveclient/troveclient-PYVER.p5m	Tue Apr 07 15:49:29 2015 -0700
+++ b/components/python/troveclient/troveclient-PYVER.p5m	Tue Apr 07 13:31:20 2015 -0700
@@ -26,7 +26,7 @@
 set name=pkg.fmri \
     value=pkg:/library/python/troveclient-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
 set name=pkg.summary \
-    value="Python and command-line clients for the OpenStack Trove API"
+    value="Python and command-line clients for the OpenStack DBaaS API"
 set name=pkg.description \
     value="A client for the OpenStack DBaaS API. There's a Python API (the 'troveclient' module), and a command-line script ('trove'). Each implements 100% of the OpenStack DBaaS API."
 set name=com.oracle.info.description \
@@ -41,12 +41,10 @@
 set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
 set name=org.opensolaris.arc-caseid value=PSARC/2014/165
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-link path=usr/bin/trove-cli target=trove-cli-$(PYVER) mediator=python \
+#
+link path=usr/bin/trove target=trove-$(PYVER) mediator=python \
     mediator-version=$(PYVER)
-file path=usr/bin/trove-cli-$(PYVER)
-link path=usr/bin/trove-mgmt-cli target=trove-mgmt-cli-$(PYVER) \
-    mediator=python mediator-version=$(PYVER)
-file path=usr/bin/trove-mgmt-cli-$(PYVER)
+file path=usr/bin/trove-$(PYVER)
 file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
@@ -55,41 +53,96 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/python_troveclient-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/accounts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/auth.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/backups.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/base.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/cli.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/client.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/common.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/databases.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/diagnostics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/cli.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/common.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/mcli.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/utils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/compat/versions.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/exceptions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/flavors.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/hosts.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/instances.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/limits.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/management.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/mcli.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/quota.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/root.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/security_groups.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/storage.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/users.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/extension.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/auth.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/base.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/exceptions.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/apiclient/fake_client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/gettextutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/importutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/openstack/common/strutils.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/service_catalog.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/shell.py
 file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/utils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/versions.py
-file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/xml.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/accounts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/backups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/client.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/clusters.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/configurations.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/databases.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/datastores.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/diagnostics.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/flavors.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/hosts.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/instances.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/limits.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/management.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/metadata.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/quota.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/root.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/security_groups.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/shell.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/storage.py
+file path=usr/lib/python$(PYVER)/vendor-packages/troveclient/v1/users.py
+#
 license LICENSE license="Apache v2.0"
 
-# force a group dependency on simplejson; pkgdepend work is needed
-# to flush this out.
-depend type=group fmri=library/python/simplejson-$(PYV)
+# force a group dependency on eventlet; pkgdepend work is needed to flush this
+# out.
+depend type=group fmri=library/python/eventlet-$(PYV)
+
+# force a dependency on argparse; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/argparse-$(PYV)
+
+# force a dependency on babel; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/babel-$(PYV)
 
 # force a dependency on httplib2; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/httplib2-$(PYV)
 
-# force a dependency on lxml; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/lxml-$(PYV)
+# force a dependency on keystoneclient; pkgdepend work is needed to flush this
+# out.
+depend type=require fmri=library/python/keystoneclient-$(PYV)
+
+# force a dependency on pbr; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/pbr-$(PYV)
+
+# force a dependency on prettytable; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/prettytable-$(PYV)
+
+# force a dependency on requests; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/requests-$(PYV)
+
+# force a dependency on setuptools; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/setuptools-$(PYV)
+
+# force a dependency on simplejson; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/simplejson-$(PYV)
+
+# 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)
 
 # force a dependency on the troveclient package
 depend type=require \