Changing BE code to trim the name and inventoryId

[WIFI-5112] Changing associatedAccessSsidProfileIds to Set<Long>

adoption-metrics-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>adoption-metrics-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

adoption-metrics-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>adoption-metrics-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>adoption-metrics-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

adoption-metrics-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>adoption-metrics-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
     </dependencies>
 

adoption-metrics-datastore-rdbms/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>adoption-metrics-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc-tests</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>adoption-metrics-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
          

adoption-metrics-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

adoption-metrics-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>adoption-metrics-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

adoption-metrics-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
       <dependency>
         <artifactId>adoption-metrics-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>adoption-metrics-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

adoption-metrics-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,41 +15,41 @@
       <dependency>
         <artifactId>adoption-metrics-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     <!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>adoption-metrics-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>adoption-metrics-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

adoption-metrics-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,29 +15,29 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     <dependency>
         <artifactId>adoption-metrics-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>adoption-metrics-datastore-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>adoption-metrics-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 
@@ -45,7 +45,7 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

adoption-metrics-sp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,25 +15,25 @@
       <dependency>
         <artifactId>base-stream-consumer</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>adoption-metrics-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>

alarm-datastore-cassandra/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-cassandra</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>alarm-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-cassandra-tests</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>alarm-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
          

alarm-datastore-cassandra/src/main/java/com/telecominfraproject/wlan/alarm/datastore/cassandra/AlarmDatastoreCassandra.java

@@ -795,7 +795,10 @@ public class AlarmDatastoreCassandra implements AlarmDatastore {
 				long equipmentIdPostQuery = row.getLong("equipmentId");
 				int alarmCodePostQuery = row.getInt("alarmCode");
 				long createdTimestampPostQuery = row.getLong("createdTimestamp");
-				pageItems.add(getOrNull(customerId, equipmentIdPostQuery, AlarmCode.getById(alarmCodePostQuery), createdTimestampPostQuery));
+				Alarm alarmToAdd = getOrNull(customerId, equipmentIdPostQuery, AlarmCode.getById(alarmCodePostQuery), createdTimestampPostQuery);
+                if (alarmToAdd != null) {
+                    pageItems.add(alarmToAdd);
+                }
 			}
 			break;
 		default:

alarm-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>alarm-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

alarm-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>alarm-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>alarm-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

alarm-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>alarm-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
     </dependencies>
 

alarm-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,17 +15,17 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>status-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>system-event-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

alarm-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>alarm-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

alarm-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>alarm-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

alarm-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,53 +15,53 @@
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     <!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>alarm-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>alarm-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <artifactId>equipment-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       <dependency>
         <artifactId>equipment-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
     </dependencies>

alarm-service/pom.xml

@@ -1,9 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 
@@ -15,53 +17,53 @@
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>alarm-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>alarm-datastore-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>equipment-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>alarm-datastore-inmemory</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<artifactId>equipment-service-local</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<artifactId>equipment-datastore-inmemory</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-empty</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

all-cloud-and-opensync-gw-in-one-docker/pom.xml

@@ -3,7 +3,7 @@
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 	<artifactId>all-cloud-and-opensync-gw-in-one-docker</artifactId>
@@ -22,7 +22,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>all-cloud-and-opensync-gw-in-one-process</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 	</dependencies>

all-cloud-and-opensync-gw-in-one-process/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -21,344 +21,344 @@
     <dependency>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>opensync-ext-cloud</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     
     <!-- PortForwarding Gateway - to support remote ssh connections to APs -->
 	<dependency>
 		<artifactId>port-forwarding-gateway</artifactId>
 		<groupId>com.telecominfraproject.wlan</groupId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 	</dependency>    
     
      <!-- portal services -->
       <dependency>
         <artifactId>webtoken-auth-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
       <dependency>
         <artifactId>portal-services</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>customer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>client-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>alarm-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>service-metric-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>routing-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
      <dependency>
         <artifactId>adoption-metrics-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
        <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     
       <!-- prov services -->
       <dependency>
         <artifactId>customer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>customer-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>location-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>equipment-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>profile-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>portal-user-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>firmware-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>manufacturer-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
         <artifactId>adoption-metrics-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>adoption-metrics-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
 	  <!-- ssc services -->
       <dependency>
         <artifactId>cloud-event-dispatcher</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>service-metric-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>system-event-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>system-event-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>alarm-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>alarm-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>status-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>client-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>client-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>routing-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>routing-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Stream Processors -->
       <dependency>
         <artifactId>single-process-streams</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
             
       <dependency>
         <artifactId>provisioning-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>dashboard-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>adoption-metrics-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

all-cloud-in-one-docker-with-persistence/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>tip-wlan-cloud-root-pom</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>../../wlan-cloud-root</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>all-cloud-in-one-process-with-persistence</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

all-cloud-in-one-docker/pom.xml

@@ -3,7 +3,7 @@
     <parent>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>tip-wlan-cloud-root-pom</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <relativePath>../../wlan-cloud-root</relativePath>
     </parent>
 
@@ -23,7 +23,7 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>all-cloud-in-one-process</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
 
     </dependencies>

all-cloud-in-one-process-with-persistence/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -22,244 +22,244 @@
       <dependency>
         <artifactId>webtoken-auth-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
       <dependency>
         <artifactId>portal-services</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>customer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>client-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>alarm-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>service-metric-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>routing-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
      <dependency>
         <artifactId>adoption-metrics-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
       <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     
       <!-- prov services -->
       <dependency>
         <artifactId>customer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>customer-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>location-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>equipment-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>profile-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>portal-user-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>firmware-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>manufacturer-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
         <artifactId>adoption-metrics-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
         <artifactId>adoption-metrics-datastore-rdbms</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
 	  <!-- ssc services -->
       <dependency>
         <artifactId>cloud-event-dispatcher</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Stream Processors -->
       <dependency>
         <artifactId>single-process-streams</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
             
       <dependency>
         <artifactId>provisioning-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>dashboard-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>adoption-metrics-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-service-remote</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

all-cloud-in-one-process/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -21,337 +21,337 @@
       <dependency>
         <artifactId>webtoken-auth-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
       <dependency>
         <artifactId>portal-services</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>customer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>client-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>alarm-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>service-metric-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>routing-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
      <dependency>
         <artifactId>adoption-metrics-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     
       <dependency>
             <artifactId>filestore-service</artifactId>
             <groupId>com.telecominfraproject.wlan</groupId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     
       <!-- prov services -->
       <dependency>
         <artifactId>customer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>customer-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>location-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>equipment-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>profile-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>portal-user-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>portal-user-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>firmware-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>firmware-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>manufacturer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>manufacturer-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
         <artifactId>adoption-metrics-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
      <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>adoption-metrics-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 
       <dependency>
         <artifactId>cloud-event-dispatcher-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
 	  <!-- ssc services -->
       <dependency>
         <artifactId>cloud-event-dispatcher</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>service-metric-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>system-event-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>system-event-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>alarm-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>alarm-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>status-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>client-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>client-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>routing-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
       <!-- Use in-memory DS for now, later switch to RDBMS -->
         <artifactId>routing-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <!-- Stream Processors -->
       <dependency>
         <artifactId>single-process-streams</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
             
       <dependency>
         <artifactId>provisioning-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>dashboard-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>adoption-metrics-sp</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-gateway-service-remote</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>port-forwarding-gateway-local</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
     

all-cloud-in-one-process/src/main/java/com/telecominfraproject/wlan/startuptasks/AllInOneStartListener.java

@@ -634,7 +634,7 @@ public class AllInOneStartListener implements ApplicationRunner {
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setPasspointVenueProfileId(passpointVenueProfileId);
         ((PasspointProfile) passpointHotspotConfig.getDetails()).setOsuSsidProfileId(profileSsidOpenId);
         ((PasspointProfile) passpointHotspotConfig.getDetails())
-                .setAssociatedAccessSsidProfileIds(List.of(profileSsidPskId));
+                .setAssociatedAccessSsidProfileIds(Set.of(profileSsidPskId));
 
         return profileServiceInterface.create(passpointHotspotConfig);
     }

client-datastore-cassandra/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-cassandra</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>client-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-cassandra-tests</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>client-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
          

client-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>client-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

client-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>client-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>client-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

client-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>client-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
     </dependencies>
 

client-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>system-event-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

client-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

client-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>client-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

client-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,41 +15,41 @@
       <dependency>
         <artifactId>client-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     <!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>client-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>client-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

client-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,29 +15,29 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>client-datastore-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>client-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 
@@ -45,7 +45,7 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

cloud-event-dispatcher-empty/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

cloud-event-dispatcher-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,72 +15,72 @@
       <dependency>
         <artifactId>base-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>customer-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>location-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>equipment-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>profile-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>portal-user-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>alarm-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>status-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>client-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>routing-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>firmware-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
     <dependency>
         <artifactId>manufacturer-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>      
 
     </dependencies>

cloud-event-dispatcher-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>cloud-event-dispatcher</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

cloud-event-dispatcher-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,97 +15,97 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 	<!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
           <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>equipment-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
           <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>base-stream-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>service-metric-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service-local</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>system-event-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
      

cloud-event-dispatcher/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,37 +15,37 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-stream-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>cloud-metrics</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>

cloud-event-dispatcher/src/main/resources/cloud-event-dispatcher-service-openapi.yaml

@@ -4982,10 +4982,6 @@ components:
 
     ClientMetrics:
       properties:
-        secondsSinceLastRecv:
-          type: integer
-          format: int32
-        
         numRxPackets:
           type: integer
           format: int64
@@ -5027,12 +5023,6 @@ components:
         sessionId:
           type: string
         
-        classificationName:
-          type: string
- 
-        channelBandWidth:
-          $ref: '#/components/schemas/ChannelBandwidth'
-        
         averageTxRate:
           type: number
           format: double
@@ -5048,21 +5038,11 @@ components:
           type: integer
           format: int64
         
-        rxLastRssi:
-          description: The RSSI of last frame received.
-          type: integer
-          format: int32
-        
         numRxNoFcsErr:
           description: The number of received frames without FCS errors.
           type: integer
           format: int32
 
-        numRxData:
-          description: The number of received data frames.
-          type: integer
-          format: int32
-        
         rxBytes:
           description: The number of received bytes.
           type: integer

cloud-services-build/pom.xml

@@ -3,7 +3,7 @@
         <parent>
                 <groupId>com.telecominfraproject.wlan</groupId>
                 <artifactId>tip-wlan-cloud-root-pom</artifactId>
-                <version>1.3.0-SNAPSHOT</version>
+                <version>1.2.0-SNAPSHOT</version>
         		<relativePath>../../wlan-cloud-root</relativePath>
         </parent>
 

customer-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>customer-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

customer-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,18 +15,18 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-datastore-inmemory</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>customer-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>customer-datastore-common-test</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

customer-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>customer-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
 	</dependencies>
 

customer-datastore-rdbms/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-jdbc</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>customer-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-jdbc-tests</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
          <dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>customer-datastore-common-test</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
          

customer-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>system-event-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

customer-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>customer-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

customer-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>customer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

customer-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,41 +15,41 @@
       <dependency>
         <artifactId>customer-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 	<!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>customer-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>customer-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

customer-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,24 +15,24 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>customer-datastore-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>cloud-metrics</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>

dashboard-sp/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,75 +15,75 @@
       <dependency>
         <artifactId>base-stream-consumer</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <!-- this is needed so that the stream processors can directly post messages to topics - to aggregate partial results, etc. -->
         <artifactId>base-stream-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>base-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>equipment-gateway-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>profile-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>alarm-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>status-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <!--  models used by the application logic of the stream processor -->

equipment-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>equipment-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

equipment-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>equipment-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>equipment-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

equipment-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>equipment-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
     </dependencies>
 

equipment-datastore-rdbms/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>equipment-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc-tests</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>equipment-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
          

equipment-datastore-rdbms/src/main/java/com/telecominfraproject/wlan/equipment/datastore/rdbms/EquipmentDAO.java

@@ -263,7 +263,8 @@ public class EquipmentDAO extends BaseJdbcDao {
                 },
                 keyHolder);
         }catch (DuplicateKeyException e) {
-            throw new DsDuplicateEntityException(e);
+            LOG.error("Duplicate equipment found", e);
+            throw new DsDuplicateEntityException("Equipment with the assetId " + equipment.getInventoryId() + " already exists!");
         }
         
         // keyHolder.getKey() now contains the generated key   

equipment-gateway-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>status-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
 			<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>firmware-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

equipment-gateway-service-empty/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>equipment-gateway-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
 </project>

equipment-gateway-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>equipment-gateway-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

equipment-gateway-service-interface/src/main/resources/equipment-gateway-service-openapi.yaml

@@ -344,7 +344,6 @@ components:
         - cyan
         - white
         - off
-
     CEGWBlinkRequest:
       description: Turn all LEDs on the AP to blinking, or turn off. The blinkAllLEDs attribute is the only currently supported functionality on the AP.
       allOf:

equipment-gateway-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
       <dependency>
         <artifactId>equipment-gateway-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>opensync-ext-cloud</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

equipment-gateway-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,54 +15,54 @@
       <dependency>
         <artifactId>equipment-gateway-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>routing-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 	<!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>routing-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>routing-service-remote</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>routing-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

equipment-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>system-event-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

equipment-models/src/main/java/com/telecominfraproject/wlan/equipment/models/CommonElementConfiguration.java

@@ -309,5 +309,4 @@ public abstract class CommonElementConfiguration extends EquipmentDetails implem
         this.blinkAllLEDs = blinkAllLEDs;
     }
     
-    
 }

equipment-models/src/main/java/com/telecominfraproject/wlan/equipment/models/ElementRadioConfiguration.java

@@ -1,6 +1,8 @@
 package com.telecominfraproject.wlan.equipment.models;
 
+import java.util.EnumMap;
 import java.util.HashSet;
+import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
@@ -49,6 +51,38 @@ public class ElementRadioConfiguration extends BaseJsonModel
     private Boolean deauthAttackDetection;
     private Set<ChannelPowerLevel> allowedChannelsPowerLevels = new HashSet<>();
     
+    public final static int DEFAULT_CHANNEL_NUMBER_2DOT4GHZ = 6;
+    public final static int DEFAULT_BACKUP_CHANNEL_NUMBER_2DOT4GHZ = 11;
+    public final static int DEFAULT_CHANNEL_NUMBER_5GHZ = 36;
+    public final static int DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZ = 44;
+    public final static int DEFAULT_CHANNEL_NUMBER_5GHZL = 36;
+    public final static int DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZL = 44;
+    public final static int DEFAULT_CHANNEL_NUMBER_5GHZU = 149;
+    public final static int DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZU = 157;
+    
+    private static final Map<RadioType, Integer> defaultChannelNumberMap = new EnumMap<>(RadioType.class);
+    private static final Map<RadioType, Integer> defaultBackupChannelNumberMap = new EnumMap<>(RadioType.class);
+    
+    static {
+        defaultChannelNumberMap.put(RadioType.is2dot4GHz, DEFAULT_CHANNEL_NUMBER_2DOT4GHZ);
+        defaultChannelNumberMap.put(RadioType.is5GHz, DEFAULT_CHANNEL_NUMBER_5GHZ);
+        defaultChannelNumberMap.put(RadioType.is5GHzL, DEFAULT_CHANNEL_NUMBER_5GHZL);
+        defaultChannelNumberMap.put(RadioType.is5GHzU, DEFAULT_CHANNEL_NUMBER_5GHZU);
+        
+        defaultBackupChannelNumberMap.put(RadioType.is2dot4GHz, DEFAULT_BACKUP_CHANNEL_NUMBER_2DOT4GHZ);
+        defaultBackupChannelNumberMap.put(RadioType.is5GHz, DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZ);
+        defaultBackupChannelNumberMap.put(RadioType.is5GHzL, DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZL);
+        defaultBackupChannelNumberMap.put(RadioType.is5GHzU, DEFAULT_BACKUP_CHANNEL_NUMBER_5GHZU);
+    }
+    
+    public static Integer getDefaultChannelNumber(RadioType radioType) {
+        return defaultChannelNumberMap.get(radioType);
+    }
+    
+    public static Integer getDefaultBackupChannelNumber(RadioType radioType) {
+        return defaultBackupChannelNumberMap.get(radioType);
+    }
+
     /**
      * Static creator
      *
@@ -60,19 +94,8 @@ public class ElementRadioConfiguration extends BaseJsonModel
 
         returnValue.setRadioType(radioType);
 
-        if (radioType == RadioType.is5GHz) {
+        returnValue.setChannelNumber(getDefaultChannelNumber(radioType));
-            returnValue.setChannelNumber(36);
+        returnValue.setBackupChannelNumber(getDefaultBackupChannelNumber(radioType));
-            returnValue.setBackupChannelNumber(149);
-        } else if (radioType == RadioType.is5GHzL) {
-            returnValue.setChannelNumber(36);
-            returnValue.setBackupChannelNumber(44);
-        } else if (radioType == RadioType.is5GHzU) {
-            returnValue.setChannelNumber(149);
-            returnValue.setBackupChannelNumber(157);
-        } else {
-            returnValue.setChannelNumber(6);
-            returnValue.setBackupChannelNumber(11);
-        }
 
         return returnValue;
     }

equipment-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>equipment-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

equipment-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
       <dependency>
         <artifactId>equipment-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>equipment-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

equipment-service-remote/pom.xml

@@ -1,9 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 
@@ -15,41 +17,41 @@
 		<dependency>
 			<artifactId>equipment-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>base-client</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<!-- Dependencies for the unit tests -->
 		<dependency>
 			<artifactId>base-remote-tests</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-service</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-datastore-inmemory</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-empty</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

equipment-service-remote/src/test/java/com/telecominfraproject/wlan/equipment/EquipmentServiceRemoteTest.java

@@ -36,11 +36,9 @@ import com.telecominfraproject.wlan.core.model.pagination.PaginationContext;
 import com.telecominfraproject.wlan.core.model.pagination.PaginationResponse;
 import com.telecominfraproject.wlan.core.model.pagination.SortOrder;
 import com.telecominfraproject.wlan.core.model.pair.PairLongLong;
-import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationException;
 import com.telecominfraproject.wlan.equipment.models.AntennaType;
 import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
 import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
-import com.telecominfraproject.wlan.equipment.models.ChannelPowerLevel;
 import com.telecominfraproject.wlan.equipment.models.CustomerEquipmentCounts;
 import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
 import com.telecominfraproject.wlan.equipment.models.Equipment;
@@ -623,94 +621,6 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
     	
     }
     
-    @Test
-    public void testEquipmentUpdateChannelNumValidation() {
-
-        //Create new Equipment - success
-        Equipment equipment = new Equipment();
-        equipment.setName("testName-"+getNextEquipmentId());
-        equipment.setInventoryId("test-inv-"+getNextEquipmentId());
-        equipment.setEquipmentType(EquipmentType.AP);
-        equipment.setDetails(ApElementConfiguration.createWithDefaults());
-
-        ElementRadioConfiguration element2dot4RadioConfig = ((ApElementConfiguration)equipment.getDetails()).getRadioMap().get(RadioType.is2dot4GHz);       
-        element2dot4RadioConfig.setAllowedChannelsPowerLevels(new HashSet<>());
-        
-        for (int i = 1; i <= 11; i++) {
-            ChannelPowerLevel cpl = new ChannelPowerLevel();
-            cpl.setChannelNumber(i);
-            cpl.setChannelWidth(20);
-            cpl.setDfs(false);
-            cpl.setPowerLevel(30);
-            element2dot4RadioConfig.getAllowedChannelsPowerLevels().add(cpl);
-        }
-
-        Equipment ret = remoteInterface.create(equipment);
-        assertNotNull(ret);
-
-        ret = remoteInterface.get(ret.getId());
-        assertEqualEquipments(equipment, ret);
-
-        ElementRadioConfiguration retElement2dot4RadioConfig = ((ApElementConfiguration)ret.getDetails()).getRadioMap().get(RadioType.is2dot4GHz);
-        assertEquals(retElement2dot4RadioConfig.getChannelNumber().intValue(), 6);
-
-        //Update success
-        retElement2dot4RadioConfig.setChannelNumber(1);
-        retElement2dot4RadioConfig.setManualChannelNumber(2);
-        retElement2dot4RadioConfig.setBackupChannelNumber(3);
-        retElement2dot4RadioConfig.setManualBackupChannelNumber(4);
-
-        Equipment updatedEquipment = remoteInterface.update(ret);
-
-        Equipment retUpdate = remoteInterface.get(ret.getId());
-        assertEqualEquipments(retUpdate, updatedEquipment);
-        ElementRadioConfiguration ret2Element2dot4RadioConfig = ((ApElementConfiguration)retUpdate.getDetails()).getRadioMap().get(RadioType.is2dot4GHz);
-        assertEquals(retElement2dot4RadioConfig.getChannelNumber().intValue(), 1);
-        assertEquals(retElement2dot4RadioConfig.getManualChannelNumber().intValue(), 2);
-        assertEquals(retElement2dot4RadioConfig.getBackupChannelNumber().intValue(), 3);
-        assertEquals(retElement2dot4RadioConfig.getManualBackupChannelNumber().intValue(), 4);
-
-        //Update failure
-        ret2Element2dot4RadioConfig.setChannelNumber(12);
-        try {
-        	remoteInterface.update(retUpdate);
-        	fail("EquipmentService update channelNumber failed");
-        } catch (DsDataValidationException e) {
-        	// pass
-        }
-        
-        ret2Element2dot4RadioConfig.setChannelNumber(6);
-        ret2Element2dot4RadioConfig.setManualChannelNumber(13);
-        try {
-        	remoteInterface.update(retUpdate);
-        	fail("EquipmentService update manualChannelNumber failed");
-        } catch (DsDataValidationException e) {
-        	// pass
-        }
-        
-        ret2Element2dot4RadioConfig.setManualChannelNumber(7);
-        ret2Element2dot4RadioConfig.setBackupChannelNumber(14);
-        try {
-        	remoteInterface.update(retUpdate);
-        	fail("EquipmentService update backupChannelNumber failed");
-        } catch (DsDataValidationException e) {
-        	// pass
-        }
-        
-        ret2Element2dot4RadioConfig.setBackupChannelNumber(8);
-        ret2Element2dot4RadioConfig.setManualBackupChannelNumber(15);
-        try {
-        	remoteInterface.update(retUpdate);
-        	fail("EquipmentService update manualBackupChannelNumber failed");
-        } catch (DsDataValidationException e) {
-        	// pass
-        }
-        
-        //Tolerate null now
-        ret2Element2dot4RadioConfig.setManualBackupChannelNumber(null);
-        remoteInterface.update(retUpdate);
-    }
-
     @Test
     public void testGetPaginatedEquipmentIds()
     {
@@ -869,7 +779,6 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
 
         // Clean up after test
         createdSet.forEach( c-> remoteInterface.delete(c));
-        
     }
     
     @Test
@@ -932,9 +841,9 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(11, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(36, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
             
         Map<RadioType, Integer> primaryChannels =  new EnumMap<>(RadioType.class);
         Map<RadioType, Integer> backupChannels =  new EnumMap<>(RadioType.class);
@@ -970,7 +879,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(6, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(36, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(40, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
         assertEquals(48, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
         
@@ -980,7 +889,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         
         backupChannels.clear();
         backupChannels.put(RadioType.is2dot4GHz, 6);
-        backupChannels.put(RadioType.is5GHz, 44);
+        backupChannels.put(RadioType.is5GHz, 149);
         
         autoChannelSelections.clear();
         autoChannelSelections.put(RadioType.is2dot4GHz, true);
@@ -1007,7 +916,7 @@ public class EquipmentServiceRemoteTest extends BaseRemoteTest {
         assertEquals(6, radioMap.get(RadioType.is2dot4GHz).getManualBackupChannelNumber().intValue());
         
         assertEquals(161, radioMap.get(RadioType.is5GHz).getChannelNumber().intValue());
-        assertEquals(44, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
+        assertEquals(149, radioMap.get(RadioType.is5GHz).getBackupChannelNumber().intValue());
         assertEquals(40, radioMap.get(RadioType.is5GHz).getManualChannelNumber().intValue());
         assertEquals(48, radioMap.get(RadioType.is5GHz).getManualBackupChannelNumber().intValue());
 

equipment-service/pom.xml

@@ -1,9 +1,11 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>com.telecominfraproject.wlan</groupId>
 		<artifactId>tip-wlan-cloud-root-pom</artifactId>
-		<version>1.3.0-SNAPSHOT</version>
+		<version>1.2.0-SNAPSHOT</version>
 		<relativePath>../../wlan-cloud-root</relativePath>
 	</parent>
 
@@ -15,42 +17,42 @@
 		<dependency>
 			<artifactId>alarm-service-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>base-container</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 
 		<dependency>
 			<artifactId>equipment-models</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>equipment-datastore-interface</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<artifactId>equipment-datastore-inmemory</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
 		<dependency>
 			<artifactId>cloud-event-dispatcher-empty</artifactId>
 			<groupId>com.telecominfraproject.wlan</groupId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

equipment-service/src/main/java/com/telecominfraproject/wlan/equipment/controller/EquipmentController.java

@@ -1,12 +1,10 @@
 package com.telecominfraproject.wlan.equipment.controller;
 
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,7 +32,6 @@ import com.telecominfraproject.wlan.datastore.exceptions.DsDataValidationExcepti
 import com.telecominfraproject.wlan.equipment.datastore.EquipmentDatastore;
 import com.telecominfraproject.wlan.equipment.models.ApElementConfiguration;
 import com.telecominfraproject.wlan.equipment.models.CellSizeAttributes;
-import com.telecominfraproject.wlan.equipment.models.ChannelPowerLevel;
 import com.telecominfraproject.wlan.equipment.models.CustomerEquipmentCounts;
 import com.telecominfraproject.wlan.equipment.models.ElementRadioConfiguration;
 import com.telecominfraproject.wlan.equipment.models.Equipment;
@@ -91,12 +88,7 @@ public class EquipmentController {
             throw new DsDataValidationException("Equipment contains unsupported value");
         }
 
-        long ts = System.currentTimeMillis();
+        updateValuesIfNeeded(equipment);
-        if (equipment.getCreatedTimestamp() == 0) {
-        	equipment.setCreatedTimestamp(ts);
-        }
-        equipment.setLastModifiedTimestamp(ts);
-
         Equipment ret = equipmentDatastore.create(equipment);
 
         LOG.debug("Created Equipment {}", ret);
@@ -108,6 +100,23 @@ public class EquipmentController {
         return ret;
     }
 
+    private void updateValuesIfNeeded(Equipment equipment) {
+        // strip out whitespaces from user entered inventoryId and name strings
+        if (equipment.getName() != null) {
+            equipment.setName(equipment.getName().strip());
+        }
+        if (equipment.getInventoryId() != null) {
+            equipment.setInventoryId(equipment.getInventoryId().strip());
+        }
+
+        // Update timestamp
+        long ts = System.currentTimeMillis();
+        if (equipment.getCreatedTimestamp() == 0) {
+            equipment.setCreatedTimestamp(ts);
+        }
+        equipment.setLastModifiedTimestamp(ts);
+    }
+
     /**
      * Retrieves Equipment by id
      * @param equipmentId
@@ -263,8 +272,6 @@ public class EquipmentController {
             throw new DsDataValidationException("Equipment contains unsupported value");
         }
         
-        validateChannelNum(equipment);
-        
         Equipment existingEquipment = equipmentDatastore.getOrNull(equipment.getId());
         ApElementConfiguration existingApElementConfig = null;
         if (existingEquipment != null && existingEquipment.getDetails() instanceof ApElementConfiguration) {
@@ -283,7 +290,9 @@ public class EquipmentController {
         if (ret.getCustomerId() != existingEquipment.getCustomerId()) {
             publishEvent(new EquipmentCustomerChangedEvent(existingEquipment, ret));
         }
-        if ((ret.getProfileId() != existingEquipment.getProfileId()) ||  (existingApElementConfig != null && updatedApElementConfig != null &&
+        if ((ret.getProfileId() != existingEquipment.getProfileId()) ||
+                ret.getLocationId() != existingEquipment.getLocationId() ||
+                (existingApElementConfig != null && updatedApElementConfig != null &&
                 updatedApElementConfig.needsToBeUpdatedOnDevice(existingApElementConfig))) {
             event = new EquipmentApImpactingChangedEvent(ret);
         } else if (existingApElementConfig != null && existingApElementConfig.isBlinkAllLEDs() != updatedApElementConfig.isBlinkAllLEDs()) {
@@ -297,39 +306,6 @@ public class EquipmentController {
         return ret;
     }
     
-	private void validateChannelNum(Equipment equipment) {
-		if (equipment.getDetails() instanceof ApElementConfiguration) {
-			ApElementConfiguration apElementConfiguration = (ApElementConfiguration) equipment.getDetails();
-			if (apElementConfiguration.getRadioMap() != null) {
-				for (RadioType radioType : apElementConfiguration.getRadioMap().keySet()) {
-
-					ElementRadioConfiguration elementRadioConfig = apElementConfiguration.getRadioMap().get(radioType);
-					Integer channelNum = elementRadioConfig.getChannelNumber();
-					Integer manualChannelNum = elementRadioConfig.getManualChannelNumber();
-					Integer backupChannelNum = elementRadioConfig.getBackupChannelNumber();
-					Integer manualBackupChannelNum = elementRadioConfig.getManualBackupChannelNumber();
-					
-					List<Integer> allowedChannels = elementRadioConfig.getAllowedChannelsPowerLevels().stream().map(ChannelPowerLevel::getChannelNumber).collect(Collectors.toList());
-					
-					if (allowedChannels != null && !allowedChannels.isEmpty()) {
-						checkAllowedChannels(channelNum, "channelNumber", allowedChannels);
-						checkAllowedChannels(backupChannelNum, "backupChannelNumber", allowedChannels);
-						checkAllowedChannels(manualChannelNum, "manualChannelNumber", allowedChannels);
-						checkAllowedChannels(manualBackupChannelNum, "manualBackupChannelNumber", allowedChannels);
-					}
-				}
-			}
-		}
-	}
-	
-	private void checkAllowedChannels(Integer channelNum, String channelType, List<Integer> allowedChannels) {
-		if (channelNum != null && !allowedChannels.contains(channelNum)) {
-			LOG.error("Failed to update Equipment. The {} ({}) is out of the allowed channels range {}",
-					channelType, channelNum, allowedChannels);
-			throw new DsDataValidationException("Equipment contains disallowed " + channelType);
-		}
-	}
-	
     /**
      * Updates Equipment Channels
      *
@@ -572,25 +548,13 @@ public class EquipmentController {
         Set<Long> equipmentIds = new HashSet<>();
         request.getItems().forEach(item -> equipmentIds.add(item.getEquipmentId()));
         
-        //validate equipment before the bulk update
-        List<Equipment> equipmentBeforeUpdate = equipmentDatastore.get(equipmentIds);
-        Map<Long, Equipment> eqMap = new HashMap<>();        
-        equipmentBeforeUpdate.forEach(eq -> eqMap.put(eq.getId(), eq));
-        
-        request.getItems().forEach(item -> {
-        	Equipment eq = eqMap.get(item.getEquipmentId());
-        	if(item.applyToEquipment(eq)) {
-        		validateChannelNum(eq);
-        	}
-        });
-        
         equipmentDatastore.updateRrmBulk(request);
 
         //send events after the bulk update
         List<Equipment> equipmentAfterUpdate = equipmentDatastore.get(equipmentIds);
 
         List<SystemEvent> events = new ArrayList<>();
-        equipmentAfterUpdate.forEach(eq -> events.add(new EquipmentChangedEvent(eq)));
+        equipmentAfterUpdate.forEach(eq -> events.add(new EquipmentApImpactingChangedEvent(eq)));
         publishEvents(events);
 
         return new GenericResponse(true, "");

equipment-service/src/test/java/com/telecominfraproject/wlan/equipment/controller/EquipmentControllerTest.java

@@ -72,10 +72,32 @@ public class EquipmentControllerTest {
         
     }
 
-    private void assertEqualEquipments(
+    @Test
-            Equipment expected,
+    public void testEquipmentCRUD_ValidateSpaceInInputString() {
-            Equipment actual) {
 
+        //Create new Equipment - success
+        Equipment equipment = new Equipment();
+        equipment.setName("    nameAndInventoryIdWithTrailingSpaces   ");
+        equipment.setInventoryId("   C4411EAA31F5   ");
+        equipment.setEquipmentType(EquipmentType.AP);
+
+        Equipment ret = equipmentController.create(equipment);
+        assertNotNull(ret);
+
+        ret = equipmentController.get(ret.getId());
+        assertEqualEquipments(equipment, ret);
+
+        ret = equipmentController.getOrNull(ret.getId());
+        assertEqualEquipments(equipment, ret);
+
+        assertNull(equipmentController.getOrNull(-1));
+
+        //Delete - success
+        equipmentController.delete(ret.getId());
+
+    }
+
+    private void assertEqualEquipments(Equipment expected, Equipment actual) {
         assertEquals(expected.getName(), actual.getName());
         //TODO: add more fields to check here
     }

filestore-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,13 +15,13 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

firmware-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>firmware-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

firmware-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>firmware-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>firmware-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>

firmware-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>firmware-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
     </dependencies>
 

firmware-datastore-rdbms/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>firmware-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-jdbc-tests</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>firmware-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
          

firmware-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>system-event-models</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
     </dependencies>
 

firmware-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>firmware-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

firmware-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -16,13 +16,13 @@
       <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>firmware-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

firmware-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,41 +15,41 @@
       <dependency>
         <artifactId>firmware-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     <!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>firmware-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>firmware-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

firmware-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,29 +15,29 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     <dependency>
         <artifactId>firmware-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>firmware-datastore-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
     </dependency>
     <dependency>
         <artifactId>firmware-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
     </dependency>
 
@@ -45,7 +45,7 @@
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

kafka-streams-consumer/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,25 +15,25 @@
       <dependency>
         <artifactId>base-stream-consumer</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>cloud-metrics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>

kafka-streams/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,25 +15,25 @@
       <dependency>
         <artifactId>base-stream-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>service-metric-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>system-event-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <groupId>com.telecominfraproject.wlan</groupId>
         <artifactId>cloud-metrics</artifactId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>

location-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>location-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

location-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,18 +15,18 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-datastore-inmemory</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>location-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>location-datastore-common-test</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 	</dependencies>

location-datastore-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>location-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
                 <dependency>
                         <groupId>com.telecominfraproject.wlan</groupId>
                         <artifactId>base-exceptions</artifactId>
-                        <version>1.3.0-SNAPSHOT</version>
+                        <version>1.2.0-SNAPSHOT</version>
                 </dependency>
 	</dependencies>
 

location-datastore-rdbms/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,26 +15,26 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-jdbc</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>location-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
 
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-jdbc-tests</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
 
          <dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>location-datastore-common-test</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 			<scope>test</scope>
 		</dependency>
          

location-models/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>base-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>system-event-models</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 	</dependencies>
 

location-models/src/main/java/com/telecominfraproject/wlan/location/models/events/LocationChangedApImpactingEvent.java

@@ -1,30 +0,0 @@
-package com.telecominfraproject.wlan.location.models.events;
-
-import com.telecominfraproject.wlan.core.model.json.interfaces.HasLocationId;
-import com.telecominfraproject.wlan.location.models.Location;
-import com.telecominfraproject.wlan.systemevent.models.CustomerEventWithPayload;
-
-public class LocationChangedApImpactingEvent extends CustomerEventWithPayload<Location> implements HasLocationId {
-	private static final long serialVersionUID = -8369849230866347412L;
-
-	public LocationChangedApImpactingEvent(Location location){
-		super(location.getCustomerId(), location);
-    }
-    
-    @Override
-    public long getLocationId() {
-        if (getPayload() != null) {
-            return getPayload().getId();
-        }
-        
-        return 0;
-    }
-    
-    /**
-     * Constructor used by JSON
-     */
-    public LocationChangedApImpactingEvent() {
-    	super(0, 0, null);
-    }
-    
-}

location-service-interface/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
       <dependency>
         <artifactId>location-models</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
     </dependencies>
         

location-service-local/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,12 +15,12 @@
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>location-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
     </dependencies>

location-service-remote/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,41 +15,41 @@
       <dependency>
         <artifactId>location-service-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       
       <dependency>
         <artifactId>base-client</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
 	<!-- Dependencies for the unit tests -->
       <dependency>
         <artifactId>base-remote-tests</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
       
       <dependency>
         <artifactId>location-service</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>location-datastore-inmemory</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 
       <dependency>
         <artifactId>cloud-event-dispatcher-empty</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
         <scope>test</scope>
       </dependency>
 

location-service-remote/src/test/java/com/telecominfraproject/wlan/location/service/LocationServiceRemoteTest.java

@@ -80,7 +80,7 @@ public class LocationServiceRemoteTest extends BaseRemoteTest {
         location.setLocationType(LocationType.FLOOR);
         location.setCustomerId(getNextCustomerId());
         location.setName("testName_updated");
-        location.setDetails(generateDetails(CountryCode.US));
+        location.setDetails(generateDetails(CountryCode.CA));
 
         Location retFromUpdate = testInterface.update(location);
         assertFieldEquals(location, retFromUpdate);
@@ -95,6 +95,14 @@ public class LocationServiceRemoteTest extends BaseRemoteTest {
         	// expected it
         }
 
+        //UPDATE test - fail because country code cannot be modified once created
+        try {
+            location.setDetails(generateDetails(CountryCode.US));
+            testInterface.update(location);
+            fail("failed to detect country code update");
+        } catch (IllegalStateException e) {
+            // expected it
+        }
         
         //DELETE Test
         testInterface.delete(ret.getId());

location-service/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,24 +15,24 @@
       <dependency>
         <artifactId>base-container</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
       <dependency>
         <artifactId>location-datastore-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
       <dependency>
         <artifactId>cloud-event-dispatcher-interface</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>      
 
       <dependency>
         <artifactId>cloud-metrics</artifactId>
         <groupId>com.telecominfraproject.wlan</groupId>
-        <version>1.3.0-SNAPSHOT</version>
+        <version>1.2.0-SNAPSHOT</version>
       </dependency>
 
     </dependencies>

location-service/src/main/java/com/telecominfraproject/wlan/location/service/LocationServiceController.java

@@ -25,7 +25,6 @@ import com.telecominfraproject.wlan.datastore.exceptions.DsEntityNotFoundExcepti
 import com.telecominfraproject.wlan.location.datastore.LocationDatastore;
 import com.telecominfraproject.wlan.location.models.Location;
 import com.telecominfraproject.wlan.location.models.events.LocationAddedEvent;
-import com.telecominfraproject.wlan.location.models.events.LocationChangedApImpactingEvent;
 import com.telecominfraproject.wlan.location.models.events.LocationChangedEvent;
 import com.telecominfraproject.wlan.location.models.events.LocationRemovedEvent;
 import com.telecominfraproject.wlan.systemevent.models.SystemEvent;
@@ -98,13 +97,14 @@ public class LocationServiceController {
         
         Location existingLocation = locationDatastore.get(location.getId());
         
+        if (location.needsToBeUpdatedOnDevice(existingLocation)) {
+        	throw new IllegalStateException("Cannot update location. Country code is not allow to modify once created.");
+        }
+
         Location ret = locationDatastore.update(location);
         
         List<SystemEvent> events = new ArrayList<>();
         
-        if (ret.needsToBeUpdatedOnDevice(existingLocation)) {
-        	events.add(new LocationChangedApImpactingEvent(ret));
-        }
         events.add(new LocationChangedEvent(ret));
         
         publishEvents(events);

manufacturer-datastore-common-test/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,7 +15,7 @@
 		<dependency>
 			<groupId>com.telecominfraproject.wlan</groupId>
 			<artifactId>manufacturer-datastore-interface</artifactId>
-			<version>1.3.0-SNAPSHOT</version>
+			<version>1.2.0-SNAPSHOT</version>
 		</dependency>
 		<dependency>
 			<groupId>junit</groupId>

manufacturer-datastore-inmemory/pom.xml

@@ -3,7 +3,7 @@
   <parent>
     <groupId>com.telecominfraproject.wlan</groupId>
     <artifactId>tip-wlan-cloud-root-pom</artifactId>
-    <version>1.3.0-SNAPSHOT</version>
+    <version>1.2.0-SNAPSHOT</version>
     <relativePath>../../wlan-cloud-root</relativePath>
   </parent>
 
@@ -15,19 +15,19 @@
         <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>base-datastore-inmemory</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
         </dependency>
         
          <dependency>
                  <groupId>com.telecominfraproject.wlan</groupId>
                  <artifactId>manufacturer-datastore-interface</artifactId>
-                 <version>1.3.0-SNAPSHOT</version>
+                 <version>1.2.0-SNAPSHOT</version>
          </dependency>
                 
          <dependency>
             <groupId>com.telecominfraproject.wlan</groupId>
             <artifactId>manufacturer-datastore-common-test</artifactId>
-            <version>1.3.0-SNAPSHOT</version>
+            <version>1.2.0-SNAPSHOT</version>
             <scope>test</scope>
         </dependency>
     </dependencies>