X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=RO%2Fosm_ro%2Fwim%2Ftests%2Ffixtures.py;h=6e36b55d476041e2d2c99b1172f63e9c7acd2a10;hb=1dfe9939de013695210e4e0495b15ca75bd81321;hp=8984020de1a941c199b074755457927f112f2fa8;hpb=7d782eff123e5b44d41437377ccca66ad1e8b21b;p=osm%2FRO.git

diff --git a/RO/osm_ro/wim/tests/fixtures.py b/RO/osm_ro/wim/tests/fixtures.py
index 8984020d..6e36b55d 100644
--- a/RO/osm_ro/wim/tests/fixtures.py
+++ b/RO/osm_ro/wim/tests/fixtures.py
@@ -53,7 +53,7 @@ def wim(identifier=0):
     return {'name': 'wim%d' % identifier,
             'uuid': uuid('wim%d' % identifier),
             'wim_url': 'localhost',
-            'type': 'tapi'}
+            'type': 'ietfl2vpn'}
 
 
 def tenant(identifier=0):
@@ -99,7 +99,7 @@ def datacenter(identifier, external_ports_config=False):
                 'encapsulation_type': 'vlan'},
                 'vim_external_port':
                 dict(zip(('switch', 'port'),
-                          _datacenter_to_switch_port(identifier)))}
+                         _datacenter_to_switch_port(identifier)))}
         ]})
 
     return {'uuid': uuid('dc%d' % identifier),
@@ -144,13 +144,13 @@ def wim_port_mapping(wim, datacenter,
 
     return {'wim_id': uuid('wim%d' % wim),
             'datacenter_id': uuid('dc%d' % datacenter),
-            'pop_switch_dpid': pop_dpid,
-            'pop_switch_port': (str(pop_port) if pop_port else
-                                str(int(datacenter) + int(wim) + 1)),
+            'device_id': pop_dpid,
+            'device_interface_id': (str(pop_port) if pop_port else
+                                    str(int(datacenter) + int(wim) + 1)),
             # ^  Datacenter router have one port managed by each WIM
-            'wan_service_endpoint_id': id_,
+            'service_endpoint_id': id_,
             # ^  WIM managed router have one port connected to each DC
-            'wan_service_mapping_info': json.dumps(mapping_info)}
+            'service_mapping_info': json.dumps(mapping_info)}
 
 
 def processed_port_mapping(wim, datacenter,
@@ -164,11 +164,11 @@ def processed_port_mapping(wim, datacenter,
         'wim_id': uuid('wim%d' % wim),
         'datacenter_id': uuid('dc%d' % datacenter),
         'pop_wan_mappings': [
-            {'pop_switch_dpid': pop_dpid,
-             'pop_switch_port': wim + 1 + i,
-             'wan_service_endpoint_id':
+            {'device_id': pop_dpid,
+             'device_interface_id': wim + 1 + i,
+             'service_endpoint_id':
                  sha1('dpid-port|%s|%d' % (wan_dpid, datacenter + 1 + i)),
-             'wan_service_mapping_info': {
+             'service_mapping_info': {
                  'mapping_type': 'dpid-port',
                  'wan_switch_dpid': wan_dpid,
                  'wan_switch_port': datacenter + 1 + i}}
@@ -221,18 +221,18 @@ def instance_nets(num_datacenters=2, num_links=2, status='BUILD'):
     them (e.g M = 2 -> back and forth)
     """
     return [
-        {'uuid': uuid('net%d%d' % (k, l)),
+        {'uuid': uuid('net%d%d' % (k, li)),
          'datacenter_id': uuid('dc%d' % k),
          'datacenter_tenant_id': uuid('dc-account0%d' % k),
          'instance_scenario_id': uuid('nsr0'),
          # ^  instance_scenario_id == NS Record id
-         'sce_net_id': uuid('vld%d' % l),
+         'sce_net_id': uuid('vld%d' % li),
          # ^  scenario net id == VLD id
          'status': status,
          'vim_net_id': None,
          'created': True}
         for k in range(num_datacenters)
-        for l in range(num_links)
+        for li in range(num_links)
     ]
 
 
@@ -289,17 +289,17 @@ def instance_wim_nets(instance=0, wim=0, num_links=1,
     VIM nets
     """
     return [
-        {'uuid': uuid('wim-net%d%d%d' % (wim, instance, l)),
+        {'uuid': uuid('wim-net%d%d%d' % (wim, instance, li)),
          'wim_id': uuid('wim%d' % wim),
          'wim_account_id': uuid('wim-account%d' % wim),
-         'wim_internal_id': uuid('-net%d%d' % (wim, l)),
+         'wim_internal_id': uuid('-net%d%d' % (wim, li)),
          'instance_scenario_id': uuid('nsr%d' % instance),
          # ^  instance_scenario_id == NS Record id
-         'sce_net_id': uuid('vld%d' % l),
+         'sce_net_id': uuid('vld%d' % li),
          # ^  scenario net id == VLD id
          'status': status,
          'created': False}
-        for l in range(num_links)
+        for li in range(num_links)
     ]