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(" ") returnxml.append(" " % bridged_inter["device"]) returnxml.append(" " % bridged_inter["mac"]) + returnxml.append(" ") + returnxml.append(" " % bridged_inter["ip"]) + returnxml.append(" ") if bridged_inter["module"] == 'ovs-bridge': returnxml.append(" ") 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, 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