From 715654de5385f474122a8ff2074100c16d52d2ee Mon Sep 17 00:00:00 2001
From: Jack Lucas <jflucas@research.att.com>
Date: Fri, 30 Mar 2018 16:19:05 -0400
Subject: Update for CM 4.x

Change-Id: Idf4ca1de1d2a2fb616cc4eeb0d7d714fd9eb3b0d
Issue-ID: DCAEGEN2-255
Signed-off-by: Jack Lucas <jflucas@research.att.com>
---
 lib/cloudify.js    | 8 ++++++++
 package.json       | 2 +-
 pom.xml            | 2 +-
 version.properties | 4 ++--
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/cloudify.js b/lib/cloudify.js
index 0dbb876..c0504af 100644
--- a/lib/cloudify.js
+++ b/lib/cloudify.js
@@ -23,6 +23,8 @@ const FINISHED = [ "terminated", "cancelled", "failed" ];
 const RETRY_INTERVAL = 5000;   // Every 5 seconds
 const MAX_TRIES = 720;        // Up to 1 hour
 
+const TENANT = "default_tenant";  // Tenant name for Cloudify 4.x
+
 const doRequest = require('./promise_request').doRequest;
 const repeat = require('./repeat');
 const admzip = require('adm-zip');
@@ -332,6 +334,12 @@ function addAuthToOptions(reqOptions) {
     if (!!cfyAuth && cfyAuth !== "undefined:undefined") {
         reqOptions.auth = cfyAuth;
     }
+    if (reqOptions.headers) {
+        reqOptions.headers.Tenant = TENANT;
+    }
+    else {
+        reqOptions.headers = {"Tenant" : TENANT};
+    }
 }
 
 // Set a logger
diff --git a/package.json b/package.json
index b239f5e..1752374 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "onap-dcae-deployment-handler",
-  "version": "4.3.2",
+  "version": "4.4.0",
   "description": "ONAP DCAE Deployment Handler",
   "main": "deployment-handler.js",
   "dependencies": {
diff --git a/pom.xml b/pom.xml
index e3096ff..5c13022 100644
--- a/pom.xml
+++ b/pom.xml
@@ -29,7 +29,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
   <groupId>org.onap.dcaegen2.platform</groupId>
   <artifactId>deployment-handler</artifactId>
   <name>dcaegen2-platform-deployment-handler</name>
-  <version>2.0.2-SNAPSHOT</version>
+  <version>2.1.0-SNAPSHOT</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
diff --git a/version.properties b/version.properties
index a75c90e..91dd40e 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
 major=2
-minor=0
-patch=2
+minor=1
+patch=0
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT
-- 
cgit 1.2.3-korg