diff options
| author | Ben Pfaff <blp@nicira.com> | 2010-09-01 16:49:19 -0700 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-09-01 16:49:19 -0700 |
| commit | e61070c32030d6d00e2eeae213d219320a7cbd10 (patch) | |
| tree | ceee6e5bfd7e315a51f4f6a9182bd7e7e9e7a604 | |
| parent | c9b5816cfd8fccc2abedd258d914882033bfcf0a (diff) | |
| download | openvswitch-e61070c32030d6d00e2eeae213d219320a7cbd10.tar.gz | |
Rename "xs-vif-mac" external_ids key to "attached-mac", for generality.
This can be useful on systems other than XenServer so there is no reason
to make it looks XenServer-specific.
CC: Jeremy Stribling <strib@nicira.com>
Signed-off-by: Ben Pfaff <blp@nicira.com>
| -rw-r--r-- | vswitchd/vswitch.xml | 15 | ||||
| -rwxr-xr-x | xenserver/etc_xensource_scripts_vif | 2 |
2 files changed, 9 insertions, 8 deletions
diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml index 38dc6a1aa..979fd5dfe 100644 --- a/vswitchd/vswitch.xml +++ b/vswitchd/vswitch.xml @@ -665,8 +665,15 @@ integrators should either use the Open vSwitch development mailing list to coordinate on common key-value definitions, or choose key names that are likely to be unique. The currently - defined common key-value pair is: + defined common key-value pairs are: <dl> + <dt><code>attached-mac</code></dt> + <dd> + The MAC address programmed into the ``virtual hardware'' for this + interface, in the form + <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>. + For Citrix XenServer, this is the value of the <code>MAC</code> + field in the VIF record for this interface.</dd> <dt><code>iface-id</code></dt> <dd>A system-unique identifier for the interface. On XenServer, this will commonly be the same as <code>xs-vif-uuid</code>.</dd> @@ -689,12 +696,6 @@ <dd>The virtual network to which this interface is attached.</dd> <dt><code>xs-vm-uuid</code></dt> <dd>The VM to which this interface belongs.</dd> - <dt><code>xs-vif-mac</code></dt> - <dd>The MAC address programmed into the "virtual hardware" for this - interface, in the - form <var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>:<var>xx</var>. - For Citrix XenServer, this is the value of the <code>MAC</code> - field in the VIF record for this interface.</dd> </dl> </column> diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 91b75c123..f27ff5b40 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -114,7 +114,7 @@ handle_vswitch_vif_details() local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null) if [ -n "${address}" ] ; then - set_vif_external_id "xs-vif-mac" "${address}" + set_vif_external_id "attached-mac" "${address}" fi if $xs550; then |