Change in vdsm[master]: netinfo: Items in the 'bridges' dict are missing the 'bridge...

agl at us.ibm.com agl at us.ibm.com
Wed Jan 30 21:35:26 UTC 2013


Adam Litke has uploaded a new change for review.

Change subject: netinfo: Items in the 'bridges' dict are missing the 'bridged' field
......................................................................

netinfo: Items in the 'bridges' dict are missing the 'bridged' field

According to the schema, VdsmCapabilities contains a 'bridges' entry which is a
map of NetInfoBridge items.  NetInfoBridge is supposed to contain the member
'bridged' which is the field that distinguishes a bridged network from a
bridgeless one.  Add this field to the NetInfoBridge items in 'bridges' in order
to comply with the schema.

Signed-off-by: Adam Litke <agl at us.ibm.com>
Change-Id: I4dfa57649e545dbdf490fec1bb7bf3012b509a40
---
M vdsm/netinfo.py
M vdsm_api/vdsmapi-schema.json
2 files changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/11567/1

diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py
index df6a19f..1528374 100644
--- a/vdsm/netinfo.py
+++ b/vdsm/netinfo.py
@@ -319,6 +319,7 @@
                                    'gateway': routes.get(bridge, '0.0.0.0'),
                                    'mtu': getMtu(bridge),
                                    'cfg': getIfaceCfg(bridge),
+                                   'bridged': True,
                                    })
                          for bridge in bridges()])
 
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index b4eb825..a863b19 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -583,11 +583,13 @@
 # @permhwaddr:  #optional For bonded nics: the real MAC address which will be
 #               used if the card is freed from the bond.
 #
+# @cfg:         Raw device configuration parameters
+#
 # Since: 4.10.0
 ##
 {'type': 'NetInfoNic',
  'data': {'speed': 'int', 'addr': 'str', 'netmask': 'str', 'hwaddr': 'str',
-          'mtu': 'uint', '*permhwaddr': 'str'}}
+          'mtu': 'uint', '*permhwaddr': 'str', 'cfg': 'StringMap'}}
 
 ##
 # @NetInfoBond:


--
To view, visit http://gerrit.ovirt.org/11567
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I4dfa57649e545dbdf490fec1bb7bf3012b509a40
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <agl at us.ibm.com>


More information about the vdsm-patches mailing list