commit ed84e7b42e9941cf2b8603d9f19fc7b0667240ea
author Saurav Das <saurav.das@opennetworking.org> Sat Sep 12 14:49:27 2020 -0700
committer Matteo Scandolo <teo@opennetworking.org> Mon Sep 14 09:48:54 2020 -0700
tree 566e2d389ae300fa7a5bae3df41fbe037fa75738
parent 5feec9fc01b9a6ecc2de52647472cea98ab4eae9

Adding vlanId to dhcp allocations command

Change-Id: I90e41001b227aa9507438d6127d1a94715913a36
(cherry picked from commit a94531f19d0df0d7900d2db0eac8e583717092ba)

.gitreview

diff --git a/.gitreview b/.gitreview
index 9c300e2..dfac1ec 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=dhcpl2relay.git
 defaultremote=origin
+defaultbranch=dhcpl2relay-2.2

api/pom.xml

diff --git a/api/pom.xml b/api/pom.xml
index 41f5555..4ba8abf 100644
--- a/api/pom.xml
+++ b/api/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dhcpl2relay</artifactId>
         <groupId>org.opencord</groupId>
-        <version>2.2.0</version>
+        <version>2.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

app/pom.xml

diff --git a/app/pom.xml b/app/pom.xml
index 9c2ac97..96c53d3 100644
--- a/app/pom.xml
+++ b/app/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <artifactId>dhcpl2relay</artifactId>
         <groupId>org.opencord</groupId>
-        <version>2.2.0</version>
+        <version>2.2.1-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java

diff --git a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
index 891e4fb..cf9776b 100644
--- a/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
+++ b/app/src/main/java/org/opencord/dhcpl2relay/cli/DhcpL2RelayAllocationsCommand.java
@@ -32,10 +32,12 @@
         DhcpL2RelayService service = get(DhcpL2RelayService.class);
 
         service.getAllocationInfo().forEach((key, value) -> {
-            print("SubscriberId=%s,ConnectPoint=%s,State=%s,MAC=%s,CircuitId=%s" +
-                            ",IP Allocated=%s,Allocation Timestamp=%s",
-                    value.subscriberId(), value.location(), value.type(), value.macAddress().toString(),
-                    value.circuitId(), value.ipAddress().getIp4Address().toString(), value.allocationTime().toString());
+            print("SubscriberId=%s,ConnectPoint=%s,State=%s,MAC=%s,VLAN=%s"
+                    + "CircuitId=%s,IP Allocated=%s,Allocation Timestamp=%s",
+                    value.subscriberId(), value.location(), value.type(),
+                    value.macAddress().toString(), value.vlanId().toString(),
+                    value.circuitId(), value.ipAddress().getIp4Address().toString(),
+                    value.allocationTime().toString());
         });
     }
 }

pom.xml

diff --git a/pom.xml b/pom.xml
index 39bb806..7a0bd51 100755
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
 
     <groupId>org.opencord</groupId>
     <artifactId>dhcpl2relay</artifactId>
-    <version>2.2.0</version>
+    <version>2.2.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <description>DHCP L2 Relay Agent</description>