X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=holmes-actions%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fholmes%2Fcommon%2Faai%2Fconfig%2FAaiConfig.java;h=34fa67a207e3e9139063acb9796267ddd25b066a;hb=e31f9bf54d6bd8a7a3bda3f2fdf8fa7c3e7d6344;hp=b3cd28a5d74312298fbb19990e8068ccdc2cda49;hpb=a7d62526f2e0752bd1daf84844ed137158aa3cff;p=holmes%2Fcommon.git

diff --git a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
index b3cd28a..34fa67a 100644
--- a/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
+++ b/holmes-actions/src/main/java/org/onap/holmes/common/aai/config/AaiConfig.java
@@ -1,11 +1,11 @@
 /**
  * Copyright 2017 ZTE Corporation.
- *
+ * <p>
  * 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
- *
+ * <p>
  * http://www.apache.org/licenses/LICENSE-2.0
- *
+ * <p>
  * 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. See the License for the specific language governing permissions and limitations under
@@ -15,7 +15,7 @@ package org.onap.holmes.common.aai.config;
 
 public class AaiConfig {
 
-    private static final String AAI_API_VERSION = "v14";
+    private static final String AAI_API_VERSION = "v19";
 
     public static final String X_TRANSACTION_ID = "9999";
 
@@ -23,12 +23,12 @@ public class AaiConfig {
 
     private static final String AAI_AUTHENTICATION_USER = "AAI";
 
-    private static final String AAI_AUTHENTICATION_PAASWORD = "AAI";
+    private static final String AAI_AUTHENTICATION_PWD = "AAI";
 
     public static String getAuthenticationCredentials() {
-        String usernameAndPassword = AAI_AUTHENTICATION_USER + ":"
-                + AAI_AUTHENTICATION_PAASWORD;
-        return "Basic " + java.util.Base64.getEncoder().encodeToString(usernameAndPassword.getBytes());
+        String userCredentials = AAI_AUTHENTICATION_USER + ":"
+                + AAI_AUTHENTICATION_PWD;
+        return "Basic " + java.util.Base64.getEncoder().encodeToString(userCredentials.getBytes());
     }
 
     public static class AaiConsts {
@@ -54,12 +54,22 @@ public class AaiConfig {
         public static final String AAI_SERVICE_INSTANCES_ADDR_4_CCVPN = AAI_PREF + AAI_API_VERSION + "/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}";
 
         public static final String AAI_VM_ADDR = AAI_PREF + "v11/search/nodes-query?search-node-type=vserver&filter=";
+
+        public static final String AAI_SERVICE = AAI_SERVICE_INSTANCES_ADDR_4_CCVPN + "/service-instances/service-instance/{instance-id}";
+
+        public static final String AAI_PNF = AAI_PREF + AAI_API_VERSION + "/network/pnfs/pnf/{pnfName}";
+
+        public static final String AAI_PNF_VALUE = AAI_PNF + "?depth=all";
+
+        public static final String AAI_PNF_ID = AAI_PREF + AAI_API_VERSION + "/network/pnfs?pnf-id={pnfId}";
     }
 
 
     public static class MsbConsts {
 
-        private static final String AAI_NETWORK = "/aai/";
+        private static final String AAI_MSB_PREF = "/api";
+
+        private static final String AAI_NETWORK = "/aai-network/";
 
         private static final String AAI_BUSINESS = "/aai-business/";
 
@@ -84,5 +94,11 @@ public class AaiConfig {
         public static final String AAI_SERVICE_INSTANCES_ADDR_4_CCVPN = AAI_BUSINESS + AAI_API_VERSION + "/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}";
 
         public static final String AAI_VM_ADDR = AAI_SEARCH + AAI_API_VERSION + "/nodes-query?search-node-type=vserver&filter=";
+
+        public static final String AAI_SITE_RESOURCES_QUERY = AAI_MSB_PREF + AAI_NETWORK + AAI_API_VERSION +
+                "/site-resources";
+
+        public static final String AAI_SITE_VNF_QUERY = AAI_MSB_PREF + AAI_NETWORK + AAI_API_VERSION +
+                "/generic-vnfs/generic-vnf/{vnfId}";
     }
 }