Fixed the AAI API Version for VoLTE

Change-Id: I685cd2e1547b7c9d66c3c54c0f5b76ae4fe873ae
Issue-ID: HOLMES-177
Signed-off-by: GuangrongFu <fu.guangrong@zte.com.cn>

diff --git a/holmes-actions/pom.xml b/holmes-actions/pom.xml
index 2b43532..5e177f0 100644 (file)
--- a/holmes-actions/pom.xml
+++ b/holmes-actions/pom.xml
@@ -12,7 +12,7 @@
     <parent>\r
         <groupId>org.onap.holmes.common</groupId>\r
         <artifactId>holmes-common-parent</artifactId>\r
-        <version>1.2.2</version>\r
+        <version>1.2.3</version>\r
     </parent>\r
 \r
     <name>holmes-common-service</name>\r

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..b3cd28a 100644 (file)
--- 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,7 +53,7 @@ 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=";
     }
 
 

diff --git a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
index 1d3d2e9..68e9f84 100644 (file)
--- a/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
+++ b/holmes-actions/src/test/java/org/onap/holmes/common/aai/config/AaiConfigTest.java
@@ -24,8 +24,8 @@ public class AaiConfigTest {
 
     @Test
     public void testAaiConfig_get_static_fields() {
-        String aaiVnfAddr = "/aai/v14/network/generic-vnfs/generic-vnf";
-        String aaiVmAddr = "/aai/v14/search/nodes-query?search-node-type=vserver&filter=";
+        String aaiVnfAddr = "/aai/v11/network/generic-vnfs/generic-vnf";
+        String aaiVmAddr = "/aai/v11/search/nodes-query?search-node-type=vserver&filter=";
         String xTransactionId = "9999";
         String xFromAppId = "jimmy-postman";
         assertThat(aaiVnfAddr, equalTo(AaiConfig.AaiConsts.AAI_VNF_ADDR));

diff --git a/pom.xml b/pom.xml
index 7b5932c..d3f45be 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -20,7 +20,7 @@
     <artifactId>holmes-common-parent</artifactId>\r
     <packaging>pom</packaging>\r
 \r
-    <version>1.2.2</version>\r
+    <version>1.2.3</version>\r
     <name>holmes-common</name>\r
     <modules>\r
         <module>holmes-actions</module>\r

diff --git a/version.properties b/version.properties
index cfb32e0..08d323a 100644 (file)
--- a/version.properties
+++ b/version.properties
@@ -4,7 +4,7 @@
 \r
 major=1\r
 minor=2\r
-patch=2\r
+patch=3\r
 \r
 base_version=${major}.${minor}.${patch}\r
 \r