"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "neutron/tests/fullstack/resources/config.py" between
neutron-14.0.2.tar.gz and neutron-14.0.3.tar.gz

About: OpenStack Neutron (Core Service: Networking) enables network connectivity as a service for other OpenStack services, such as OpenStack Compute. Provides an API for users to define networks and the attachments into them. Has a pluggable architecture that supports many popular networking vendors and technologies.
The "Stein" series (maintained release).

config.py  (neutron-14.0.2):config.py  (neutron-14.0.3)
skipping to change at line 84 skipping to change at line 84
'vhost': rabbitmq_environment.vhost}, 'vhost': rabbitmq_environment.vhost},
'api_workers': '2', 'api_workers': '2',
}, },
'database': { 'database': {
'connection': connection, 'connection': connection,
}, },
'oslo_concurrency': { 'oslo_concurrency': {
'lock_path': '$state_path/lock', 'lock_path': '$state_path/lock',
}, },
'agent': { 'agent': {
'report_interval': str(env_desc.agent_down_time / 2.0) 'report_interval': str(env_desc.agent_down_time / 2.0),
'log_agent_heartbeats': 'True',
}, },
}) })
policy_file = self._generate_policy_json() policy_file = self._generate_policy_json()
if policy_file: if policy_file:
self.config['oslo_policy'] = {'policy_file': policy_file} self.config['oslo_policy'] = {'policy_file': policy_file}
# Set root_helper/root_helper_daemon only when env var is set # Set root_helper/root_helper_daemon only when env var is set
root_helper = os.environ.get('OS_ROOTWRAP_CMD') root_helper = os.environ.get('OS_ROOTWRAP_CMD')
if root_helper: if root_helper:
self.config['agent']['root_helper'] = root_helper self.config['agent']['root_helper'] = root_helper
skipping to change at line 171 skipping to change at line 172
env_desc, host_desc, temp_dir, env_desc, host_desc, temp_dir,
base_filename='openvswitch_agent.ini') base_filename='openvswitch_agent.ini')
self.tunneling_enabled = self.env_desc.tunneling_enabled self.tunneling_enabled = self.env_desc.tunneling_enabled
ext_dev = utils.get_rand_device_name(prefix='br-eth') ext_dev = utils.get_rand_device_name(prefix='br-eth')
self.config.update({ self.config.update({
'ovs': { 'ovs': {
'local_ip': local_ip, 'local_ip': local_ip,
'integration_bridge': self._generate_integration_bridge(), 'integration_bridge': self._generate_integration_bridge(),
'of_interface': host_desc.of_interface, 'of_interface': host_desc.of_interface,
'bridge_mappings': '%s:%s' % (PHYSICAL_NETWORK_NAME, ext_dev) 'bridge_mappings': '%s:%s' % (PHYSICAL_NETWORK_NAME, ext_dev),
'of_inactivity_probe': '0',
}, },
'securitygroup': { 'securitygroup': {
'firewall_driver': host_desc.firewall_driver, 'firewall_driver': host_desc.firewall_driver,
}, },
'agent': { 'agent': {
'l2_population': str(self.env_desc.l2_pop), 'l2_population': str(self.env_desc.l2_pop),
'arp_responder': str(self.env_desc.arp_responder), 'arp_responder': str(self.env_desc.arp_responder),
'debug_iptables_rules': str(env_desc.debug_iptables) 'debug_iptables_rules': str(env_desc.debug_iptables),
'use_helper_for_ns_read': 'False',
} }
}) })
if self.tunneling_enabled: if self.tunneling_enabled:
self.config['agent'].update({ self.config['agent'].update({
'tunnel_types': self.env_desc.network_type}) 'tunnel_types': self.env_desc.network_type})
self.config['ovs'].update({ self.config['ovs'].update({
'tunnel_bridge': self._generate_tunnel_bridge(), 'tunnel_bridge': self._generate_tunnel_bridge(),
'int_peer_patch_port': self._generate_int_peer(), 'int_peer_patch_port': self._generate_int_peer(),
'tun_peer_patch_port': self._generate_tun_peer()}) 'tun_peer_patch_port': self._generate_tun_peer()})
skipping to change at line 288 skipping to change at line 291
self.config.update({ self.config.update({
'VXLAN': { 'VXLAN': {
'enable_vxlan': str(self.env_desc.tunneling_enabled), 'enable_vxlan': str(self.env_desc.tunneling_enabled),
'local_ip': local_ip, 'local_ip': local_ip,
'l2_population': str(self.env_desc.l2_pop), 'l2_population': str(self.env_desc.l2_pop),
}, },
'securitygroup': { 'securitygroup': {
'firewall_driver': host_desc.firewall_driver, 'firewall_driver': host_desc.firewall_driver,
}, },
'AGENT': { 'AGENT': {
'debug_iptables_rules': str(env_desc.debug_iptables) 'debug_iptables_rules': str(env_desc.debug_iptables),
'use_helper_for_ns_read': 'False',
} }
}) })
if env_desc.qos: if env_desc.qos:
self.config.update({ self.config.update({
'AGENT': { 'AGENT': {
'extensions': 'qos' 'extensions': 'qos'
} }
}) })
if self.env_desc.tunneling_enabled: if self.env_desc.tunneling_enabled:
self.config.update({ self.config.update({
skipping to change at line 334 skipping to change at line 338
self._prepare_config_with_ovs_agent(integration_bridge) self._prepare_config_with_ovs_agent(integration_bridge)
elif host_desc.l2_agent_type == constants.AGENT_TYPE_LINUXBRIDGE: elif host_desc.l2_agent_type == constants.AGENT_TYPE_LINUXBRIDGE:
self._prepare_config_with_linuxbridge_agent() self._prepare_config_with_linuxbridge_agent()
if host_desc.l3_agent_mode: if host_desc.l3_agent_mode:
self.config['DEFAULT'].update({ self.config['DEFAULT'].update({
'agent_mode': host_desc.l3_agent_mode}) 'agent_mode': host_desc.l3_agent_mode})
self.config['DEFAULT'].update({ self.config['DEFAULT'].update({
'debug': 'True', 'debug': 'True',
'test_namespace_suffix': self._generate_namespace_suffix(), 'test_namespace_suffix': self._generate_namespace_suffix(),
}) })
self.config.update({
'agent': {'use_helper_for_ns_read': 'False'}
})
if host_desc.availability_zone: if host_desc.availability_zone:
self.config['agent'].update({ self.config['agent'].update({
'availability_zone': host_desc.availability_zone 'availability_zone': host_desc.availability_zone
}) })
def _prepare_config_with_ovs_agent(self, integration_bridge): def _prepare_config_with_ovs_agent(self, integration_bridge):
self.config.update({ self.config.update({
'DEFAULT': { 'DEFAULT': {
'interface_driver': ('neutron.agent.linux.interface.' 'interface_driver': ('neutron.agent.linux.interface.'
'OVSInterfaceDriver'), 'OVSInterfaceDriver'),
skipping to change at line 371 skipping to change at line 378
if host_desc.l2_agent_type == constants.AGENT_TYPE_OVS: if host_desc.l2_agent_type == constants.AGENT_TYPE_OVS:
self._prepare_config_with_ovs_agent(integration_bridge) self._prepare_config_with_ovs_agent(integration_bridge)
elif host_desc.l2_agent_type == constants.AGENT_TYPE_LINUXBRIDGE: elif host_desc.l2_agent_type == constants.AGENT_TYPE_LINUXBRIDGE:
self._prepare_config_with_linuxbridge_agent() self._prepare_config_with_linuxbridge_agent()
self.config['DEFAULT'].update({ self.config['DEFAULT'].update({
'debug': 'True', 'debug': 'True',
'dhcp_confs': self._generate_dhcp_path(), 'dhcp_confs': self._generate_dhcp_path(),
'test_namespace_suffix': self._generate_namespace_suffix() 'test_namespace_suffix': self._generate_namespace_suffix()
}) })
self.config.update({
'AGENT': {'use_helper_for_ns_read': 'False'}
})
if host_desc.availability_zone: if host_desc.availability_zone:
self.config['agent'].update({ self.config['AGENT'].update({
'availability_zone': host_desc.availability_zone 'availability_zone': host_desc.availability_zone
}) })
def _setUp(self): def _setUp(self):
super(DhcpConfigFixture, self)._setUp() super(DhcpConfigFixture, self)._setUp()
self.addCleanup(self._clean_dhcp_path) self.addCleanup(self._clean_dhcp_path)
def _prepare_config_with_ovs_agent(self, integration_bridge): def _prepare_config_with_ovs_agent(self, integration_bridge):
self.config.update({ self.config.update({
'DEFAULT': { 'DEFAULT': {
 End of changes. 7 change blocks. 
5 lines changed or deleted 15 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)