22 files changed, 121 insertions, 122 deletions
diff --git a/blueprints/k8s-bbs-event-processor.yaml b/blueprints/k8s-bbs-event-processor.yaml
index bd44a6c..5115b6b 100644
--- a/blueprints/k8s-bbs-event-processor.yaml
+++ b/blueprints/k8s-bbs-event-processor.yaml
@@ -19,7 +19,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=3.0.0
 
 inputs:
   aai_enrichment_host:
@@ -201,4 +201,4 @@ node_templates:
         start:
           inputs:
             ports:
-              - concat: [{get_input: internal_port},":",{get_input: external_port}] 
+              - concat: [{get_input: internal_port},":",{get_input: external_port}]
diff --git a/blueprints/k8s-datafile.yaml b/blueprints/k8s-datafile.yaml
index 15d917c..5ddb132 100644
--- a/blueprints/k8s-datafile.yaml
+++ b/blueprints/k8s-datafile.yaml
@@ -6,8 +6,8 @@ tosca_definitions_version: cloudify_dsl_1_3
 description: Docker application to collect log file from PNF
 imports:
 - http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-- https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml
+- plugin:k8splugin?version=3.0.0
+- plugin:dmaap?version=1.5.0
 inputs:
   PM_MEAS_FILES_feed0_location:
     type: string
@@ -126,10 +126,10 @@ node_templates:
           memory:
             get_input: datafile-collector_memory_request
     relationships:
-    - type: ccsdk.relationships.publish_files
+    - type: dcaegen2.relationships.publish_files
       target: feed0
   feed0:
-    type: ccsdk.nodes.Feed
+    type: dcaegen2.nodes.Feed
     properties:
       feed_name:
         get_input: feed0_name
diff --git a/blueprints/k8s-datalake-admin-ui.yaml b/blueprints/k8s-datalake-admin-ui.yaml
index 34d4c92..1428de8 100644
--- a/blueprints/k8s-datalake-admin-ui.yaml
+++ b/blueprints/k8s-datalake-admin-ui.yaml
@@ -20,8 +20,8 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
+  - plugin:dcaepolicyplugin?version=2.4.0
 inputs:
   image_name:
     description: datalake feeder image URL.
diff --git a/blueprints/k8s-datalake-feeder.yaml b/blueprints/k8s-datalake-feeder.yaml
index 84de0f9..bd67c79 100644
--- a/blueprints/k8s-datalake-feeder.yaml
+++ b/blueprints/k8s-datalake-feeder.yaml
@@ -20,12 +20,12 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
+  - plugin:dcaepolicyplugin?version=2.4.0
 inputs:
   mariadb_address:
     type: string
-    description: MariaDB URL 
+    description: MariaDB URL
     default: "mariadb-galera"
   mariadb_port:
     type: string
diff --git a/blueprints/k8s-heartbeat.yaml b/blueprints/k8s-heartbeat.yaml
index dfd0463..35e725a 100644
--- a/blueprints/k8s-heartbeat.yaml
+++ b/blueprints/k8s-heartbeat.yaml
@@ -19,8 +19,8 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
+  - plugin:k8splugin?version=3.0.0
+  - plugin:pgaas?version=1.3.0
 
 
 inputs:
@@ -132,7 +132,7 @@ node_templates:
                 get_input: pg_dbName
             ports:
               - "10002:0"
-                
+
     properties:
       application_config:
         CBS_polling_allowed:
diff --git a/blueprints/k8s-helm.yaml b/blueprints/k8s-helm.yaml
index 6b69624..4620a8d 100644
--- a/blueprints/k8s-helm.yaml
+++ b/blueprints/k8s-helm.yaml
@@ -1,6 +1,6 @@
 # ============LICENSE_START==========================================
 # ===================================================================
-# Copyright (c) 2019 AT&T
+# Copyright (c) 2019-2020 AT&T
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/helm/4.0.0/helm-type.yaml"
+  - plugin:helm?version=4.2.0
 
 inputs:
   tiller-server-ip:
@@ -45,15 +45,15 @@ node_templates:
   dcaecomponent:
     type: onap.nodes.component
     properties:
-      tiller-server-ip: { get_input: tiller-server-ip }
-      tiller-server-port: { get_input: tiller-server-port }
-      component-name: { get_input: component-name }
-      chart-repo-url: { get_input: chart-repo-url }
-      chart-version: { get_input: chart-version }
+      tiller_ip: { get_input: tiller-server-ip }
+      tiller_port: { get_input: tiller-server-port }
+      component_name: { get_input: component-name }
+      chart_repo_url: { get_input: chart-repo-url }
+      chart_version: { get_input: chart-version }
       namespace: { get_input: namespace }
-      stable-repo-url: { get_input: stable-repo-url}
-      config-url:  { get_input: config-url}
-      config-format: { get_input: config-format}
+      stable_repo_url: { get_input: stable-repo-url}
+      config_url:  { get_input: config-url}
+      config_format: { get_input: config-format}
 outputs:
   dcaecomponent_install_status:
     value: { get_attribute: [ dcaecomponent, install-status ] }
diff --git a/blueprints/k8s-holmes-engine.yaml b/blueprints/k8s-holmes-engine.yaml
index 0269018..b4238a0 100644
--- a/blueprints/k8s-holmes-engine.yaml
+++ b/blueprints/k8s-holmes-engine.yaml
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
 - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml"
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml"
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml"
+- plugin:k8splugin?version=2.0.0
+- plugin:dcaepolicyplugin?version=2.4.0
+- plugin:pgaas?version=1.3.0
 inputs:
   dcae_CL_publish_url:
     type: string
diff --git a/blueprints/k8s-holmes-rules.yaml b/blueprints/k8s-holmes-rules.yaml
index 3b9880a..b41f560 100644
--- a/blueprints/k8s-holmes-rules.yaml
+++ b/blueprints/k8s-holmes-rules.yaml
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,9 +20,9 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
 - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml"
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml"
-- "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml"
+- plugin:k8splugin?version=2.0.0
+- plugin:dcaepolicyplugin?version=2.4.0
+- plugin:pgaas?version=1.3.0
 inputs:
   msb_hostname:
     type: string
diff --git a/blueprints/k8s-hv-ves.yaml b/blueprints/k8s-hv-ves.yaml
index 97b9d58..680ec93 100644
--- a/blueprints/k8s-hv-ves.yaml
+++ b/blueprints/k8s-hv-ves.yaml
@@ -1,9 +1,10 @@
 # -*- indent-tabs-mode: nil -*- # vi: set expandtab:
 #
-# ============LICENSE_START====================================================
-# =============================================================================
+# ============LICENSE_START========================================================
+# =================================================================================
 # Copyright (C) 2018-2019 NOKIA
-# =============================================================================
+# Modifications copyright (c) 2020 AT&T Intellectual Property.  All Rights Reserved
+# =================================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
@@ -15,13 +16,13 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-# ============LICENSE_END======================================================
+# ============LICENSE_END==========================================================
 
 tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 
 inputs:
   tag_version:
diff --git a/blueprints/k8s-pgaas-initdb.yaml b/blueprints/k8s-pgaas-initdb.yaml
index 4cdf5ae..7809680 100644
--- a/blueprints/k8s-pgaas-initdb.yaml
+++ b/blueprints/k8s-pgaas-initdb.yaml
@@ -3,7 +3,7 @@
 # ============LICENSE_START====================================================
 # org.onap.dcae
 # =============================================================================
-# Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2017-2020 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -30,9 +30,9 @@ description: |-
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/relationshipplugin/1.1.0/relationshipplugin_types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/sshkeyshare/sshkey_types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml"
+  - plugin:relationshipplugin?version=1.1.0
+  - plugin:sshkeyshare?version=1.2.0
+  - plugin:pgaas?version=1.3.0
 
 inputs:
   blueprint_version:
@@ -64,7 +64,7 @@ node_templates:
         target: sharedsshkey_pgrs
 
   sharedsshkey_pgrs:
-    type: ccsdk.nodes.ssh.keypair
+    type: dcaegen2.nodes.ssh.keypair
 
 
 outputs:
diff --git a/blueprints/k8s-pm-mapper.yaml b/blueprints/k8s-pm-mapper.yaml
index 0e477b4..b74a50e 100644
--- a/blueprints/k8s-pm-mapper.yaml
+++ b/blueprints/k8s-pm-mapper.yaml
@@ -22,8 +22,8 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
-  - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml'
-  - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml'
+  - plugin:k8splugin?version=3.0.0
+  - plugin:dmaap?version=1.5.0
 
 inputs:
   filter:
@@ -115,13 +115,13 @@ inputs:
 
 node_templates:
   pm-feed:
-    type: ccsdk.nodes.Feed
+    type: dcaegen2.nodes.Feed
     properties:
       feed_name: { get_input: feed_name }
       useExisting: true
 
   pm-topic:
-    type: ccsdk.nodes.Topic
+    type: dcaegen2.nodes.Topic
     properties:
       topic_name: { get_input: topic_name }
 
@@ -136,9 +136,9 @@ node_templates:
               - '8081:0'
 
     relationships:
-      - type: ccsdk.relationships.subscribe_to_files
+      - type: dcaegen2.relationships.subscribe_to_files
         target: pm-feed
-      - type: ccsdk.relationships.publish_events
+      - type: dcaegen2.relationships.publish_events
         target: pm-topic
 
     properties:
diff --git a/blueprints/k8s-pmsh.yaml b/blueprints/k8s-pmsh.yaml
index 39e0d95..1304d68 100644
--- a/blueprints/k8s-pmsh.yaml
+++ b/blueprints/k8s-pmsh.yaml
@@ -22,9 +22,8 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - 'http://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml'
-  - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml'
-  - 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml'
-
+  - plugin:k8splugin?version=3.0.0
+  - plugin:pgaas?version=1.3.0
 inputs:
   tag_version:
     type: string
diff --git a/blueprints/k8s-prh.yaml b/blueprints/k8s-prh.yaml
index a95d889..5e924a7 100644
--- a/blueprints/k8s-prh.yaml
+++ b/blueprints/k8s-prh.yaml
@@ -2,7 +2,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2018-2019 AT&T, NOKIA
+# Copyright (c) 2018-2020 AT&T, NOKIA
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -21,8 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-
+  - plugin:k8splugin?version=2.0.0
 inputs:
   pnfUrl:
     type: string
diff --git a/blueprints/k8s-restconf.yaml b/blueprints/k8s-restconf.yaml
index 8c4ee17..da42ef6 100644
--- a/blueprints/k8s-restconf.yaml
+++ b/blueprints/k8s-restconf.yaml
@@ -23,7 +23,7 @@ description: >
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 inputs:
   dmaap_host:
     type: string
diff --git a/blueprints/k8s-snmptrap.yaml b/blueprints/k8s-snmptrap.yaml
index 5e9fc9f..122821c 100644
--- a/blueprints/k8s-snmptrap.yaml
+++ b/blueprints/k8s-snmptrap.yaml
@@ -21,7 +21,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 inputs:
   tag_version:
     type: string
diff --git a/blueprints/k8s-sonhms.yaml b/blueprints/k8s-sonhms.yaml
index 172f466..4d9d648 100644
--- a/blueprints/k8s-sonhms.yaml
+++ b/blueprints/k8s-sonhms.yaml
@@ -6,9 +6,9 @@
  #       Licensed under the Apache License, Version 2.0 (the "License");
  #       you may not use this file except in compliance with the License.
  #       You may obtain a copy of the License at
- #    
+ #
  #            http://www.apache.org/licenses/LICENSE-2.0
- #    
+ #
  #       Unless required by applicable law or agreed to in writing, software
  #       distributed under the License is distributed on an "AS IS" BASIS,
  #       WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -19,9 +19,9 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - "http://www.getcloudify.org/spec/cloudify/3.4/types.yaml"
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+  - plugin:k8splugin?version=3.0.0
+  - plugin:pgaas?version=1.3.0
+  - plugin:dcaepolicyplugin?version=2.4.0
 inputs:
   replicas:
     type: integer
@@ -67,7 +67,7 @@ inputs:
     type: integer
     description: minimum no. of collisions
     default: 5
-  min_confusion: 
+  min_confusion:
     type: integer
     description: minimum no. of confusions
     default: 5
@@ -187,11 +187,11 @@ inputs:
 node_templates:
   pgaasvm:
     type: dcae.nodes.pgaas.database
-    properties: 
+    properties:
       writerfqdn: { get_input: pgaas_cluster_name }
       name: { get_input: database_name }
       use_existing: false
-    
+
   sonhms:
     type: dcae.nodes.ContainerizedServiceComponent
     interfaces:
@@ -269,7 +269,7 @@ node_templates:
         sonhandler.poorThreshold: { get_input: poor_threshold }
         sonhandler.namespace: { get_input: namespace }
         sonhandler.sourceId: SONHMS
-        sonhandler.dmaap.server: 
+        sonhandler.dmaap.server:
           - { get_input: dmaap }
         sonhandler.bufferTime: { get_input: buffer_time }
         sonhandler.cg: { get_input: cg }
@@ -305,7 +305,7 @@ node_templates:
     properties:
       policy_id:
            get_input: policy_id
-       
-      
-      
-        
+
+
+
+
diff --git a/blueprints/k8s-tca-clampnode.yaml b/blueprints/k8s-tca-clampnode.yaml
index 4e3f218..c2a0cc3 100644
--- a/blueprints/k8s-tca-clampnode.yaml
+++ b/blueprints/k8s-tca-clampnode.yaml
@@ -23,8 +23,8 @@ description: >
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml"
-  - "https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml"
+  - plugin:k8splugin?version=3.0.0
+  - plugin:clamppolicyplugin?version=1.1.0
 inputs:
   aaiEnrichmentHost:
     type: string
diff --git a/blueprints/k8s-tca.yaml b/blueprints/k8s-tca.yaml
index 94315b2..1be3dd6 100644
--- a/blueprints/k8s-tca.yaml
+++ b/blueprints/k8s-tca.yaml
@@ -1,7 +1,7 @@
 #
 # ============LICENSE_START====================================================
 # =============================================================================
-# Copyright (c) 2018-2019 AT&T Intellectual Property. All rights reserved.
+# Copyright (c) 2018-2020 AT&T Intellectual Property. All rights reserved.
 # =============================================================================
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -23,7 +23,7 @@ description: >
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 inputs:
   aaiEnrichmentHost:
     type: string
diff --git a/blueprints/k8s-tcagen2-clampnode.yaml b/blueprints/k8s-tcagen2-clampnode.yaml
index 71dee24..d988570 100644
--- a/blueprints/k8s-tcagen2-clampnode.yaml
+++ b/blueprints/k8s-tcagen2-clampnode.yaml
@@ -21,8 +21,8 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml
+  - plugin:k8splugin?version=3.0.0
+  - plugin:clamppolicyplugin?version=1.1.0
 inputs:
   service_name:
     type: string
diff --git a/blueprints/k8s-tcagen2.yaml b/blueprints/k8s-tcagen2.yaml
index 773143f..02ece31 100644
--- a/blueprints/k8s-tcagen2.yaml
+++ b/blueprints/k8s-tcagen2.yaml
@@ -18,7 +18,7 @@
 tosca_definitions_version: cloudify_dsl_1_3
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 inputs:
   service_name:
     type: string
diff --git a/blueprints/k8s-ves-mapper.yaml b/blueprints/k8s-ves-mapper.yaml
index 7259d18..4f3a19a 100644
--- a/blueprints/k8s-ves-mapper.yaml
+++ b/blueprints/k8s-ves-mapper.yaml
@@ -20,88 +20,88 @@
 description: "This blueprint deploys the UniversalVESAdapter(UVA) as a Docker container\n"
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=3.0.0
 
-inputs: 
-  rcc_notification_url: 
+inputs:
+  rcc_notification_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.DCAE_RCC_OUTPUT"
     type: string
-  snmp_notification_url: 
+  snmp_notification_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.ONAP-COLLECTOR-SNMPTRAP"
     type: string
-  tag_version: 
+  tag_version:
     default: "nexus3.onap.org:10001/onap/org.onap.dcaegen2.services.mapper.vesadapter.universalvesadaptor:1.0.1"
     type: string
-  universal_mapper_name: 
+  universal_mapper_name:
     default: "dcaegen2-svc-mapper"
     type: string
-  ves_fault_publish_url: 
+  ves_fault_publish_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.SEC_FAULT_OUTPUT"
     type: string
-  ves_measurement_publish_url: 
+  ves_measurement_publish_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_MEASUREMENT_OUTPUT"
     type: string
-  ves_notification_publish_url: 
+  ves_notification_publish_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_NOTIFICATION_OUTPUT"
     type: string
-  ves_pnfRegistration_publish_url: 
+  ves_pnfRegistration_publish_url:
     default: "http://message-router.onap.svc.cluster.local:3904/events/unauthenticated.VES_PNFREG_OUTPUT"
     type: string
-node_templates: 
-  universalvesadapter: 
-    interfaces: 
-      cloudify.interfaces.lifecycle: 
-        start: 
-          inputs: 
-            envs: 
+node_templates:
+  universalvesadapter:
+    interfaces:
+      cloudify.interfaces.lifecycle:
+        start:
+          inputs:
+            envs:
               CONFIG_BINDING_SERVICE: config_binding_service
             max_wait: 3600
-            ports: 
+            ports:
               - "80:0"
-    properties: 
-      application_config: 
-        app_preferences: 
-          collectors: 
-            - 
+    properties:
+      application_config:
+        app_preferences:
+          collectors:
+            -
               identifier: notification-id
-              mapping-files: 
-                - 
+              mapping-files:
+                -
                   defaultMappingFile-rcc-notification: "<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /></json:keyMap></json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='pnfRegistrationFields' beanIdRef='pnfRegistrationFields' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Version._4_0_1</jb:expression><jb:expression property='eventType'>'pnfRegistration'</jb:expression><jb:expression property='vesEventListenerVersion'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.VesEventListenerVersion._7_0_1</jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'registration_'+commonEventHeader.ts1</jb:expression><jb:expression property='reportingEntityName'>'VESMapper'</jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Domain.PNF_REGISTRATION</jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain</jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:expression property='lastEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1</jb:expression><jb:expression property='startEpochMicrosec' execOnElement='vesevent'>commonEventHeader.ts1</jb:expression><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves70.CommonEventHeader.Priority.NORMAL</jb:expression><jb:expression property='sourceName' execOnElement='vesevent'>pnfRegistrationFields.vendorName+'-'+pnfRegistrationFields.serialNumber</jb:expression></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields' beanId='pnfRegistrationFields' createOnElement='vesevent'><jb:expression property='pnfRegistrationFieldsVersion'>org.onap.dcaegen2.ves.domain.ves70.PnfRegistrationFields.PnfRegistrationFieldsVersion._2_0</jb:expression><jb:value property='serialNumber' data='pnfRegistration/serialNumber' /><jb:value property='lastServiceDate' data='pnfRegistration/lastServiceDate' /><jb:value property='manufactureDate' data='pnfRegistration/manufactureDate' /><jb:value property='modelNumber' data='pnfRegistration/modelNumber' /><jb:value property='oamV4IpAddress' data='pnfRegistration/oamV4IpAddress' /><jb:value property='oamV6IpAddress' data='pnfRegistration/oamV6IpAddress' /><jb:value property='softwareVersion' data='pnfRegistration/softwareVersion' /><jb:value property='unitFamily' data='pnfRegistration/unitFamily' /><jb:value property='unitType' data='pnfRegistration/unitType' /><jb:value property='vendorName' data='pnfRegistration/vendorName' /><jb:wiring property='additionalFields' beanIdRef='alarmAdditionalInformation' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves70.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='vesevent'><jb:wiring property='additionalProperties' beanIdRef='additionalFields2' /></jb:bean><jb:bean beanId='additionalFields2' class='java.util.HashMap' createOnElement='vesevent/pnfRegistration/additionalFields'><jb:value data='pnfRegistration/additionalFields/*'/></jb:bean></smooks-resource-list>"
               stream_publisher: ves-pnfRegistration
               stream_subscriber: rcc-notification
             -
               identifier: notify OID
-              mapping-files: 
-                - 
+              mapping-files:
+                -
                   defaultMappingFile-snmp-notification: "<?xml version='1.0' encoding='UTF-8'?><smooks-resource-list xmlns='http://www.milyn.org/xsd/smooks-1.1.xsd' xmlns:jb='http://www.milyn.org/xsd/smooks/javabean-1.4.xsd' xmlns:json='http://www.milyn.org/xsd/smooks/json-1.1.xsd'><json:reader rootName='vesevent' keyWhitspaceReplacement='-'><json:keyMap><json:key from='date&amp;time' to='date-and-time' /></json:keyMap></json:reader><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.VesEvent' beanId='vesEvent' createOnElement='vesevent'><jb:wiring property='event' beanIdRef='event' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.Event' beanId='event' createOnElement='vesevent'><jb:wiring property='commonEventHeader' beanIdRef='commonEventHeader' /><jb:wiring property='faultFields' beanIdRef='faultFields' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader' beanId='commonEventHeader' createOnElement='vesevent'><jb:expression property='version'>'3.0'</jb:expression><jb:expression property='eventType'>'FaultField'</jb:expression><jb:expression property='eventId' execOnElement='vesevent'>'XXXX'</jb:expression><jb:expression property='reportingEntityName'>'VESMapper'</jb:expression><jb:expression property='domain'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Domain.FAULT</jb:expression><jb:expression property='eventName' execOnElement='vesevent'>commonEventHeader.domain</jb:expression><jb:value property='sequence' data='0' default='0' decoder='Long' /><jb:value property='lastEpochMicrosec' data='#/time-received' /><jb:value property='startEpochMicrosec' data='#/time-received' /><jb:expression property='priority'>org.onap.dcaegen2.ves.domain.ves54.CommonEventHeader.Priority.NORMAL</jb:expression><jb:expression property='sourceName'>'VesAdapter'</jb:expression></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.FaultFields' beanId='faultFields' createOnElement='vesevent'><jb:value property='faultFieldsVersion' data='2.0' default='2.0' decoder='Double' /><jb:value property='alarmCondition' data='#/trap-category' /><jb:expression property='specificProblem'>'SNMP Fault'</jb:expression><jb:expression property='vfStatus'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.VfStatus.ACTIVE</jb:expression><jb:expression property='eventSeverity'>org.onap.dcaegen2.ves.domain.ves54.FaultFields.EventSeverity.MINOR</jb:expression><jb:wiring property='alarmAdditionalInformation' beanIdRef='alarmAdditionalInformationroot' /></jb:bean><jb:bean class='java.util.ArrayList' beanId='alarmAdditionalInformationroot' createOnElement='vesevent'><jb:wiring beanIdRef='alarmAdditionalInformation' /></jb:bean><jb:bean class='org.onap.dcaegen2.ves.domain.ves54.AlarmAdditionalInformation' beanId='alarmAdditionalInformation' createOnElement='varbinds/element'><jb:value property='name' data='#/varbind_oid' /><jb:value property='value' data='#/varbind_value' /></jb:bean></smooks-resource-list>"
               stream_publisher: ves-fault
               stream_subscriber: snmp-notification
-        streams_publishes: 
-          ves-fault: 
-            dmaap_info: 
-              topic_url: 
+        streams_publishes:
+          ves-fault:
+            dmaap_info:
+              topic_url:
                 get_input: ves_fault_publish_url
             type: message_router
-          ves-pnfRegistration: 
-            dmaap_info: 
-              topic_url: 
+          ves-pnfRegistration:
+            dmaap_info:
+              topic_url:
                 get_input: ves_pnfRegistration_publish_url
             type: message_router
-        streams_subscribes: 
-          rcc-notification: 
-            dmaap_info: 
-              topic_url: 
+        streams_subscribes:
+          rcc-notification:
+            dmaap_info:
+              topic_url:
                 get_input: rcc_notification_url
             type: message_router
-          snmp-notification: 
-            dmaap_info: 
-              topic_url: 
+          snmp-notification:
+            dmaap_info:
+              topic_url:
                 get_input: snmp_notification_url
             type: message_router
       docker_config: {}
-      image: 
+      image:
         get_input: tag_version
-      service_component_type: 
+      service_component_type:
         get_input: universal_mapper_name
     type: dcae.nodes.ContainerizedServiceComponent
 tosca_definitions_version: cloudify_dsl_1_3
diff --git a/blueprints/k8s-ves.yaml b/blueprints/k8s-ves.yaml
index 9866e96..d5c044a 100644
--- a/blueprints/k8s-ves.yaml
+++ b/blueprints/k8s-ves.yaml
@@ -22,7 +22,7 @@ tosca_definitions_version: cloudify_dsl_1_3
 
 imports:
   - https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
-  - https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+  - plugin:k8splugin?version=2.0.0
 
 inputs:
   ves_other_publish_url:
@@ -82,7 +82,7 @@ inputs:
     type: string
     description: List of user,password separated by pipe; pwd should be generated by using crypt-password tool (https://nexus.onap.org/#nexus-search;quick~crypt-password)
     default: "sample1,$2a$10$0buh.2WeYwN868YMwnNNEuNEAMNYVU9.FSMJGyIKV3dGET/7oGOi6|demouser,$2a$10$1cc.COcqV/d3iT2N7BjPG.S6ZKv2jpb9a5MV.o7lMih/GpjJRX.Ce"
- 
+
 node_templates:
   ves:
     interfaces:
@@ -108,7 +108,7 @@ node_templates:
         auth.method:
           get_input: auth_method
         header.authlist:
-          get_input: user_list 
+          get_input: user_list
         services_calls: []
         streams_publishes:
           ves-fault: