Upgrade to public PyPi policy-lib

Issue-ID: DCAEGEN2-74
Change-Id: I85f43a73da58497c5677bffcb2de79015febfa7c
Signed-off-by: Tommy Carpenter <tommy@research.att.com>

diff --git a/cdap/Changelog.md b/cdap/Changelog.md
index 0bcdeca..327ce0e 100644 (file)
--- a/cdap/Changelog.md
+++ b/cdap/Changelog.md
@@ -4,6 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
+## [14.2.5] - Sep 21 2017
+* Use the public pypi version of policy lib
+
 ## [14.2.4] - Sep 15 2017
 * Add decorator usage to DRY up code
 

diff --git a/cdap/cdap_types.yaml b/cdap/cdap_types.yaml
index 6f9a33a..3c2a234 100755 (executable)
--- a/cdap/cdap_types.yaml
+++ b/cdap/cdap_types.yaml
@@ -6,7 +6,7 @@ plugins:
   cdap_deploy:
     executor: central_deployment_agent
     package_name: cdapcloudify
-    package_version: 14.2.4
+    package_version: 14.2.5
 
 data_types:
     cdap_connections:

diff --git a/cdap/cdapplugin/cdapcloudify/cdap_plugin.py b/cdap/cdapplugin/cdapcloudify/cdap_plugin.py
index d12a23b..a64354c 100644 (file)
--- a/cdap/cdapplugin/cdapcloudify/cdap_plugin.py
+++ b/cdap/cdapplugin/cdapcloudify/cdap_plugin.py
@@ -16,7 +16,7 @@
 # ============LICENSE_END=========================================================
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
-from dcaepolicy import Policies
+from onap_dcae_dcaepolicy_lib import Policies
 
 import requests
 from cloudify import ctx

diff --git a/cdap/cdapplugin/requirements.txt b/cdap/cdapplugin/requirements.txt
index 295262a..ff93d4c 100644 (file)
--- a/cdap/cdapplugin/requirements.txt
+++ b/cdap/cdapplugin/requirements.txt
@@ -1,3 +1,2 @@
---extra-index-url {{ TODO }}/simple
-dcaepolicy==1.0.0
+onap-dcae-dcaepolicy-lib==1.0.0
 uuid==1.30

diff --git a/cdap/cdapplugin/setup.py b/cdap/cdapplugin/setup.py
index 729ff1d..8774699 100644 (file)
--- a/cdap/cdapplugin/setup.py
+++ b/cdap/cdapplugin/setup.py
@@ -22,17 +22,17 @@ from setuptools import setup, find_packages
 
 setup(
     name = "cdapcloudify",
-    version = "14.2.4",
+    version = "14.2.5",
     packages=find_packages(),
     author = "Tommy Carpenter",
-    author_email = "tommy at research dot eh tee tee dot com",
+    author_email = "tommy@research.att.com",
     description = ("Cloudify plugin for CDAP"),
     license = "",
     keywords = "",
     url = "https://gerrit.onap.org/r/#/admin/projects/dcaegen2/platform/plugins",
     zip_safe=False,
     install_requires = [
-        "dcaepolicy==1.0.0",
+        "onap-dcae-dcaepolicy-lib",
         "uuid==1.30"
     ]
 )

diff --git a/cdap/demo_blueprints/cdap_hello_world.yaml b/cdap/demo_blueprints/cdap_hello_world.yaml
index ddc19d8..0b5ff64 100644 (file)
--- a/cdap/demo_blueprints/cdap_hello_world.yaml
+++ b/cdap/demo_blueprints/cdap_hello_world.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.4/cdap_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.5/cdap_types.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dcaepolicy/1.0.0/node-type.yaml
 
 inputs:

diff --git a/cdap/demo_blueprints/cdap_hello_world_with_dmaap.yaml b/cdap/demo_blueprints/cdap_hello_world_with_dmaap.yaml
index c1d367d..009fc37 100644 (file)
--- a/cdap/demo_blueprints/cdap_hello_world_with_dmaap.yaml
+++ b/cdap/demo_blueprints/cdap_hello_world_with_dmaap.yaml
@@ -3,7 +3,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dmaap/1.1.0/dmaap.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.4/cdap_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.5/cdap_types.yaml
 
 inputs:
   hello_world_jar_url:

diff --git a/cdap/demo_blueprints/cdap_hello_world_with_laika.yaml b/cdap/demo_blueprints/cdap_hello_world_with_laika.yaml
index 58a6f99..8381418 100644 (file)
--- a/cdap/demo_blueprints/cdap_hello_world_with_laika.yaml
+++ b/cdap/demo_blueprints/cdap_hello_world_with_laika.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.4/cdap_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.5/cdap_types.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/docker/2.3.0/node-type.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/relationship/1.0.0/node-type.yaml
 

diff --git a/cdap/demo_blueprints/cdap_hello_world_with_mr.yaml b/cdap/demo_blueprints/cdap_hello_world_with_mr.yaml
index e1e0adb..fb1e863 100644 (file)
--- a/cdap/demo_blueprints/cdap_hello_world_with_mr.yaml
+++ b/cdap/demo_blueprints/cdap_hello_world_with_mr.yaml
@@ -2,7 +2,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.0.2/cdap_types.yaml
+  - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/cdap/14.2.5/cdap_types.yaml
   - {{ ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2 }}/type_files/dmaap/1.1.0/dmaap.yaml
 
 inputs: