summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSchmalzried, Terry (ts862m) <ts862m@att.com>2019-01-17 13:43:38 -0500
committerSchmalzried, Terry (ts862m) <ts862m@att.com>2019-01-18 15:13:48 -0500
commit1219143b0fead020ee2b53274a29504b6b5a11af (patch)
tree09fadc61daf695b47be201927f596bcaf415b257
parentd37dad30898c1e5ee627d16ff63791089175c4a3 (diff)
rm sleeper store_policies
Issue-ID: DCAEGEN2-1086 Change-Id: I7ea5dbb38a6ec4501c54be65ffd7ace85e408ce1 Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com>
-rw-r--r--onap-dcae-dcaepolicy-lib/README.md4
-rw-r--r--onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py5
-rw-r--r--onap-dcae-dcaepolicy-lib/pom.xml2
-rw-r--r--onap-dcae-dcaepolicy-lib/setup.py2
4 files changed, 5 insertions, 8 deletions
diff --git a/onap-dcae-dcaepolicy-lib/README.md b/onap-dcae-dcaepolicy-lib/README.md
index b46f0b1..0273b7b 100644
--- a/onap-dcae-dcaepolicy-lib/README.md
+++ b/onap-dcae-dcaepolicy-lib/README.md
@@ -15,7 +15,7 @@ python setup.py sdist upload
### **requirements.txt**
```python
-onap-dcae-dcaepolicy-lib==1.0.0
+onap-dcae-dcaepolicy-lib==2.4.1
```
### **tasks.py**
@@ -266,4 +266,4 @@ example of **policies** in runtime_properties **after policy-update**
}
```
---- \ No newline at end of file
+---
diff --git a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
index 65c2614..a8d8d70 100644
--- a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
+++ b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
@@ -175,7 +175,6 @@ class Policies(object):
if ctx.type != NODE_INSTANCE:
raise NonRecoverableError("can only invoke gather_policies_to_node on node")
- policies_outputted = False
policy_bodies = []
try:
policies = {}
@@ -189,8 +188,6 @@ class Policies(object):
ctx.instance.runtime_properties[POLICY_FILTERS] = policy_filters
policy_bodies = Policies._get_policy_bodies_dict(policies)
- if policy_bodies:
- policies_outputted = PoliciesOutput.store_policies(ACTION_GATHERED, policy_bodies)
except Exception as ex:
error = "Failed to set the policies {0}".format(str(ex))
ctx.logger.error("{0}: {1}".format(error, traceback.format_exc()))
@@ -198,7 +195,7 @@ class Policies(object):
func_result = func(*args, **kwargs)
- if not policies_outputted and policy_bodies:
+ if policy_bodies:
PoliciesOutput.store_policies(ACTION_GATHERED, policy_bodies)
return func_result
diff --git a/onap-dcae-dcaepolicy-lib/pom.xml b/onap-dcae-dcaepolicy-lib/pom.xml
index 0b27137..ecbbea7 100644
--- a/onap-dcae-dcaepolicy-lib/pom.xml
+++ b/onap-dcae-dcaepolicy-lib/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
<groupId>org.onap.dcaegen2.utils</groupId>
<artifactId>onap-dcae-dcaepolicy-lib</artifactId>
<name>dcaegen2-utils-onap-dcae-dcaepolicy-lib</name>
- <version>2.4.0-SNAPSHOT</version>
+ <version>2.4.1-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
diff --git a/onap-dcae-dcaepolicy-lib/setup.py b/onap-dcae-dcaepolicy-lib/setup.py
index a2ff93f..b68247d 100644
--- a/onap-dcae-dcaepolicy-lib/setup.py
+++ b/onap-dcae-dcaepolicy-lib/setup.py
@@ -23,7 +23,7 @@ from setuptools import setup, find_packages
setup(
name='onap-dcae-dcaepolicy-lib',
description='lib of policy decorators to be used by cloudify plugins of dcae controller',
- version="2.4.0",
+ version="2.4.1",
author='Alex Shatov',
author_email="alexs@att.com",
license='Apache 2',