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=33734708a9361c5c64d5778fd12cbde77e3525a8;hb=695d66a9635dd15c5fc8a16165f5651f50755c86;hp=af1a5921c12135eb252c4d1c8aab39bb9872cee4;hpb=d00f96d02f8f44ca0fe84a1a38c726edf80128ce;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 af1a592..3373470 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
@@ -35,7 +35,7 @@ public class AaiConfig {
 
         private static final String AAI_PREF = "/aai/";
 
-        public static final String AAI_VNF_ADDR = AAI_PREF + AAI_API_VERSION + "/network/generic-vnfs/generic-vnf";
+        public static final String AAI_VNF_ADDR = AAI_PREF + "v11/network/generic-vnfs/generic-vnf";
 
         public static final String AAI_TP_UPDATE = AAI_PREF + AAI_API_VERSION + "/network/pnfs/pnf/{pnfName}/p-interfaces/p-interface/nodeId-{pnfName}-ltpId-{ifName}";
 
@@ -53,13 +53,15 @@ 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 + AAI_API_VERSION + "/search/nodes-query?search-node-type=vserver&filter=";
+        public static final String AAI_VM_ADDR = AAI_PREF + "v11/search/nodes-query?search-node-type=vserver&filter=";
     }
 
 
     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 +86,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}";
     }
 }