components/python/pycadf/pycadf-PYVER.p5m
branchs11u3-sru
changeset 6035 c9748fcc32de
parent 4072 db0cec748ec0
child 6818 4079d968549c
--- a/components/python/pycadf/pycadf-PYVER.p5m	Mon May 16 14:46:20 2016 +0200
+++ b/components/python/pycadf/pycadf-PYVER.p5m	Fri May 20 17:42:29 2016 -0400
@@ -20,7 +20,7 @@
 #
 
 #
-# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
 set name=pkg.fmri \
@@ -38,13 +38,19 @@
 set name=org.opensolaris.arc-caseid value=PSARC/2014/329
 set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
 #
+file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/cinder_api_audit_map.conf
+file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/glance_api_audit_map.conf
+file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/neutron_api_audit_map.conf
+file path=usr/lib/python$(PYVER)/vendor-packages/etc/pycadf/nova_api_audit_map.conf
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/PKG-INFO
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/SOURCES.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/dependency_links.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/not-zip-safe
+file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/pbr.json
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/requires.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf-$(COMPONENT_VERSION)-py$(PYVER).egg-info/top_level.txt
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/_i18n.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/attachment.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/audit/__init__.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/audit/api.py
@@ -55,6 +61,8 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/event.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/eventfactory.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/geolocation.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/helper/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/helper/api.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/host.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/identifier.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/measurement.py
@@ -63,24 +71,6 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/audit.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/base.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/middleware/notifier.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/context.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/excutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fileutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/config.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/lockutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/logging.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/mockpatch.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/fixture/moxstubout.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/gettextutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/importutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/jsonutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/local.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/lockutils.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/log.py
-file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/openstack/common/timeutils.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/path.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/reason.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/reporterstep.py
@@ -89,35 +79,27 @@
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/timestamp.py
 file path=usr/lib/python$(PYVER)/vendor-packages/pycadf/utils.py
 #
-license 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)
+license pycadf.license license="Apache v2.0"
 
 # force a dependency on the Python runtime
 depend type=require fmri=__TBD pkg.debug.depend.file=python$(PYVER) \
     pkg.debug.depend.path=usr/bin
 
-# 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 iso8601; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/iso8601-$(PYV)
-
 # force a dependency on oslo.config; pkgdepend work is needed to flush this out.
 depend type=require fmri=library/python/oslo.config-$(PYV)
 
+# force a dependency on oslo.context; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.context-$(PYV)
+
+# force a dependency on oslo.i18n; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.i18n-$(PYV)
+
 # force a dependency on oslo.messaging; pkgdepend work is needed to flush this
 # out.
 depend type=require fmri=library/python/oslo.messaging-$(PYV)
 
-# force a dependency on posix_ipc; pkgdepend work is needed to flush this out.
-depend type=require fmri=library/python/posix_ipc-$(PYV)
+# force a dependency on oslo.serialization; pkgdepend work is needed to flush this out.
+depend type=require fmri=library/python/oslo.serialization-$(PYV)
 
 # force a dependency on the pycadf package
 depend type=require \