Change in vdsm[master]: schema: bridges was added to VdsmCapabilities
agl at us.ibm.com
agl at us.ibm.com
Fri Jan 25 17:31:07 UTC 2013
Adam Litke has uploaded a new change for review.
Change subject: schema: bridges was added to VdsmCapabilities
......................................................................
schema: bridges was added to VdsmCapabilities
In 1fa30a, Dan added a new field 'bridges' to VdsmCapabilities but did not
update the schema to reflect it. At the moment we are not checking for
extraneous fields in our types so I just caught it now by chance.
Change-Id: Ib12a7d89c71e6946d12b1a4cb580be1458c280eb
Signed-off-by: Adam Litke <agl at us.ibm.com>
---
M vdsm/netinfo.py
M vdsm_api/vdsmapi-schema.json
2 files changed, 14 insertions(+), 1 deletion(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/11396/1
diff --git a/vdsm/netinfo.py b/vdsm/netinfo.py
index c8496db..df6a19f 100644
--- a/vdsm/netinfo.py
+++ b/vdsm/netinfo.py
@@ -316,6 +316,7 @@
'stp': bridge_stp_state(bridge),
'addr': getaddr(bridge),
'netmask': getnetmask(bridge),
+ 'gateway': routes.get(bridge, '0.0.0.0'),
'mtu': getMtu(bridge),
'cfg': getIfaceCfg(bridge),
})
diff --git a/vdsm_api/vdsmapi-schema.json b/vdsm_api/vdsmapi-schema.json
index 9e92bd8..1baffe2 100644
--- a/vdsm_api/vdsmapi-schema.json
+++ b/vdsm_api/vdsmapi-schema.json
@@ -809,6 +809,16 @@
'key': 'str', 'value': 'NetInfoNetwork'}
##
+# @NetInfoBridgeMap:
+#
+# A mapping of NIC information indexed by device name.
+#
+# Since: 4.10.0
+##
+{'map': 'NetInfoBridgeMap',
+ 'key': 'str', 'value': 'NetInfoBridgedNetwork'}
+
+##
# @NetInfoNicMap:
#
# A mapping of NIC information indexed by device name.
@@ -891,6 +901,8 @@
#
# @networks: Information about configured VDSM networks
#
+# @bridges: Information about the network bridges on the host
+#
# @nics: Information about the network cards on the host
#
# @bondings: Information about configured bonding devices
@@ -933,7 +945,7 @@
'cpuFlags': 'str', 'version_name': 'str', 'software_version': 'str',
'software_revision': 'str', 'supportedENGINEs': ['str'],
'supportedProtocols': ['str'], 'clusterLevels': ['str'],
- 'networks': 'NetInfoNetworkMap',
+ 'networks': 'NetInfoNetworkMap', 'bridges': 'NetInfoBridgeMap',
'nics': 'NetInfoNicMap', 'bondings': 'NetInfoBondMap',
'vlans': 'NetInfoVlanMap', '*hooks': 'HookScriptInfoMap',
'operatingSystem': 'OsVersion', 'uuid': 'str',
--
To view, visit http://gerrit.ovirt.org/11396
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib12a7d89c71e6946d12b1a4cb580be1458c280eb
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