nodenetworks are gone, welcome to interfaces

diff --git a/db-config b/db-config
index 08c3434..6c17325 100755 (executable)
--- a/db-config
+++ b/db-config
@@ -588,15 +588,15 @@ def main():
 
 
     # Get list of existing attribute types
-    setting_types = GetNodeNetworkSettingTypes()
+    setting_types = GetInterfaceSettingTypes()
     setting_types = [setting_type['name'] for setting_type in setting_types]
 
     # Create/update default slice setting types
     for default_setting_type in default_setting_types:
         if default_setting_type['name'] not in setting_types:
-            AddNodeNetworkSettingType(default_setting_type)
+            AddInterfaceSettingType(default_setting_type)
         else:
-            UpdateNodeNetworkSettingType(default_setting_type['name'], default_setting_type)
+            UpdateInterfaceSettingType(default_setting_type['name'], default_setting_type)
 
     # Create/update system slices
     default_slices = [

diff --git a/dns-config b/dns-config
index e03b4a9..401a3a7 100755 (executable)
--- a/dns-config
+++ b/dns-config
@@ -56,24 +56,24 @@ def main():
     for node in GetNodes():
         nodes[node['node_id']] = node
 
-    nodenetwork_ids = set()
+    interface_ids = set()
     for node in nodes.values():
-        nodenetwork_ids.update(node['nodenetwork_ids'])
+        interface_ids.update(node['interface_ids'])
 
-    for nodenetwork in GetNodeNetworks(list(nodenetwork_ids)):
-        if not nodenetwork['ip']:
+    for interface in GetInterfaces(list(interface_ids)):
+        if not interface['ip']:
             continue
 
-        if nodenetwork['hostname']:
-            hostname = nodenetwork['hostname']
+        if interface['hostname']:
+            hostname = interface['hostname']
         else:
-            hostname = nodes[nodenetwork['node_id']]['hostname']
+            hostname = nodes[interface['node_id']]['hostname']
 
-        if hosts.has_key(nodenetwork['ip']):
-            if hostname not in hosts[nodenetwork['ip']]:
-                hosts[nodenetwork['ip']].append(hostname)
+        if hosts.has_key(interface['ip']):
+            if hostname not in hosts[interface['ip']]:
+                hosts[interface['ip']].append(hostname)
         else:
-            hosts[nodenetwork['ip']] = [hostname]
+            hosts[interface['ip']] = [hostname]
     
     # Write /etc/plc_hosts
     plc_hosts = open("/etc/plc_hosts", "w")