Changeset 1705:e98c58e12e4a
- Timestamp:
- 07/22/08 14:32:18 (7 weeks ago)
- Author:
- klai@…
- Branch:
- default
- Message:
-
Handle ethX, X!=0 cases correctly. (from rik@…)
- Location:
- src/Tycoon/Virtualization
- Files:
-
Legend:
- Unmodified
- Added
- Removed
-
|
r1693
|
r1705
|
|
| 59 | 59 | # Defaults |
| 60 | 60 | self.__iface_netdev = "eth0" |
| | 61 | self.__iface_vif = "vif0.0" |
| 61 | 62 | self.__iface_bridge = "xenbr0" |
| 62 | 63 | |
| … |
… |
|
| 202 | 203 | else: |
| 203 | 204 | self.__iface_netdev = netdev |
| | 205 | if re.compile("eth[0-9]+").match(netdev) is None: |
| | 206 | INFO('Do not know how to handle non eth device names.') |
| | 207 | else: |
| | 208 | self.__iface_vif = "vif0." + netdev[3:] |
| 204 | 209 | if bridge == None: |
| 205 | 210 | # Use version dependent defaults |
| … |
… |
|
| 467 | 472 | return self.__iface_netdev |
| 468 | 473 | |
| | 474 | def get_vif_interface(self): |
| | 475 | return self.__iface_vif |
| | 476 | |
| 469 | 477 | ################################################## |
| 470 | 478 | |
-
|
r1695
|
r1705
|
|
| 562 | 562 | if len(v) >= 1: |
| 563 | 563 | self.__info = v[0] |
| | 564 | self.__iface_vif = self.__xen_main.get_vif_interface() |
| 564 | 565 | super(XenIPv4Address, self).__init__(__instances, 1, False) |
| 565 | 566 | |
| … |
… |
|
| 582 | 583 | |
| 583 | 584 | # Make sure domain 0 can send/receive |
| 584 | | system_log("/sbin/ebtables -A FORWARD -o vif0.0 -j ACCEPT") |
| 585 | | system_log("/sbin/ebtables -A FORWARD -i vif0.0 -j ACCEPT") |
| | 585 | system_log("/sbin/ebtables -A FORWARD -o %s -j ACCEPT" % |
| | 586 | self.__iface_vif) |
| | 587 | system_log("/sbin/ebtables -A FORWARD -i %s -j ACCEPT" % |
| | 588 | self.__iface_vif) |
| 586 | 589 | |
| 587 | 590 | # Shutdown all bridged sending/receiving from domains |
