Merge "fix typo in SubResourcess class"

diff --git a/deliveries/src/main/scripts/localize_system.sh b/deliveries/src/main/scripts/localize_system.sh
index 7cd7be6..f38121c 100755 (executable)
--- a/deliveries/src/main/scripts/localize_system.sh
+++ b/deliveries/src/main/scripts/localize_system.sh
@@ -7,6 +7,7 @@ echo "Localizing the VID system configuration"
 
 mkdir -p "${VID_MYLOGIN_FEED_DIRECTORY}"
 
+
 sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
        -e 's/${VID_MYSQL_PORT}/'${VID_MYSQL_PORT}'/g' \
        -e 's/${VID_MYSQL_DBNAME}/'${VID_MYSQL_DBNAME}'/g' \
@@ -14,6 +15,9 @@ sed -e 's/${VID_MYSQL_HOST}/'${VID_MYSQL_HOST}'/g' \
        -e 's/${VID_MYSQL_PASS}/'${VID_MYSQL_PASS}'/g' \
        -e 's/${VID_AAI_HOST}/'${VID_AAI_HOST}'/g' \
        -e 's/${VID_AAI_PORT}/'${VID_AAI_PORT}'/g' \
+       -e 's/${AAI_USE_CLIENT_CERT}/'${AAI_USE_CLIENT_CERT}'/g' \
+       -e 's/${AAI_VID_UID}/'${AAI_VID_UID}'/g' \
+       -e 's/${AAI_VID_PASSWD_X}/'${AAI_VID_PASSWD_X}'/g' \
        -e 's,${AAI_TRUSTSTORE_FILENAME},'${AAI_TRUSTSTORE_FILENAME}',g' \
        -e 's/${AAI_TRUSTSTORE_PASSWD_X}/'${AAI_TRUSTSTORE_PASSWD_X}'/g' \
        -e 's,${AAI_KEYSTORE_FILENAME},'${AAI_KEYSTORE_FILENAME}',g' \

diff --git a/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
index fa4eefc..cd50951 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
+++ b/vid-app-common/src/main/java/org/openecomp/aai/util/AAIRestInterface.java
@@ -1,9 +1,9 @@
 /*-\r
- * ============LICENSE_START=======================================================
- * VID
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
+ * ============LICENSE_START=======================================================\r
+ * VID\r
+ * ================================================================================\r
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.\r
+ * ================================================================================\r
  * Licensed under the Apache License, Version 2.0 (the "License");\r
  * you may not use this file except in compliance with the License.\r
  * You may obtain a copy of the License at\r
@@ -14,7 +14,7 @@
  * distributed under the License is distributed on an "AS IS" BASIS,\r
  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
  * See the License for the specific language governing permissions and\r
- * limitations under the License.
+ * limitations under the License.\r
  * ============LICENSE_END=========================================================\r
  */\r
 package org.openecomp.aai.util;\r
@@ -276,17 +276,43 @@ public class AAIRestInterface {
                if (xml)\r
                        responseType = "application/xml";\r
                   \r
-            initRestClient();    \r
+            initRestClient();\r
+\r
+                       String clientCert = SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT);\r
+\r
+                       boolean useClientCert = false;\r
+                       if (clientCert != null &&\r
+                                       SystemProperties.getProperty(AAIProperties.AAI_USE_CLIENT_CERT).equalsIgnoreCase("true")) {\r
+                               useClientCert  = true;\r
+                       }\r
     \r
             url = SystemProperties.getProperty(AAIProperties.AAI_SERVER_URL_BASE) + path;\r
 \r
-            final Response cres = client.target(url)\r
-                 .request()\r
-                 .accept(responseType)\r
-                 .header("X-TransactionId", transId)\r
-                 .header("X-FromAppId",  fromAppId)\r
-                 .post(Entity.entity(payload, MediaType.APPLICATION_JSON));\r
-            \r
+            final Response cres;\r
+                       if (useClientCert == true) {\r
+                               cres = client.target(url)\r
+                                               .request()\r
+                                               .accept(responseType)\r
+                                               .header("X-TransactionId", transId)\r
+                                               .header("X-FromAppId",  fromAppId)\r
+                                               .header("Content-Type", "application/json")\r
+                                               .post(Entity.entity(payload, MediaType.APPLICATION_JSON));\r
+                       } else {\r
+\r
+                               String vidUsername = SystemProperties.getProperty(AAIProperties.AAI_VID_USERNAME);\r
+                               String vidPassword = Password.deobfuscate(SystemProperties.getProperty(AAIProperties.AAI_VID_PASSWD_X));\r
+                               String encodeThis = vidUsername + ":" + vidPassword;\r
+\r
+                               cres = client.target(url)\r
+                                               .request()\r
+                                               .accept(responseType)\r
+                                               .header("X-TransactionId", transId)\r
+                                               .header("X-FromAppId", fromAppId)\r
+                                               .header("Content-Type", "application/json")\r
+                                               .header("Authorization", "Basic " + Base64.getEncoder().encodeToString(encodeThis.getBytes("utf-8")))\r
+                                               .post(Entity.entity(payload, MediaType.APPLICATION_JSON));\r
+                       }\r
+\r
                if (cres.getStatus() == 200 && cres.getStatus() <= 299) {\r
                        logger.info(EELFLoggerDelegate.errorLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");\r
                        logger.debug(EELFLoggerDelegate.debugLogger, dateFormat.format(new Date()) + "<== " + methodName + " REST api POST was successful!");\r

diff --git a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
index d42c1f1..41c7ca5 100755 (executable)
--- a/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
+++ b/vid-app-common/src/main/java/org/openecomp/vid/asdc/beans/tosca/ToscaMetadata.java
@@ -61,6 +61,9 @@ public class ToscaMetadata {
        /** The resource vendor release. */\r
        private String resourceVendorRelease;\r
        \r
+       /** the resourceVendorModelNumber */\r
+       private String resourceVendorModelNumber;\r
+\r
        /** The service ecomp naming. */\r
        private String serviceEcompNaming;\r
        \r
@@ -88,6 +91,11 @@ public class ToscaMetadata {
        \r
        /** The vf module model version. */\r
        private String vfModuleModelVersion;\r
+\r
+        /** serviceType */\r
+        private String serviceType;\r
+        /** serviceRole */\r
+        private String serviceRole;\r
        \r
        /**\r
         * Instantiates a new tosca metadata.\r
@@ -458,4 +466,26 @@ public class ToscaMetadata {
                \r
                return vfModuleModelCustomizationUUID;\r
        }\r
+\r
+        /** serviceType */\r
+        public String getServiceType() {\r
+                return serviceType;\r
+        }\r
+        public void setServiceType(String serviceType) {\r
+                this.serviceType= serviceType;\r
+        }\r
+        /** serviceRole */\r
+        public String getServiceRole() {\r
+                return serviceRole;\r
+        }\r
+        public void setServiceRole(String serviceRole) {\r
+                this.serviceRole= serviceRole;\r
+        }\r
+        /** resourceVendorModelNumber */\r
+        public String getResourceVendorModelNumber() {\r
+                return resourceVendorModelNumber;\r
+        }\r
+        public void setResourceVendorModelNumber(String resourceVendorModelNumber) {\r
+                this.resourceVendorModelNumber= resourceVendorModelNumber;\r
+        }\r
 }\r