backend/server/rhnServer/server_hardware.py |
22 +++++-----
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java |
14 +++---
2 files changed, 20 insertions(+), 16 deletions(-)
New commits:
commit 5823ba4825f09b29cfd9357155428213d52042c9
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 18:18:42 2011 +0100
IPv6: delete address which no longer exists for this interface
diff --git a/backend/server/rhnServer/server_hardware.py
b/backend/server/rhnServer/server_hardware.py
index 972aeed..19beaa7 100644
--- a/backend/server/rhnServer/server_hardware.py
+++ b/backend/server/rhnServer/server_hardware.py
@@ -457,19 +457,23 @@ class NetIfaceInformation(Device):
log_debug(4, "Updates", updates)
log_debug(4, "Inserts", inserts)
- self._delete(deletes)
self._update(updates)
self._insert(inserts)
ifaces = self.ifaces.copy()
for name, info in ifaces.items():
- if 'ipv6' in info:
- info['ipv6'].save(self.get_server_id(server_id, name))
- else:
- pass # wipe old records if any
- if 'ipv4' in info:
- info['ipv4'].save(self.get_server_id(server_id, name))
- else:
- pass # wipe old records if any
+ if not 'ipv6' in info:
+ info['ipv6'] = NetIfaceAddress6()
+ info['ipv6'].save(self.get_server_id(server_id, name))
+ if not 'ipv4' in info:
+ info['ipv4'] = NetIfaceAddress4()
+ info['ipv4'].save(self.get_server_id(server_id, name))
+ # delete address (if any) of deleted interaces
+ for d in deletes:
+ interface = NetIfaceAddress6()
+ interface.save(self.get_server_id(server_id, d['name']))
+ interface = NetIfaceAddress4()
+ interface.save(self.get_server_id(server_id, d['name']))
+ self._delete(deletes)
return 0
def get_server_id(self, server_id, name):
commit 491ea371e2379a5dfdb91f295fbdff618aac2565
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Nov 21 17:13:58 2011 +0100
make lines shorter
addressing;
./code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java:49:
Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java:50:
Line is longer than 92 characters.
diff --git
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
index cad29eb..fb420d9 100644
---
a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
+++
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/NetworkInterfaceSerializer.java
@@ -44,13 +44,13 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop_desc("string", "module", "Network driver used
for this device.")
* #prop_desc("string", "broadcast", " Broadcast
address for device.")
* #prop_desc("array", "ipv6", "List of IPv6
addresses")
- * #array()
- * #struct("ipv6 address")
- * #prop_desc("string", "address", "IPv6
address of this network device")
- * #prop_desc("string", "netmask", "IPv6
netmask of this network device")
- * #prop_desc("string", "scope", "IPv6
address scope")
- * #struct_end()
- * #array_end()
+ * #array()
+ * #struct("ipv6 address")
+ * #prop_desc("string", "address", "IPv6 address
of this network device")
+ * #prop_desc("string", "netmask", "IPv6 netmask
of this network device")
+ * #prop_desc("string", "scope", "IPv6 address
scope")
+ * #struct_end()
+ * #array_end()
* #struct_end()
*
*/
Show replies by date