From 5b646bf839c683b805d354e0259c40fb8f4951b2 Mon Sep 17 00:00:00 2001
From: Dmitry Mishin <dmitry.mishin@gmail.com>
Date: Thu, 22 Sep 2016 16:52:54 -0700
Subject: [PATCH 1/2] This resolves
 https://github.com/sdsc/nucleus-roll/issues/12 Public IP isolation for guest
 frontend VMs

---
 .../rocks/commands/report/host/vm/config/__init__.py           | 3 +++
 src/rocks-command/rocks/db/vmextend.py                         | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/rocks-command/rocks/commands/report/host/vm/config/__init__.py b/src/rocks-command/rocks/commands/report/host/vm/config/__init__.py
index ddb57d1..8be18b6 100644
--- a/src/rocks-command/rocks/commands/report/host/vm/config/__init__.py
+++ b/src/rocks-command/rocks/commands/report/host/vm/config/__init__.py
@@ -194,6 +194,9 @@ def getInterfaces(self, node):
 			returnxml.append("    <interface type='bridge'>")
 			returnxml.append("      <source bridge='%s'/>" % bridged_inter["device"])
 			returnxml.append("      <mac address='%s'/>" % bridged_inter["mac"])
+			returnxml.append("      <filterref filter='clean-traffic'>")
+			returnxml.append("        <parameter name='IP' value='%s'/>" % bridged_inter["ip"])
+			returnxml.append("      </filterref>")
 			if bridged_inter["module"] == 'ovs-bridge':
 				returnxml.append("      <virtualport type='openvswitch'/>")
 			else:
diff --git a/src/rocks-command/rocks/db/vmextend.py b/src/rocks-command/rocks/db/vmextend.py
index a4756c2..828bb9c 100644
--- a/src/rocks-command/rocks/db/vmextend.py
+++ b/src/rocks-command/rocks/db/vmextend.py
@@ -81,7 +81,7 @@ def getPhysBridgedDevicefromVnode(self, node):
 	# now find the physical device name corresponding to the subnets
 	# found in the previous query (Network table)
 	networkvirtual = sqlalchemy.orm.aliased(Network)
-	devices = s.query(Network.device, Network.vlanID, networkvirtual.mac, Network.options, Network.module).filter(
+	devices = s.query(Network.device, Network.vlanID, networkvirtual.mac, Network.options, Network.module, networkvirtual.ip).filter(
 			Network.node == node.vm_defs.physNode,
 			networkvirtual.node == node,
 			Network.subnet_ID == networkvirtual.subnet_ID,

From 8c3dd82faf484b9e3300512052657e8486015db3 Mon Sep 17 00:00:00 2001
From: Dmitry Mishin <dmitry.mishin@gmail.com>
Date: Wed, 2 Nov 2016 15:31:09 -0700
Subject: [PATCH 2/2] Bump up release for rocks commands

---
 src/rocks-command/version.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/rocks-command/version.mk b/src/rocks-command/version.mk
index 1bf627d..ba1b94d 100644
--- a/src/rocks-command/version.mk
+++ b/src/rocks-command/version.mk
@@ -1,2 +1,2 @@
 NAME	= rocks-command-kvm
-RELEASE	= 3.1
+RELEASE	= 3.2