"""Could be a shared network across all chains or a chain private network."""
def __init__(self, manager, network_config, chain_id=None, lookup_only=False):
- """Create a network for given chain."""
+ """Create a network for given chain.
+
+ network_config: a dict containing the network properties
+ (segmentation_id and physical_network)
+ chain_id: to which chain the networks belong.
+ a None value will mean that these networks are shared by all chains
+ """
self.manager = manager
self.name = network_config.name
+ self.segmentation_id = self._get_item(network_config.segmentation_id,
+ chain_id, auto_index=True)
+ self.physical_network = self._get_item(network_config.physical_network, chain_id)
if chain_id is not None:
self.name += str(chain_id)
self.reuse = False
self.delete()
raise
+ def _get_item(self, item_field, index, auto_index=False):
+ """Retrieve an item from a list or a single value.
+
+ item_field: can be None, a tuple of a single value
+ index: if None is same as 0, else is the index for a chain
+ auto_index: if true will automatically get the final value by adding the
+ index to the base value (if full list not provided)
+
+ If the item_field is not a tuple, it is considered same as a tuple with same value at any
+ index.
+ If a list is provided, its length must be > index
+ """
+ if not item_field:
+ return None
+ if index is None:
+ index = 0
+ if isinstance(item_field, tuple):
+ try:
+ return item_field[index]
+ except IndexError:
+ raise ChainException("List %s is too short for chain index %d" %
+ (str(item_field), index))
+ # single value is configured
+ if auto_index:
+ return item_field + index
+ return item_field
+
def _setup(self, network_config, lookup_only):
# Lookup if there is a matching network with same name
networks = self.manager.neutron_client.list_networks(name=self.name)
network = networks['networks'][0]
# a network of same name already exists, we need to verify it has the same
# characteristics
- if network_config.segmentation_id:
- if network['provider:segmentation_id'] != network_config.segmentation_id:
+ if self.segmentation_id:
+ if network['provider:segmentation_id'] != self.segmentation_id:
raise ChainException("Mismatch of 'segmentation_id' for reused "
"network '{net}'. Network has id '{seg_id1}', "
"configuration requires '{seg_id2}'."
.format(net=self.name,
seg_id1=network['provider:segmentation_id'],
- seg_id2=network_config.segmentation_id))
+ seg_id2=self.segmentation_id))
- if network_config.physical_network:
- if network['provider:physical_network'] != network_config.physical_network:
+ if self.physical_network:
+ if network['provider:physical_network'] != self.physical_network:
raise ChainException("Mismatch of 'physical_network' for reused "
"network '{net}'. Network has '{phys1}', "
"configuration requires '{phys2}'."
.format(net=self.name,
phys1=network['provider:physical_network'],
- phys2=network_config.physical_network))
+ phys2=self.physical_network))
LOG.info('Reusing existing network %s', self.name)
self.reuse = True
}
if network_config.network_type:
body['network']['provider:network_type'] = network_config.network_type
- if network_config.segmentation_id:
- body['network']['provider:segmentation_id'] = network_config.segmentation_id
- if network_config.physical_network:
- body['network']['provider:physical_network'] = network_config.physical_network
-
+ if self.segmentation_id:
+ body['network']['provider:segmentation_id'] = self.segmentation_id
+ if self.physical_network:
+ body['network']['provider:physical_network'] = self.physical_network
self.network = self.manager.neutron_client.create_network(body)['network']
body = {
'subnet': {'name': network_config.subnet,
subnet = self.manager.neutron_client.create_subnet(body)['subnet']
# add subnet id to the network dict since it has just been added
self.network['subnets'] = [subnet['id']]
- LOG.info('Created network: %s.', self.name)
+ LOG.info('Created network: %s', self.name)
def get_uuid(self):
"""
can use vswitch or SR-IOV based on config.use_sriov_middle_net
"""
if self.manager.config.sriov:
- if self.manager.config.use_sriov_middle_net:
+ chain_length = self.chain.get_length()
+ if self.manager.config.use_sriov_middle_net or chain_length == 1:
return 'direct'
- if self.vnf_id == 0:
+ if self.vnf_id == 0 and port_index == 0:
# first VNF in chain must use sriov for left port
- if port_index == 0:
- return 'direct'
- elif (self.vnf_id == self.chain.get_length() - 1) and (port_index == 1):
+ return 'direct'
+ if (self.vnf_id == chain_length - 1) and (port_index == 1):
# last VNF in chain must use sriov for right port
return 'direct'
return 'normal'
self.vlans = [self._check_list('vlans[0]', config.vlans[0], re_vlan),
self._check_list('vlans[1]', config.vlans[1], re_vlan)]
if config.vxlan:
- # make sure there are 2 entries
- if len(config.vnis) != 2:
- raise ChainException('The config vnis property must be a list with 2 VNIs')
- self.vnis = [self._check_list('vnis[0]', config.vnis[0], re_vlan),
- self._check_list('vnis[1]', config.vnis[1], re_vlan)]
+ raise ChainException('VxLAN is only supported with OpenStack')
def _get_dest_macs_from_config(self):
re_mac = "[0-9a-fA-F]{2}([-:])[0-9a-fA-F]{2}(\\1[0-9a-fA-F]{2}){4}$"
if initial_instance_count:
LOG.info('All instances are active')
- def _get_vxlan_net_cfg(self, chain_id):
- int_nets = self.config.internal_networks
- net_left = int_nets.left
- net_right = int_nets.right
- vnis = self.generator_config.vnis
- chain_id += 1
- seg_id_left = vnis[0]
- if self.config.service_chain == ChainType.PVP:
- if chain_id > 1:
- seg_id_left = ((chain_id - 1) * 2) + seg_id_left
- seg_id_right = seg_id_left + 1
- if (seg_id_left and seg_id_right) > vnis[1]:
- raise Exception('Segmentation ID is more than allowed '
- 'value: {}'.format(vnis[1]))
- net_left['segmentation_id'] = seg_id_left
- net_right['segmentation_id'] = seg_id_right
- net_cfg = [net_left, net_right]
- else:
- # PVVP
- net_middle = int_nets.middle
- if chain_id > 1:
- seg_id_left = ((chain_id - 1) * 3) + seg_id_left
- seg_id_middle = seg_id_left + 1
- seg_id_right = seg_id_left + 2
- if (seg_id_left and seg_id_right and seg_id_middle) > vnis[1]:
- raise Exception('Segmentation ID is more than allowed '
- 'value: {}'.format(vnis[1]))
- net_left['segmentation_id'] = seg_id_left
- net_middle['segmentation_id'] = seg_id_middle
- net_right['segmentation_id'] = seg_id_right
- net_cfg = [net_left, net_middle, net_right]
- return net_cfg
-
def get_networks(self, chain_id=None):
"""Get the networks for given EXT, PVP or PVVP chain.
'segmentation_id': None,
'physical_network': None})
for name in [ext_net.left, ext_net.right]]
+ # segmentation id and subnet should be discovered from neutron
else:
lookup_only = False
int_nets = self.config.internal_networks
- network_type = set([int_nets[net].get('network_type') for net in int_nets])
- if self.config.vxlan and 'vxlan' in network_type:
- net_cfg = self._get_vxlan_net_cfg(chain_id)
+ # VLAN and VxLAN
+ if self.config.service_chain == ChainType.PVP:
+ net_cfg = [int_nets.left, int_nets.right]
else:
- # VLAN
- if self.config.service_chain == ChainType.PVP:
- net_cfg = [int_nets.left, int_nets.right]
- else:
- net_cfg = [int_nets.left, int_nets.middle, int_nets.right]
+ net_cfg = [int_nets.left, int_nets.middle, int_nets.right]
networks = []
try:
for cfg in net_cfg:
return [self.chains[chain_index].get_vxlan(port_index)
for chain_index in range(self.chain_count)]
# no openstack
- return self.vnis[port_index]
+ raise ChainException('VxLAN is only supported with OpenStack')
def get_dest_macs(self, port_index):
"""Get the list of per chain dest MACs on a given port.
return []
def delete(self):
- """Delete resources for all chains.
-
- Will not delete any resource if no-cleanup has been requested.
- """
- if self.config.no_cleanup:
- return
+ """Delete resources for all chains."""
for chain in self.chains:
chain.delete()
for network in self.networks:
Code Review / nfvbench.git / blobdiff