--- a/components/python/neutronclient/neutronclient-PYVER.p5m	Wed Jun 11 05:34:04 2014 -0700
+++ b/components/python/neutronclient/neutronclient-PYVER.p5m	Fri Jun 13 09:10:23 2014 -0700
@@ -33,7 +33,7 @@
     value="A client library for Neutron built on the OpenStack Virtual Network API. It provides a Python API (the 'neutronclient' module) and a command-line tool ('neutron')."
 set name=com.oracle.info.description \
     value="neutronclient, the Python bindings to the OpenStack Virtual Network API"
-set name=com.oracle.info.tpno value=16351
+set name=com.oracle.info.tpno value=17871
 set name=info.classification \
     value=org.opensolaris.category.2008:Development/Python \
     value="org.opensolaris.category.2008:System/Administration and Configuration" \
@@ -72,10 +72,12 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/member.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/pool.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/lb/vip.py
+file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/metering.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/network.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/networkprofile.py
-file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nvp_qos_queue.py
-file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nvpnetworkgateway.py
+file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/networkgateway.py
+file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/nsx/qos_queue.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/policyprofile.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/port.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/quota.py
@@ -91,7 +93,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/neutron/v2_0/vpn/vpnservice.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/common/exception.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/common/gettextutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/common/importutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/neutronclient/openstack/common/jsonutils.py
@@ -127,14 +128,14 @@
 depend type=require fmri=library/python-2/httplib2-$(PYV)
 
 # force a dependency on iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/iso8601-$(PYV)
-
-# force a dependency on pbr; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/pbr-$(PYV)
-
-# force a dependency on six; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python-2/six-$(PYV)
+depend type=require fmri=library/python/iso8601-$(PYV)
 
 # force a dependency on the neutronclient package
 depend type=require \
     fmri=library/python/neutronclient@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+
+# 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 six; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/six-$(PYV)