Fix count entries added to /etc/hosts

Author: cscarpitta

nets/8r-1c-in-band-isis/isis8d.py

@@ -237,7 +237,8 @@ def add_nodes_to_etc_hosts():
     # Import host-ip mapping defined in etc-hosts file
     count = etc_hosts.import_file(ETC_HOSTS_FILE)
     # Print results
-    print('*** Added %s entries to /etc/hosts\n' % count['write_result']['total_written'])
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
 
 
 def remove_nodes_from_etc_hosts(net):

nets/8r-1c-out-band-isis/isis8d.py

@@ -287,7 +287,8 @@ def add_nodes_to_etc_hosts():
     # Import host-ip mapping defined in etc-hosts file
     count = etc_hosts.import_file(ETC_HOSTS_FILE)
     # Print results
-    print('*** Added %s entries to /etc/hosts\n' % count['write_result']['total_written'])
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
 
 
 def remove_nodes_from_etc_hosts(net):

nets/8r-1c-srv6-pm/isis8d.py

@@ -287,7 +287,8 @@ def add_nodes_to_etc_hosts():
     # Import host-ip mapping defined in etc-hosts file
     count = etc_hosts.import_file(ETC_HOSTS_FILE)
     # Print results
-    print('*** Added %s entries to /etc/hosts\n' % count['write_result']['total_written'])
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
 
 
 def remove_nodes_from_etc_hosts(net):

nets/8routers-isis-ipv6/isis8d.py

@@ -208,7 +208,8 @@ def add_nodes_to_etc_hosts():
     # Import host-ip mapping defined in etc-hosts file
     count = etc_hosts.import_file(ETC_HOSTS_FILE)
     # Print results
-    print('*** Added %s entries to /etc/hosts\n' % count['write_result']['total_written'])
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
 
 
 def remove_nodes_from_etc_hosts(net):

nets/8routers/ospf8r.py

@@ -198,7 +198,8 @@ def add_nodes_to_etc_hosts():
     # Import host-ip mapping defined in etc-hosts file
     count = etc_hosts.import_file(ETC_HOSTS_FILE)
     # Print results
-    print('*** Added %s entries to /etc/hosts\n' % count['write_result']['total_written'])
+    count = count['add_result']['ipv6_count'] + count['add_result']['ipv4_count']
+    print('*** Added %s entries to /etc/hosts\n' % count)
 
 
 def remove_nodes_from_etc_hosts(net):