Change rename command to a name property setter for all Dynamips

devices. Adjust the tests and upload the new dynamips that supports the
rename command for VMs.

tests/dynamips/conftest.py

@@ -9,7 +9,7 @@ def hypervisor(request):
     cwd = os.path.dirname(os.path.abspath(__file__))
     dynamips_path = os.path.join(cwd, "dynamips.stable")
     print("\nStarting Dynamips Hypervisor: {}".format(dynamips_path))
-    manager = HypervisorManager(dynamips_path, "/tmp", base_port=9000)
+    manager = HypervisorManager(dynamips_path, "/tmp", "127.0.0.1", 9000)
     hypervisor = manager.start_new_hypervisor()
 
     def stop():

tests/dynamips/test_atm_bridge.py

@@ -19,7 +19,7 @@ def test_atm_bridge_exists(atm_bridge):
 
 def test_rename_atm_bridge(atm_bridge):
 
-    atm_bridge.rename("new ATM bridge")
+    atm_bridge.name = "new ATM bridge"
     assert atm_bridge.name == "new ATM bridge"
 
 

tests/dynamips/test_atm_switch.py

@@ -19,7 +19,7 @@ def test_atmsw_exists(atmsw):
 
 def test_rename_atmsw(atmsw):
 
-    atmsw.rename("new ATM switch")
+    atmsw.name = "new ATM switch"
     assert atmsw.name == "new ATM switch"
 
 

tests/dynamips/test_bridge.py

@@ -18,7 +18,7 @@ def test_bridge_exists(bridge):
 
 def test_rename_bridge(bridge):
 
-    bridge.rename("new bridge")
+    bridge.name = "new bridge"
     assert bridge.name == "new bridge"
 
 

tests/dynamips/test_ethernet_switch.py

@@ -19,7 +19,7 @@ def test_ethsw_exists(ethsw):
 
 def test_rename_ethsw(ethsw):
 
-    ethsw.rename("new Ethernet switch")
+    ethsw.name = "new Ethernet switch"
     assert ethsw.name == "new Ethernet switch"
 
 

tests/dynamips/test_frame_relay_switch.py

@@ -19,7 +19,7 @@ def test_frsw_exists(frsw):
 
 def test_rename_frsw(frsw):
 
-    frsw.rename("new Frame Relay switch")
+    frsw.name = "new Frame Relay switch"
     assert frsw.name == "new Frame Relay switch"
 
 

tests/dynamips/test_hypervisor_manager.py

@@ -11,6 +11,7 @@ def hypervisor_manager(request):
     dynamips_path = os.path.join(cwd, "dynamips.stable")
     print("\nStarting Dynamips Hypervisor: {}".format(dynamips_path))
     manager = HypervisorManager(dynamips_path, "/tmp", "127.0.0.1", 9000)
+
     #manager.start_new_hypervisor()
 
     def stop():
@@ -23,6 +24,7 @@ def hypervisor_manager(request):
 
 def test_allocate_hypervisor_for_router(hypervisor_manager):
 
+    hypervisor_manager.allocate_hypervisor_per_device = False
     # default of 1GB of RAM per hypervisor instance
     assert hypervisor_manager.memory_usage_limit_per_hypervisor == 1024
     hypervisor = hypervisor_manager.allocate_hypervisor_for_router("c3725.image", 512)

tests/dynamips/test_router.py

@@ -30,14 +30,13 @@ def test_create_and_delete_router(hypervisor):
         router.get_status()
 
 
-# def test_rename_router(router):
-#
-#     assert router.name == "router"
-#     router.rename("my_router")
-#     assert router.name == "my_router"
-#     router.rename("router")
-#     assert router.name == "router"
-    #router.delete()  # FIXME: fails with current Dynamips version
+def test_rename_router(hypervisor):
+
+    router = Router(hypervisor, "my router to rename")
+    assert router.name == "my router to rename"
+    router.name = "my_router"
+    assert router.name == "my_router"
+    router.delete()
 
 
 def test_image(router):