Misc. improvements to vICN codebase detailed below.

- vICN core
 . Added python setup script (allowing package installation)
 . Better error handling
- Resources
 . LXD : better handling of certificate generation
 . Physical : generation of SSH keypair within vICN
 . Link : code simplification
 . EmulatedLteChannel: fixed typo in netmask configuration of emu-radio (missing /)
- Examples
 . Added json file for tutorial #2 - Dumbell
 . New tutorial #03 - Load balancing in WiFi/LTE hetnet
- Other minor changes incl. code cleanup (trailing spaces, etc.)

Change-Id: Id306ca71e27d9859aa72760f63a2bc364bfe8159
Signed-off-by: Jordan Augé <jordan.auge+fdio@cisco.com>

1 files changed, 5 insertions, 5 deletions

diff --git a/vicn/resource/ns3/emulated_lte_channel.py b/vicn/resource/ns3/emulated_lte_channel.py
index 8c7382cb..39370228 100644
--- a/vicn/resource/ns3/emulated_lte_channel.py
+++ b/vicn/resource/ns3/emulated_lte_channel.py
@@ -61,7 +61,7 @@ class EmulatedLteChannel(EmulatedChannel):
         # ... and each station
         if not station.managed:
             sta_if = None
-        else: 
+        else:
             if isinstance(station, LxcContainer):
                 host = NetDevice(node = station.node,
                     device_name='vhh-' + station.name + '-' + self.name,
@@ -103,8 +103,8 @@ class EmulatedLteChannel(EmulatedChannel):
 
             task = self.node.bridge._remove_interface(bridged_sta)
             await run_task(task, self._state.manager)
-            
-            task = self.node.bridge._add_interface(bridged_sta, 
+
+            task = self.node.bridge._add_interface(bridged_sta,
                     vlan = vlan)
             await run_task(task, self._state.manager)
 
@@ -178,8 +178,8 @@ class EmulatedLteChannel(EmulatedChannel):
             # Coma-separated list of stations' IP/netmask len
             'sta-ips'       : ','.join(sta_ips),
             # Base station IP/netmask len
-            'bs-ip'         : AddressManager().get_ip(self._ap_if) +
-                DEFAULT_NETMASK,
+            'bs-ip'         : AddressManager().get_ip(self._ap_if) + '/' +
+                str(DEFAULT_NETMASK),
             'txBuffer'      : '800000',
             'isFading'      : 'true' if DEFAULT_FADING_ENABLED else 'false',
         }