We are happy to announce the release of: networking-cisco 3.0.0: Networking Cisco contains the Cisco vendor code for OpenStack Neutron With source available at: http://git.openstack.org/cgit/openstack/networking-cisco Please report issues through launchpad: http://bugs.launchpad.net/networking-cisco For more details, please see below. Changes in networking-cisco 2.0.0..3.0.0 ---------------------------------------- 60a3778 Prevent duplicate ACL configuration A check is made to ensure that we are not configuring ACL for a second time as that will result in an error. 05a09ac Enabling/Disabling the neutron router should correspondingly enable/disable the external and/or internal network sub interfaces on the ASR. The fix also updates the admin_state_up of the backup router when the admin_state_up of the tenant router is changed. 50b978b Implement policy profile update CLI for n1kv aba5ccc Account for some transients in the db so we force agent to retry 3b8c916 Correct the name and path of plugin files 6054015 Rename neutron-dhcp-relay and neutron-dns-relay 3a3c6df This is the install guide for PNR plugin 5d7cf9c UCSM MD scale, cache UCSM connection handle for full public method. 5aabb20 Add oslo dependencies to requirements.txt 721aa7f New neutron plugin code to support CPNR product. 0a1ba99 Changes to admin_state_up is not reflected on backup routers 27bcb0b Add apicapi to requirements.txt fad87e7 UCSM MD scale improvement, selectively process port updates. 545a1f0 Service Profile Template Support in Cisco UCSM ML2 driver ebb40a4 Replace ciscoconfparser with HTParser b8535e4 Added flexibility to add openstack client auth credentials to our cfg file 1. Change the authentication syntax to be more aligned with auth_section in preparation of using auth plugin in the future. i.e., instead of using admin_user_name, use username... 2. Added more flexibility that if those authentication credential fields are not present in openstack configure file, we can add them in our enabler_conf.ini. To do that, we here eliminated the dependency on nova config file. 3. If a field is present in both openstack and our enabler_conf.ini, our config file will overwrite 4. In the future, we will totally eliminate the reading of openstack config file. But for now, we don't want much code changes, so still keep the current way of reading neutron and keystone config files. 310dbb3 Provide method removed from neutron to prevent breakage 52a4b20 Pin networking-cisco to Neutron stable/mikata 91b0b17 Making cfg-agent keepalive more proactive and configurable 6dfcfd6 Handle multiple concurrent scheduling attempts for the same router cdff2f6 Update config agent monitoring timers 0fbb8d0 Properly clean up after failed router gateway updates 7611607 Openstack native DHCP support for SAF enabler a9c4a7b Monitor status of config agents more comprehensively d365b99 Adds l3 plugin & cfg agent RPC for removed routers bc08df1 This fix assigns different HSRP priority to the external and internal sub-interface on the active and the backup routers. 3aac8c0 Fix issues with parsing of some new single UCSM config 05ddd3a Fix latest unit test failures for Nexus py34 c01a5a5 Improve device config error logging e0ea24d Use constraints for networking-cisco 54916cf Don't unschedule routers with auto_schedule=False from dead hosting devices 5d4ead7 Adds RPC to allow config agent to update hosting device status 4efdcb2 Delete router routes before router delete in unittest teardown bb6cb80 Use public method execute() for client extension 7b06a72 Use HA VIP address for NAT pools e6991ae Ensure that router config removal happens only on active devices 4eb4eeb Adds support for extension standard-attr-description dad7e9b Fix for defect: Fail to clear default route 857e742 Attribute nve_src_intf causing bad behavior b6047ee HSRP Default Priority change e7645ae Add oslo db retry decorator to the RPC handlers e95eba3 Fix so external_net_interface defines in .ini file are used 72bb2da Make cisco_router script patch neutron_legacy script 60b36fe Added proxy settings to tox.ini 1f71381 Coverage with comparison against baseline 825c308 fix typo "Openstck" e78e364 Remove prohibition of bash scripts 39afd41 Support of static uplink port detection 55a6f28 use curl instead of wget in tools/tox_install.sh a5ddfc9 Make vNIC names explicit in UCSM plugin 88e7ef2 Handle new baremetal format of port-id field d3cedbd Fixes recent UCSM CI breakage. 8225693 Retries cause Nexus bind_port failure 1b9a455 LOG.warn -> LOG.warning 4c637f5 Change import exclusions in tox.ini and update imports f3fa6b8 Fixes the UT failure in a DVR test. 7f48ad3 Fixes the UT failure in l3_router_appliance_plugin Adds a few pep8 fixes. f1f13ee Nexus baremetal/Ironic code clean-up 06410a6 Fix misspellings 423a07e Remove unused package from Nexus Driver 59185e2 Fix apic driver UTs after i18n refactor 6e3b3ae Baremetal-Ironic development for Nexus ML2 driver 10d832c [apic] on demand synchronization This patch changes the synchronizator behavior: 37e477e Fix i18n imports and use neutronclient take_action 79603c1 Refactor process_replay for future baremetal changes Closes-bug: #1534267 412c862 Use neutron._i18n instead of neutron.i18n b17481a Revert "Pin master to neutron/liberty" c694091 Send delete only on active Nexus switches 3010e32 Remove openstack-common.conf 4f08988 Refactor Nexus test code to remove duplication 7cc1f5e Replace assertEqual(None, *) with assertIsNone in tests Diffstat (except docs and test files) ------------------------------------- .coveragerc | 1 + devstack/csr1kv/cisco | 14 - devstack/csr1kv/cisco_neutron | 2 +- devstack/csr1kv/cisco_router | 42 +- devstack/csr1kv/csr1kv_install_all.sh | 2 +- devstack/csr1kv/remove_csr1kv_hosting_devices.sh | 2 +- .../csr1kv/setup_interface_on_extnet1_for_demo.sh | 2 +- devstack/csr1kv/setup_keystone_for_csr1kv_l3.sh | 2 +- devstack/csr1kv/setup_l3cfgagent_networking.sh | 2 +- devstack/csr1kv/setup_neutron_for_csr1kv_l3.sh | 2 +- .../csr1kv/setup_nova_and_glance_for_csr1kv_l3.sh | 2 +- devstack/csr1kv/setup_test_networks.sh | 2 +- devstack/plugin.sh | 2 +- devstack/saf/cisco_saf | 4 +- devstack/saf/local.conf.control.saf | 4 +- etc/neutron/plugins/cisco/cisco_cfg_agent.ini | 12 + .../plugins/cisco/cisco_device_manager_plugin.ini | 5 +- etc/neutron/plugins/ml2/ml2_conf_cisco.ini | 9 + etc/saf/enabler_conf.ini | 53 + networking_cisco/_i18n.py | 45 + networking_cisco/apps/saf/agent/dfa_agent.py | 44 +- networking_cisco/apps/saf/agent/iptables_driver.py | 3 +- networking_cisco/apps/saf/agent/vdp/dfa_vdp_mgr.py | 75 +- networking_cisco/apps/saf/agent/vdp/lldpad.py | 8 +- networking_cisco/apps/saf/agent/vdp/ovs_vdp.py | 15 +- networking_cisco/apps/saf/common/config.py | 13 +- networking_cisco/apps/saf/common/constants.py | 2 + networking_cisco/apps/saf/common/dfa_exceptions.py | 4 +- networking_cisco/apps/saf/common/dfa_sys_lib.py | 3 +- networking_cisco/apps/saf/common/utils.py | 16 + networking_cisco/apps/saf/db/dfa_db_models.py | 3 +- networking_cisco/apps/saf/server/cisco_dfa_rest.py | 13 +- .../apps/saf/server/dfa_events_handler.py | 11 +- .../apps/saf/server/dfa_fail_recovery.py | 15 +- .../apps/saf/server/dfa_instance_api.py | 23 +- .../apps/saf/server/dfa_listen_dcnm.py | 3 +- networking_cisco/apps/saf/server/dfa_server.py | 164 +- .../alembic_migrations/versions/CONTRACT_HEAD | 1 + .../alembic_migrations/versions/EXPAND_HEAD | 1 + .../db/migration/alembic_migrations/versions/HEADS | 2 - ...bffbf5_add_support_for_ucsm_service_profile_.py | 38 + ...171ea204_add_baremetal_channel_group_and_is_.py | 36 + networking_cisco/neutronclient/hostingdevice.py | 8 +- .../neutronclient/hostingdevicescheduler.py | 7 +- .../neutronclient/hostingdevicetemplate.py | 3 +- networking_cisco/neutronclient/networkprofile.py | 3 +- networking_cisco/neutronclient/policyprofile.py | 27 + networking_cisco/neutronclient/routerscheduler.py | 7 +- networking_cisco/neutronclient/routertype.py | 3 +- .../plugins/cisco/cfg_agent/cfg_agent.py | 64 +- .../plugins/cisco/cfg_agent/cfg_exceptions.py | 3 + .../device_drivers/asr1k/asr1k_cfg_syncer.py | 10 +- .../device_drivers/asr1k/asr1k_cfg_validator.py | 6 +- .../device_drivers/asr1k/asr1k_routing_driver.py | 90 +- .../device_drivers/asr1k/asr1k_snippets.py | 2 +- .../device_drivers/cisco_csr_rest_client.py | 2 +- .../device_drivers/csr1kv/cisco_csr1kv_snippets.py | 13 + .../csr1kv/csr1kv_hotplug_routing_driver.py | 2 +- .../device_drivers/csr1kv/csr1kv_routing_driver.py | 22 +- .../device_drivers/csr1kv/iosxe_routing_driver.py | 56 +- .../cisco/cfg_agent/device_drivers/driver_mgr.py | 2 +- .../plugins/cisco/cfg_agent/device_status.py | 30 +- .../service_helpers/routing_svc_helper.py | 84 +- .../cfg_agent/service_helpers/service_helper.py | 2 + .../plugins/cisco/common/cisco_constants.py | 19 +- networking_cisco/plugins/cisco/common/htparser.py | 155 ++ networking_cisco/plugins/cisco/common/utils.py | 7 +- networking_cisco/plugins/cisco/cpnr/__init__.py | 0 networking_cisco/plugins/cisco/cpnr/cpnr_client.py | 391 ++++ networking_cisco/plugins/cisco/cpnr/debug_stats.py | 77 + networking_cisco/plugins/cisco/cpnr/dhcp_driver.py | 432 +++++ networking_cisco/plugins/cisco/cpnr/dhcp_relay.py | 377 ++++ networking_cisco/plugins/cisco/cpnr/dhcpopts.py | 178 ++ networking_cisco/plugins/cisco/cpnr/dns_relay.py | 431 +++++ networking_cisco/plugins/cisco/cpnr/model.py | 722 ++++++++ networking_cisco/plugins/cisco/cpnr/netns.py | 74 + .../db/device_manager/hosting_device_manager_db.py | 185 +- .../cisco/db/device_manager/hosting_devices_db.py | 6 +- networking_cisco/plugins/cisco/db/l3/ha_db.py | 128 +- .../plugins/cisco/db/l3/l3_router_appliance_db.py | 210 ++- .../plugins/cisco/db/l3/routertype_db.py | 5 +- .../cisco/db/scheduler/cfg_agentschedulers_db.py | 174 +- .../scheduler/l3_routertype_aware_schedulers_db.py | 5 +- .../plugins/cisco/device_manager/config.py | 3 +- .../hosting_device_drivers/csr1kv_hd_driver.py | 2 +- .../plugging_drivers/hw_vlan_trunking_driver.py | 8 +- .../plugging_drivers/n1kv_ml2_trunking_driver.py | 3 +- .../vif_hotplug_plugging_driver.py | 7 +- .../device_manager/rpc/devices_cfgagent_rpc_cb.py | 41 +- .../hosting_device_cfg_agent_scheduler.py | 19 +- .../plugins/cisco/device_manager/service_vm_lib.py | 3 +- .../cisco/extensions/ciscocfgagentscheduler.py | 3 +- .../cisco/extensions/ciscohostingdevicemanager.py | 2 + networking_cisco/plugins/cisco/extensions/ha.py | 2 + .../plugins/cisco/extensions/routertype.py | 2 + .../cisco/extensions/routertypeawarescheduler.py | 3 +- .../l3/drivers/asr1k/asr1k_routertype_driver.py | 2 +- .../cisco/l3/rpc/l3_router_cfg_agent_rpc_cb.py | 11 +- .../cisco/l3/rpc/l3_router_rpc_cfg_agent_api.py | 43 +- .../l3_router_hosting_device_scheduler.py | 103 +- .../service_plugins/cisco_device_manager_plugin.py | 12 + .../cisco/service_plugins/cisco_router_plugin.py | 1 + .../plugins/ml2/drivers/cisco/apic/apic_model.py | 3 +- .../plugins/ml2/drivers/cisco/apic/apic_sync.py | 37 +- .../ml2/drivers/cisco/apic/apic_topology.py | 3 +- .../plugins/ml2/drivers/cisco/apic/config.py | 1 + .../ml2/drivers/cisco/apic/mechanism_apic.py | 22 +- .../plugins/ml2/drivers/cisco/n1kv/config.py | 2 + .../plugins/ml2/drivers/cisco/n1kv/exceptions.py | 2 + .../ml2/drivers/cisco/n1kv/extensions/n1kv.py | 5 +- .../cisco/n1kv/extensions/policy_profile.py | 12 + .../ml2/drivers/cisco/n1kv/mech_cisco_n1kv.py | 21 +- .../plugins/ml2/drivers/cisco/n1kv/n1kv_client.py | 4 +- .../plugins/ml2/drivers/cisco/n1kv/n1kv_db.py | 10 + .../ml2/drivers/cisco/n1kv/n1kv_ext_driver.py | 17 +- .../plugins/ml2/drivers/cisco/n1kv/n1kv_sync.py | 4 +- .../drivers/cisco/n1kv/network_profile_service.py | 3 +- .../drivers/cisco/n1kv/policy_profile_service.py | 35 +- .../plugins/ml2/drivers/cisco/ncs/driver.py | 2 + .../plugins/ml2/drivers/cisco/nexus/config.py | 1 + .../plugins/ml2/drivers/cisco/nexus/constants.py | 3 + .../plugins/ml2/drivers/cisco/nexus/exceptions.py | 2 + .../ml2/drivers/cisco/nexus/mech_cisco_nexus.py | 766 ++++++-- .../plugins/ml2/drivers/cisco/nexus/nexus_db_v2.py | 188 +- .../ml2/drivers/cisco/nexus/nexus_models_v2.py | 15 +- .../drivers/cisco/nexus/nexus_network_driver.py | 193 +- .../ml2/drivers/cisco/nexus/nexus_snippets.py | 55 +- .../ml2/drivers/cisco/nexus/type_nexus_vxlan.py | 3 +- .../plugins/ml2/drivers/cisco/ucsm/config.py | 124 +- .../plugins/ml2/drivers/cisco/ucsm/constants.py | 7 +- .../plugins/ml2/drivers/cisco/ucsm/exceptions.py | 7 + .../ml2/drivers/cisco/ucsm/mech_cisco_ucsm.py | 110 +- .../plugins/ml2/drivers/cisco/ucsm/ucsm_db.py | 43 + .../plugins/ml2/drivers/cisco/ucsm/ucsm_model.py | 13 + .../ml2/drivers/cisco/ucsm/ucsm_network_driver.py | 707 +++++--- networking_cisco/services/l3_router/l3_apic.py | 2 + .../cisco/cfg_agent/test_asr1k_routing_driver.py | 195 +- .../test_csr1kv_hotplug_routing_driver.py | 1 - .../cisco/cfg_agent/test_csr1kv_routing_driver.py | 1 - .../unit/cisco/cfg_agent/test_device_status.py | 23 +- .../cisco/cfg_agent/test_routing_svc_helper.py | 82 +- .../device_manager/device_manager_test_support.py | 26 +- .../cisco/device_manager/plugging_test_driver.py | 4 +- .../cisco/device_manager/test_db_device_manager.py | 84 +- .../test_device_manager_callbacks.py | 98 + .../test_hosting_device_cfg_agent_scheduler.py | 198 +- .../test_hw_vlan_trunking_plugging_driver.py | 10 +- .../test_vif_hotplug_plugging_driver.py | 2 +- .../cisco/l3/test_ha_l3_router_appliance_plugin.py | 243 ++- .../cisco/l3/test_l3_router_appliance_plugin.py | 51 +- .../l3/test_l3_routertype_aware_schedulers.py | 337 +++- .../cisco/apic/test_cisco_apic_mechanism_driver.py | 41 +- .../ml2/drivers/cisco/apic/test_cisco_apic_sync.py | 4 +- .../ml2/drivers/cisco/n1kv/test_cisco_n1kv_mech.py | 35 + .../cisco/n1kv/test_policy_profile_service.py | 34 +- .../ml2/drivers/cisco/nexus/test_cisco_mech.py | 5 +- .../ml2/drivers/cisco/nexus/test_cisco_nexus.py | 1892 -------------------- .../drivers/cisco/nexus/test_cisco_nexus_base.py | 835 +++++++++ .../ml2/drivers/cisco/nexus/test_cisco_nexus_db.py | 14 +- .../drivers/cisco/nexus/test_cisco_nexus_events.py | 594 ++++++ .../drivers/cisco/nexus/test_cisco_nexus_replay.py | 1161 ++++++++++++ .../drivers/cisco/ucsm/test_cisco_ucsm_common.py | 4 + .../drivers/cisco/ucsm/test_cisco_ucsm_driver.py | 138 +- .../neutronclient/test_cli20_networkprofile.py | 1 + openstack-common.conf | 19 - requirements.txt | 13 +- setup.cfg | 5 + test-requirements.txt | 14 +- tools/misc-sanity-checks.sh | 31 - tools/tox_install.sh | 35 +- tox.ini | 23 +- 190 files changed, 12480 insertions(+), 3397 deletions(-) Requirements updates -------------------- diff --git a/requirements.txt b/requirements.txt index ea2d4b1..215d94c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4 +4 @@ -pbr<2.0,>=1.4 +pbr>=1.6 @@ -10 +10,10 @@ UcsSdk<=0.8.2;python_version<'3.0' -ciscoconfparse>=1.2.10;python_version<'3.0' +apicapi # Apache-2.0 +oslo.config>=3.7.0 # Apache-2.0 +oslo.concurrency>=3.5.0 # Apache-2.0 +oslo.db>=4.1.0 # Apache-2.0 +oslo.i18n>=2.1.0 # Apache-2.0 +oslo.log>=1.14.0 # Apache-2.0 +oslo.messaging>=4.0.0 # Apache-2.0 +oslo.serialization>=1.10.0 # Apache-2.0 +oslo.service>=1.0.0 # Apache-2.0 +oslo.utils>=3.5.0 # Apache-2.0 \ No newline at end of file diff --git a/test-requirements.txt b/test-requirements.txt index f48cb6e..c36980c 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -10,5 +10,5 @@ python-subunit>=0.0.18 -mock>=1.0 -requests-mock>=0.5.1 # Apache-2.0 -sphinx>=1.1.2 -oslosphinx>=2.2.0 # Apache-2.0 -testtools>=0.9.36,!=1.2.0 +mock>=1.2 +requests-mock>=0.7.0 # Apache-2.0 +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx!=3.4.0,>=2.5.0 # Apache-2.0 +testtools>=1.4.0 @@ -17,2 +17,2 @@ WebTest>=2.0 -oslotest>=1.2.0 # Apache-2.0 -tempest-lib>=0.1.0 +oslotest>=1.10.0 # Apache-2.0 +tempest-lib>=0.13.0