From d9edd3ce0c87fca1b6941d1700ab9661f6a4538c Mon Sep 17 00:00:00 2001 From: Ananth Suryanarayana Date: Thu, 19 Apr 2018 09:36:13 -0700 Subject: [PATCH] Expanad tabs and remove trailing spaces In a recent code review, unmodified code had trailing spaces which always show up in "Red" in git diff and in gerrit. Instead of a point fix, clean the entire C++ code base to expand tabs to spaces and also remove all trailing spaces. This may parts of code difficult for back-porting to other branches but this code hygiene has been pending for a while. Hence we may only back port to R5.0. Change-Id: I24fec35e5c84de9819ab83a14546b0fa22b42fad Partial-Bug: 1765458 --- src/bfd/rest_api/bfd_rest_server.h | 2 +- src/bfd/test/bfd_test_utils.h | 2 +- src/bgp/bgp_config_yaml.cc | 2 +- src/bgp/bgp_message_builder.cc | 4 +- src/bgp/bgp_show_config.cc | 6 +- src/bgp/evpn/evpn_table.cc | 8 +- src/bgp/mvpn/test/mvpn_table_test.cc | 14 +- src/bgp/routing-instance/routing_instance.cc | 32 +- src/bgp/rtarget/test/rtarget_address_test.cc | 16 +- src/bgp/test/bgp_config_listener_test.cc | 2 +- src/bgp/test/bgp_evpn_aliasing_test.cc | 90 ++-- src/bgp/test/bgp_evpn_manager_test.cc | 36 +- src/bgp/test/bgp_ifmap_config_manager_test.cc | 14 +- src/bgp/test/bgp_message_test.h | 2 +- src/bgp/test/bgp_mvpn_test.cc | 4 +- src/bgp/test/bgp_stress_test.cc | 4 +- src/bgp/test/bgp_stress_test.h | 2 +- src/bgp/test/bgp_xmpp_evpn_test.cc | 94 ++-- src/bgp/test/bgp_xmpp_mvpn_test.cc | 4 +- src/bgp/test/routing_instance_mgr_test.cc | 12 +- ...routing_instance_mgr_tracebuf_size_test.cc | 6 +- ...ng_instance_mgr_tracebuf_threshold_test.cc | 12 +- src/bgp/test/rt_network_attr_test.cc | 14 +- src/bgp/test/show_route_test.cc | 8 +- .../svc_static_route_intergration_test3.cc | 2 +- src/control-node/main.cc | 2 +- src/control-node/options.h | 8 +- src/control-node/test/control_node_test.cc | 2 +- src/control-node/test/control_node_test.h | 2 +- src/control-node/test/options_test.cc | 4 +- src/db/db_entry.cc | 12 +- src/db/db_entry.h | 2 +- src/db/db_graph_edge.h | 2 +- src/db/db_partition.cc | 4 +- src/db/db_table.cc | 4 +- src/db/db_table.h | 6 +- src/db/db_table_partition.cc | 2 +- src/db/db_table_partition.h | 12 +- src/db/db_table_walker.cc | 18 +- src/db/test/db_base_test.cc | 36 +- src/db/test/db_graph_test.cc | 4 +- src/db/test/db_test.cc | 4 +- src/db/test/db_test_cmn.h | 34 +- src/dns/agent/agent_xmpp_channel.cc | 24 +- src/dns/bind/bind_resolver.cc | 6 +- src/dns/bind/bind_resolver.h | 2 +- src/dns/bind/bind_util.cc | 48 +-- src/dns/bind/bind_util.h | 44 +- src/dns/bind/named_config.cc | 20 +- src/dns/bind/named_config.h | 6 +- src/dns/bind/xmpp_dns_agent.cc | 42 +- src/dns/bind/xmpp_dns_agent.h | 10 +- src/dns/cfg/config_listener.cc | 6 +- src/dns/cfg/config_listener.h | 2 +- src/dns/cfg/dns_config.cc | 6 +- src/dns/cfg/dns_config.h | 4 +- src/dns/cfg/dns_config_parser.cc | 30 +- src/dns/cmn/dns.h | 2 +- src/dns/main.cc | 2 +- src/dns/mgr/dns_mgr.cc | 6 +- src/dns/mgr/dns_mgr.h | 6 +- src/dns/mgr/dns_oper.cc | 36 +- src/dns/mgr/dns_oper.h | 8 +- src/dns/test/dns_bind_test.cc | 24 +- src/dns/test/dns_config_test.cc | 10 +- src/dns/test/dns_options_test.cc | 6 +- src/ifmap/client/config_json_parser.cc | 2 +- src/ifmap/client/config_json_parser.h | 2 +- src/ifmap/ifmap_agent_parser.cc | 14 +- src/ifmap/ifmap_agent_parser.h | 2 +- src/ifmap/ifmap_agent_sandesh.cc | 16 +- src/ifmap/ifmap_agent_table.h | 8 +- src/ifmap/ifmap_encoder.cc | 4 +- src/ifmap/ifmap_exporter.cc | 10 +- src/ifmap/ifmap_factory.h | 2 +- src/ifmap/ifmap_graph_walker.cc | 10 +- src/ifmap/ifmap_link.h | 16 +- src/ifmap/ifmap_link_table.cc | 6 +- src/ifmap/ifmap_link_table.h | 2 +- src/ifmap/ifmap_node.h | 22 +- src/ifmap/ifmap_object.h | 2 +- src/ifmap/ifmap_update.cc | 6 +- src/ifmap/ifmap_update.h | 2 +- src/ifmap/ifmap_update_queue.cc | 14 +- src/ifmap/ifmap_update_queue.h | 2 +- src/ifmap/ifmap_update_sender.cc | 4 +- src/ifmap/ifmap_update_sender.h | 2 +- src/ifmap/ifmap_util.h | 4 +- src/ifmap/ifmap_uuid_mapper.cc | 4 +- src/ifmap/ifmap_xmpp.cc | 18 +- src/ifmap/ifmap_xmpp.h | 6 +- src/ifmap/ifmap_xmpp_client_show.cc | 12 +- src/ifmap/test/ifmap_client_mock.cc | 4 +- src/ifmap/test/ifmap_exporter_test.cc | 30 +- src/ifmap/test/ifmap_graph_walker_test.cc | 38 +- src/ifmap/test/ifmap_server_table_test.cc | 8 +- src/ifmap/test/ifmap_test_util_server.cc | 2 +- src/ifmap/test/ifmap_update_queue_test.cc | 6 +- src/ifmap/test/ifmap_update_sender_test.cc | 4 +- src/ifmap/test/ifmap_xmpp_client_mock.cc | 6 +- src/ifmap/test/ifmap_xmpp_test.cc | 20 +- src/ksync/ksync_entry.h | 18 +- src/ksync/ksync_index.h | 4 +- src/ksync/ksync_netlink.cc | 2 +- src/ksync/ksync_object.cc | 44 +- src/ksync/ksync_object.h | 20 +- src/ksync/ksync_sock.cc | 10 +- src/ksync/ksync_sock.h | 16 +- src/ksync/ksync_sock_user.cc | 38 +- src/ksync/ksync_sock_user.h | 50 +-- src/ksync/ksync_tx_queue.h | 2 +- src/ksync/test/ksync_db_test.cc | 6 +- src/ksync/test/ksync_tcp_test.cc | 12 +- src/ksync/test/ksync_test.cc | 30 +- src/net/mac_address.h | 2 +- src/route/route.h | 6 +- src/routing-policy/policy_config_parser.cc | 6 +- src/routing-policy/policy_edge.h | 2 +- src/routing-policy/policy_graph.cc | 10 +- src/routing-policy/policy_graph.h | 22 +- src/routing-policy/policy_vertex.cc | 2 +- src/routing-policy/test/policy_parse_test.cc | 4 +- src/vnsw/agent/cfg/cfg_init.cc | 10 +- src/vnsw/agent/cfg/cfg_init.h | 2 +- src/vnsw/agent/cfg/cfg_listener.h | 2 +- src/vnsw/agent/cfg/cfg_mirror.cc | 22 +- src/vnsw/agent/cfg/cfg_mirror.h | 10 +- src/vnsw/agent/cmn/agent.cc | 46 +- src/vnsw/agent/cmn/agent_cmn.h | 4 +- src/vnsw/agent/cmn/agent_db.cc | 4 +- src/vnsw/agent/cmn/agent_db.h | 2 +- src/vnsw/agent/cmn/agent_stats.h | 2 +- src/vnsw/agent/cmn/index_vector.h | 4 +- src/vnsw/agent/cmn/test/test.cc | 12 +- src/vnsw/agent/cmn/test/test.h | 8 +- src/vnsw/agent/cmn/test/test_subop.cc | 4 +- src/vnsw/agent/cmn/test/test_subop.h | 4 +- src/vnsw/agent/contrail/contrail_agent_init.h | 2 +- .../agent/contrail/freebsd/pkt0_interface.cc | 8 +- .../agent/contrail/linux/pkt0_interface.cc | 6 +- src/vnsw/agent/contrail/pkt0_interface.h | 4 +- .../agent/contrail/pkt0_interface_base.cc | 2 +- src/vnsw/agent/controller/controller_dns.cc | 6 +- .../agent/controller/controller_export.cc | 30 +- src/vnsw/agent/controller/controller_export.h | 6 +- src/vnsw/agent/controller/controller_ifmap.cc | 10 +- src/vnsw/agent/controller/controller_ifmap.h | 4 +- src/vnsw/agent/controller/controller_init.h | 2 +- src/vnsw/agent/controller/controller_peer.h | 4 +- .../agent/controller/controller_route_path.cc | 2 +- .../agent/controller/controller_route_path.h | 2 +- .../controller/controller_route_walker.cc | 50 +-- .../controller/controller_route_walker.h | 2 +- .../agent/controller/controller_vrf_export.cc | 12 +- src/vnsw/agent/diag/diag.cc | 4 +- src/vnsw/agent/diag/diag.h | 4 +- src/vnsw/agent/diag/diag_pkt_handler.cc | 22 +- src/vnsw/agent/diag/diag_pkt_handler.h | 2 +- src/vnsw/agent/diag/diag_proto.cc | 2 +- src/vnsw/agent/diag/overlay_ping.cc | 22 +- src/vnsw/agent/diag/overlay_ping.h | 8 +- src/vnsw/agent/diag/overlay_traceroute.cc | 20 +- src/vnsw/agent/diag/ping.cc | 2 +- src/vnsw/agent/diag/traceroute.cc | 4 +- src/vnsw/agent/filter/acl.cc | 28 +- src/vnsw/agent/filter/acl.h | 14 +- src/vnsw/agent/filter/acl_entry.cc | 28 +- src/vnsw/agent/filter/acl_entry.h | 4 +- src/vnsw/agent/filter/acl_entry_match.h | 6 +- src/vnsw/agent/filter/policy.cc | 4 +- src/vnsw/agent/filter/policy.h | 2 +- src/vnsw/agent/filter/test/acl_change_test.cc | 6 +- src/vnsw/agent/filter/test/acl_entry_test.cc | 14 +- src/vnsw/agent/filter/test/acl_test.cc | 14 +- src/vnsw/agent/filter/traffic_action.cc | 2 +- src/vnsw/agent/filter/traffic_action.h | 6 +- src/vnsw/agent/init/agent_param.cc | 22 +- src/vnsw/agent/init/agent_param.h | 18 +- src/vnsw/agent/init/contrail_init_common.cc | 2 +- src/vnsw/agent/init/contrail_init_common.h | 2 +- src/vnsw/agent/init/test/test_agent_init.cc | 62 +-- src/vnsw/agent/kstate/drop_stats_kstate.cc | 6 +- src/vnsw/agent/kstate/flow_kstate.cc | 8 +- src/vnsw/agent/kstate/flow_kstate.h | 4 +- src/vnsw/agent/kstate/interface_kstate.cc | 6 +- src/vnsw/agent/kstate/interface_kstate.h | 2 +- src/vnsw/agent/kstate/kstate.cc | 16 +- src/vnsw/agent/kstate/kstate.h | 2 +- src/vnsw/agent/kstate/kstate_handler.cc | 12 +- src/vnsw/agent/kstate/kstate_io_context.cc | 2 +- src/vnsw/agent/kstate/kstate_io_context.h | 2 +- src/vnsw/agent/kstate/mirror_kstate.cc | 2 +- src/vnsw/agent/kstate/mirror_kstate.h | 2 +- src/vnsw/agent/kstate/mpls_kstate.cc | 4 +- src/vnsw/agent/kstate/mpls_kstate.h | 2 +- src/vnsw/agent/kstate/nh_kstate.cc | 4 +- src/vnsw/agent/kstate/nh_kstate.h | 2 +- src/vnsw/agent/kstate/test/test_kstate.cc | 8 +- src/vnsw/agent/kstate/test/test_kstate.h | 68 +-- src/vnsw/agent/kstate/test/test_kstate_util.h | 20 +- .../agent/kstate/test/test_sandesh_kstate.cc | 26 +- src/vnsw/agent/kstate/vrf_assign_kstate.cc | 6 +- src/vnsw/agent/kstate/vrf_stats_kstate.cc | 6 +- src/vnsw/agent/kstate/vrf_stats_kstate.h | 2 +- src/vnsw/agent/kstate/vxlan_kstate.cc | 4 +- src/vnsw/agent/oper/agent_path.cc | 28 +- src/vnsw/agent/oper/agent_profile.cc | 8 +- src/vnsw/agent/oper/agent_route.cc | 6 +- src/vnsw/agent/oper/agent_route.h | 10 +- src/vnsw/agent/oper/agent_route_resync.cc | 6 +- src/vnsw/agent/oper/agent_route_walker.cc | 6 +- src/vnsw/agent/oper/agent_route_walker.h | 2 +- src/vnsw/agent/oper/agent_sandesh.cc | 2 +- src/vnsw/agent/oper/agent_sandesh.h | 20 +- src/vnsw/agent/oper/bgp_as_service.cc | 2 +- src/vnsw/agent/oper/config_manager.cc | 2 +- src/vnsw/agent/oper/config_manager.h | 10 +- src/vnsw/agent/oper/ecmp.cc | 4 +- src/vnsw/agent/oper/ecmp_load_balance.h | 6 +- src/vnsw/agent/oper/global_vrouter.cc | 22 +- src/vnsw/agent/oper/global_vrouter.h | 4 +- .../agent/oper/ifmap_dependency_manager.cc | 4 +- src/vnsw/agent/oper/inet4_multicast_route.cc | 46 +- src/vnsw/agent/oper/inet4_multicast_route.h | 12 +- src/vnsw/agent/oper/inet_interface.cc | 6 +- src/vnsw/agent/oper/inet_interface.h | 4 +- src/vnsw/agent/oper/inet_unicast_route.cc | 38 +- src/vnsw/agent/oper/inet_unicast_route.h | 8 +- src/vnsw/agent/oper/instance_task.cc | 2 +- src/vnsw/agent/oper/instance_task.h | 2 +- src/vnsw/agent/oper/interface.cc | 14 +- src/vnsw/agent/oper/interface.h | 4 +- src/vnsw/agent/oper/mirror_table.cc | 16 +- src/vnsw/agent/oper/mirror_table.h | 4 +- src/vnsw/agent/oper/mpls.cc | 8 +- src/vnsw/agent/oper/mpls.h | 2 +- src/vnsw/agent/oper/multicast.cc | 30 +- src/vnsw/agent/oper/multicast.h | 22 +- src/vnsw/agent/oper/nexthop.cc | 100 ++--- src/vnsw/agent/oper/nexthop.h | 22 +- src/vnsw/agent/oper/oper_dhcp_options.h | 2 +- src/vnsw/agent/oper/operdb_init.cc | 2 +- src/vnsw/agent/oper/packet_interface.h | 2 +- src/vnsw/agent/oper/peer.cc | 18 +- src/vnsw/agent/oper/peer.h | 6 +- src/vnsw/agent/oper/physical_device_vn.cc | 4 +- src/vnsw/agent/oper/physical_interface.cc | 2 +- .../agent/oper/remote_physical_interface.h | 2 +- src/vnsw/agent/oper/route_leak.cc | 16 +- src/vnsw/agent/oper/sg.cc | 2 +- src/vnsw/agent/oper/sg.h | 6 +- .../oper/test/docker_instance_adapter_test.cc | 2 +- .../test/libvirt_instance_adapter_test.cc | 10 +- src/vnsw/agent/oper/test/test_aap.cc | 2 +- src/vnsw/agent/oper/test/test_control_word.cc | 44 +- .../agent/oper/test/test_fabric_interface.cc | 4 +- src/vnsw/agent/oper/test/test_fabric_vmi.cc | 6 +- .../agent/oper/test/test_inet_interface.cc | 2 +- src/vnsw/agent/oper/test/test_intf.cc | 14 +- src/vnsw/agent/oper/test/test_linklocal.cc | 40 +- src/vnsw/agent/oper/test/test_qos_config.cc | 2 +- src/vnsw/agent/oper/test/test_vhost_vmi.cc | 8 +- src/vnsw/agent/oper/test/test_vrf_assign.cc | 4 +- .../agent/oper/test/test_xml_agent_init.h | 2 +- .../oper/test/test_xml_physical_device.cc | 2 +- src/vnsw/agent/oper/tunnel_nh.h | 4 +- src/vnsw/agent/oper/vm.cc | 2 +- src/vnsw/agent/oper/vm_interface.cc | 26 +- src/vnsw/agent/oper/vm_interface.h | 10 +- src/vnsw/agent/oper/vm_interface_config.cc | 4 +- src/vnsw/agent/oper/vm_interface_request.cc | 10 +- src/vnsw/agent/oper/vm_interface_utils.cc | 6 +- src/vnsw/agent/oper/vn.cc | 46 +- src/vnsw/agent/oper/vn.h | 6 +- src/vnsw/agent/oper/vrf.cc | 24 +- src/vnsw/agent/oper/vrf.h | 4 +- src/vnsw/agent/oper/vrf_assign.cc | 8 +- src/vnsw/agent/oper/vrf_assign.h | 2 +- src/vnsw/agent/oper/vxlan.cc | 12 +- src/vnsw/agent/oper/vxlan.h | 6 +- .../agent/oper/windows/interface_params.cc | 2 +- .../ovsdb_client/multicast_mac_local_ovsdb.h | 4 +- .../ovsdb_client/ovsdb_client_ssl.cc | 2 +- .../ovsdb_client/ovsdb_client_tcp.cc | 4 +- .../ovsdb_client/unicast_mac_remote_ovsdb.cc | 2 +- src/vnsw/agent/pkt/flow_entry.cc | 36 +- src/vnsw/agent/pkt/flow_entry.h | 12 +- src/vnsw/agent/pkt/flow_event.cc | 2 +- src/vnsw/agent/pkt/flow_handler.cc | 2 +- src/vnsw/agent/pkt/flow_mgmt.cc | 2 +- src/vnsw/agent/pkt/flow_mgmt.h | 4 +- src/vnsw/agent/pkt/flow_mgmt_dbclient.cc | 6 +- src/vnsw/agent/pkt/flow_mgmt_dbclient.h | 2 +- src/vnsw/agent/pkt/flow_table.cc | 4 +- src/vnsw/agent/pkt/flow_table.h | 8 +- src/vnsw/agent/pkt/pkt_flow_info.cc | 46 +- src/vnsw/agent/pkt/pkt_flow_info.h | 6 +- src/vnsw/agent/pkt/pkt_handler.cc | 12 +- src/vnsw/agent/pkt/pkt_handler.h | 8 +- src/vnsw/agent/pkt/pkt_sandesh_flow.h | 2 +- src/vnsw/agent/pkt/proto.cc | 4 +- src/vnsw/agent/pkt/proto_handler.cc | 2 +- src/vnsw/agent/pkt/test/test_ecmp_l2_pkt.cc | 6 +- src/vnsw/agent/pkt/test/test_ecmp_local.cc | 12 +- src/vnsw/agent/pkt/test/test_ecmp_mx.cc | 28 +- src/vnsw/agent/pkt/test/test_ecmp_remote.cc | 26 +- .../agent/pkt/test/test_ecmp_service_vlan.cc | 90 ++-- src/vnsw/agent/pkt/test/test_fip_src_ecmp.cc | 22 +- src/vnsw/agent/pkt/test/test_flow_add.cc | 20 +- src/vnsw/agent/pkt/test/test_flow_age.cc | 10 +- src/vnsw/agent/pkt/test/test_flow_base.cc | 4 +- src/vnsw/agent/pkt/test/test_flow_error.cc | 6 +- .../agent/pkt/test/test_flow_mgr_instances.cc | 4 +- src/vnsw/agent/pkt/test/test_flow_nat.cc | 98 ++--- src/vnsw/agent/pkt/test/test_flow_policy.cc | 6 +- src/vnsw/agent/pkt/test/test_flow_qos.cc | 18 +- src/vnsw/agent/pkt/test/test_flow_scale.cc | 4 +- src/vnsw/agent/pkt/test/test_flow_table.cc | 2 +- src/vnsw/agent/pkt/test/test_flow_update.cc | 8 +- src/vnsw/agent/pkt/test/test_flow_util.h | 30 +- src/vnsw/agent/pkt/test/test_flow_vhost.cc | 28 +- src/vnsw/agent/pkt/test/test_flowtable.cc | 6 +- src/vnsw/agent/pkt/test/test_pkt.cc | 12 +- src/vnsw/agent/pkt/test/test_pkt_fip.cc | 84 ++-- src/vnsw/agent/pkt/test/test_pkt_flow_mock.cc | 52 +-- src/vnsw/agent/pkt/test/test_pkt_parse.cc | 10 +- src/vnsw/agent/pkt/test/test_pkt_util.cc | 56 +-- src/vnsw/agent/pkt/test/test_pkt_util.h | 44 +- .../agent/pkt/test/test_port_allocator.cc | 58 +-- src/vnsw/agent/pkt/test/test_sg_flow.cc | 16 +- src/vnsw/agent/pkt/test/test_sg_tcp_flow.cc | 30 +- src/vnsw/agent/pkt/test/test_vmi_underlay.cc | 2 +- .../agent/pkt/test/test_vrf_assign_acl.cc | 4 +- .../agent/pkt/test/test_vrf_assign_acl_fip.cc | 14 +- .../agent/pkt/test/test_xml_flow_agent_init.h | 2 +- src/vnsw/agent/port_ipc/port_ipc_handler.cc | 2 +- .../agent/port_ipc/port_subscribe_table.cc | 4 +- .../resource_manager/bgp_as_service_index.cc | 4 +- .../agent/resource_manager/mirror_index.cc | 2 +- .../agent/resource_manager/mirror_index.h | 2 +- src/vnsw/agent/resource_manager/qos_index.cc | 2 +- .../agent/resource_manager/resource_backup.h | 2 +- .../resource_manager/resource_manager.cc | 2 +- .../test/test_resource_allocator.cc | 6 +- .../resource_manager/vm_interface_index.h | 4 +- src/vnsw/agent/resource_manager/vrf_index.cc | 2 +- src/vnsw/agent/resource_manager/vrf_index.h | 2 +- src/vnsw/agent/services/arp_entry.cc | 4 +- src/vnsw/agent/services/arp_handler.cc | 6 +- src/vnsw/agent/services/arp_proto.cc | 6 +- src/vnsw/agent/services/arp_proto.h | 2 +- src/vnsw/agent/services/dhcp_handler.cc | 14 +- src/vnsw/agent/services/dhcp_handler.h | 6 +- src/vnsw/agent/services/dhcp_handler_base.cc | 8 +- src/vnsw/agent/services/dhcpv6_handler.cc | 8 +- src/vnsw/agent/services/dhcpv6_handler.h | 2 +- src/vnsw/agent/services/dhcpv6_proto.h | 2 +- src/vnsw/agent/services/dns_handler.cc | 50 +-- src/vnsw/agent/services/dns_handler.h | 2 +- src/vnsw/agent/services/dns_proto.cc | 2 +- src/vnsw/agent/services/dns_proto.h | 2 +- .../agent/services/icmpv6_error_handler.cc | 22 +- src/vnsw/agent/services/metadata_proxy.cc | 8 +- src/vnsw/agent/services/metadata_proxy.h | 2 +- .../multicast/agent_map/bvx_environment.h | 6 +- .../multicast/agent_map/gmpx_environment.h | 36 +- .../services/multicast/gmp_map/gmp_map.h | 2 +- .../services/multicast/gmp_map/gmp_proto.h | 2 +- .../services/multicast/gmp_map/igmp_private.h | 2 +- .../agent/services/multicast/grpmgmt/gmp.h | 44 +- .../services/multicast/grpmgmt/gmp_externs.h | 66 +-- .../services/multicast/grpmgmt/gmp_host.h | 28 +- .../services/multicast/grpmgmt/gmp_private.h | 318 +++++++------- .../services/multicast/grpmgmt/gmp_router.h | 156 +++---- .../services/multicast/grpmgmt/gmp_trace.h | 22 +- .../services/multicast/grpmgmt/gmph_private.h | 212 +++++----- .../services/multicast/grpmgmt/gmpp_private.h | 16 +- .../services/multicast/grpmgmt/gmpr_private.h | 400 +++++++++--------- .../services/multicast/grpmgmt/gmpr_trace.h | 6 +- .../multicast/grpmgmt/igmp_protocol.h | 84 ++-- .../services/multicast/grpmgmt/mld_proto.h | 112 ++--- .../multicast/stubs/bitvector/bitvector.h | 52 +-- .../stubs/bitvector/bitvector_private.h | 20 +- .../stubs/bitvector/ordinal_private.h | 4 +- src/vnsw/agent/services/services_init.cc | 2 +- src/vnsw/agent/services/services_sandesh.cc | 18 +- src/vnsw/agent/services/services_sandesh.h | 2 +- .../services/test/arp_path_preference_test.cc | 4 +- src/vnsw/agent/services/test/arp_test.cc | 12 +- src/vnsw/agent/services/test/dhcp_test.cc | 78 ++-- src/vnsw/agent/services/test/dns_test.cc | 38 +- src/vnsw/agent/services/test/icmp_test.cc | 10 +- .../test/icmpv6_path_preference_test.cc | 4 +- src/vnsw/agent/services/test/metadata_test.cc | 18 +- .../agent/services/test/pkt_trace_test.cc | 12 +- src/vnsw/agent/test-xml/test_xml_oper.h | 2 +- src/vnsw/agent/test-xml/test_xml_validate.cc | 2 +- src/vnsw/agent/test/control_node_mock.cc | 28 +- src/vnsw/agent/test/control_node_mock.h | 10 +- src/vnsw/agent/test/test_agent_db_entry.cc | 2 +- src/vnsw/agent/test/test_agent_init.h | 2 +- .../agent/test/test_agent_route_walker.cc | 4 +- src/vnsw/agent/test/test_alias_ip_cfg.cc | 4 +- src/vnsw/agent/test/test_basic_scale.h | 74 ++-- .../test/test_bgp_service_configuration.cc | 2 +- src/vnsw/agent/test/test_cfg.cc | 120 +++--- src/vnsw/agent/test/test_cfg_listener.cc | 22 +- src/vnsw/agent/test/test_cmn_util.h | 22 +- src/vnsw/agent/test/test_ecmp6.cc | 4 +- src/vnsw/agent/test/test_ecmp_nh.cc | 24 +- src/vnsw/agent/test/test_evpn_route.cc | 2 +- src/vnsw/agent/test/test_forwarding_mode.cc | 8 +- .../agent/test/test_global_vrouter_config.cc | 8 +- src/vnsw/agent/test/test_init.h | 28 +- src/vnsw/agent/test/test_integration.cc | 2 +- src/vnsw/agent/test/test_l2route.cc | 14 +- src/vnsw/agent/test/test_llgr.cc | 6 +- src/vnsw/agent/test/test_mirror.cc | 26 +- src/vnsw/agent/test/test_multicast.cc | 140 +++--- src/vnsw/agent/test/test_nh.cc | 26 +- .../agent/test/test_path_preference_walker.cc | 8 +- src/vnsw/agent/test/test_peer_del.cc | 16 +- src/vnsw/agent/test/test_route.cc | 60 +-- src/vnsw/agent/test/test_route_mock.cc | 80 ++-- src/vnsw/agent/test/test_scale_walk.cc | 20 +- src/vnsw/agent/test/test_service_chain_cfg.cc | 8 +- src/vnsw/agent/test/test_setup.h | 136 +++--- src/vnsw/agent/test/test_tunnel_encap.cc | 64 +-- src/vnsw/agent/test/test_util.cc | 22 +- src/vnsw/agent/test/test_vhost_ip_change.cc | 2 +- src/vnsw/agent/test/test_vm.cc | 6 +- src/vnsw/agent/test/test_vmport_cfg.cc | 18 +- src/vnsw/agent/test/test_vn.cc | 28 +- src/vnsw/agent/test/test_vrf.cc | 12 +- src/vnsw/agent/test/test_vxlan_routing.cc | 8 +- src/vnsw/agent/test/test_xmpp.cc | 96 ++--- src/vnsw/agent/test/test_xmpp_bcast.cc | 252 +++++------ src/vnsw/agent/test/test_xmpp_hv.cc | 24 +- src/vnsw/agent/test/test_xmpp_ifmap.cc | 8 +- src/vnsw/agent/test/test_xmpp_non_hv.cc | 2 +- src/vnsw/agent/test/test_xmpp_v6.cc | 70 +-- src/vnsw/agent/test/test_xmppcs.cc | 116 ++--- src/vnsw/agent/test/test_xmppcs_bcast.cc | 258 +++++------ src/vnsw/agent/test/test_xmppcs_ifmap.cc | 12 +- src/vnsw/agent/uve/mock_generator.cc | 4 +- src/vnsw/agent/uve/test/agent_param_test.h | 2 +- .../uve/test/agent_stats_collector_test.cc | 10 +- .../uve/test/agent_stats_collector_test.h | 16 +- .../uve/test/interface_uve_table_test.cc | 4 +- .../agent/uve/test/prouter_uve_table_test.cc | 2 +- src/vnsw/agent/uve/test/test_interface_uve.cc | 18 +- src/vnsw/agent/uve/test/test_prouter_uve.cc | 2 +- src/vnsw/agent/uve/test/test_stats_mock.cc | 20 +- src/vnsw/agent/uve/test/test_uve.cc | 14 +- src/vnsw/agent/uve/test/test_vm_uve.cc | 26 +- src/vnsw/agent/uve/test/test_vn_uve.cc | 40 +- src/vnsw/agent/uve/test/test_vrouter_uve.cc | 4 +- src/vnsw/agent/uve/test/vm_uve_table_test.cc | 4 +- src/vnsw/agent/uve/test/vn_uve_table_test.cc | 4 +- src/vnsw/agent/uve/test/vn_uve_table_test.h | 2 +- .../agent/uve/test/vrouter_uve_entry_test.cc | 6 +- .../agent/uve/test/vrouter_uve_entry_test.h | 2 +- src/vnsw/agent/uve/vrouter_uve_entry.h | 2 +- src/vnsw/agent/vgw/cfg_vgw.cc | 4 +- src/vnsw/agent/vgw/cfg_vgw.h | 6 +- src/vnsw/agent/vgw/test/test_vgw_dynamic.cc | 22 +- src/vnsw/agent/vgw/vgw.cc | 6 +- .../vrouter/flow_stats/flow_export_info.cc | 8 +- .../flow_stats/flow_stats_collector.cc | 4 +- .../vrouter/flow_stats/flow_stats_manager.cc | 2 +- .../flow_stats/session_stats_collector.cc | 4 +- .../flow_stats/test/test_flow_stats.cc | 10 +- .../agent/vrouter/ksync/flowtable_ksync.cc | 30 +- .../agent/vrouter/ksync/interface_ksync.cc | 6 +- .../agent/vrouter/ksync/interface_ksync.h | 2 +- src/vnsw/agent/vrouter/ksync/ksync_init.cc | 2 +- src/vnsw/agent/vrouter/ksync/ksync_init.h | 12 +- src/vnsw/agent/vrouter/ksync/mirror_ksync.cc | 22 +- src/vnsw/agent/vrouter/ksync/mirror_ksync.h | 4 +- src/vnsw/agent/vrouter/ksync/mpls_ksync.cc | 18 +- src/vnsw/agent/vrouter/ksync/nexthop_ksync.cc | 22 +- src/vnsw/agent/vrouter/ksync/nexthop_ksync.h | 4 +- src/vnsw/agent/vrouter/ksync/route_ksync.cc | 26 +- src/vnsw/agent/vrouter/ksync/route_ksync.h | 6 +- src/vnsw/agent/vrouter/ksync/sandesh_ksync.h | 4 +- .../agent/vrouter/ksync/test/ksync_test.cc | 2 +- .../agent/vrouter/ksync/test/test_vnswif.cc | 8 +- .../vrouter/ksync/vnswif_listener_base.h | 2 +- .../agent/vrouter/ksync/vrf_assign_ksync.cc | 20 +- .../agent/vrouter/ksync/vrf_assign_ksync.h | 2 +- src/vnsw/agent/vrouter/ksync/vxlan_ksync.cc | 24 +- src/vnsw/agent/vrouter/ksync/vxlan_ksync.h | 2 +- .../agent_stats_sandesh_context.cc | 2 +- .../agent/vxlan_agent/ksync_vxlan_route.h | 6 +- .../linux/linux_vxlan_agent_init.cc | 2 +- src/xml/test/xml_test.cc | 40 +- src/xml/xml_base.cc | 4 +- src/xml/xml_base.h | 8 +- src/xml/xml_pugi.cc | 34 +- src/xml/xml_pugi.h | 14 +- src/xmpp/test/xmpp_client_sm_test.cc | 84 ++-- src/xmpp/test/xmpp_client_standalone.cc | 10 +- src/xmpp/test/xmpp_pubsub_client.cc | 4 +- src/xmpp/test/xmpp_pubsub_test.cc | 14 +- src/xmpp/test/xmpp_regex_test.cc | 8 +- src/xmpp/test/xmpp_sample_peer.cc | 8 +- src/xmpp/test/xmpp_server_auth_sm_test.cc | 4 +- src/xmpp/test/xmpp_server_standalone.cc | 10 +- src/xmpp/test/xmpp_server_test.cc | 16 +- src/xmpp/test/xmpp_session_test.cc | 24 +- src/xmpp/test/xmpp_stream_message_client.cc | 26 +- src/xmpp/test/xmpp_stream_message_server.cc | 14 +- src/xmpp/xmpp_channel.h | 4 +- src/xmpp/xmpp_channel_mux.cc | 12 +- src/xmpp/xmpp_channel_mux.h | 2 +- src/xmpp/xmpp_client.cc | 16 +- src/xmpp/xmpp_client.h | 8 +- src/xmpp/xmpp_config.cc | 6 +- src/xmpp/xmpp_connection.cc | 14 +- src/xmpp/xmpp_connection.h | 2 +- src/xmpp/xmpp_init.cc | 10 +- src/xmpp/xmpp_init.h | 10 +- src/xmpp/xmpp_proto.cc | 54 +-- src/xmpp/xmpp_proto.h | 16 +- src/xmpp/xmpp_server.cc | 16 +- src/xmpp/xmpp_state_machine.h | 6 +- src/xmpp/xmpp_str.h | 6 +- src/xmpp/xmpp_stream.h | 2 +- 528 files changed, 4520 insertions(+), 4520 deletions(-) diff --git a/src/bfd/rest_api/bfd_rest_server.h b/src/bfd/rest_api/bfd_rest_server.h index cc6f9d5d73a..a8218b3c43a 100644 --- a/src/bfd/rest_api/bfd_rest_server.h +++ b/src/bfd/rest_api/bfd_rest_server.h @@ -79,7 +79,7 @@ class RESTServer { void ClientIPAddressHandlerDelete(const struct RESTData&); void ClientMonitorHandler(const struct RESTData&); - ClientMap client_sessions_; + ClientMap client_sessions_; Server *bfd_server_; tbb::mutex mutex_; }; diff --git a/src/bfd/test/bfd_test_utils.h b/src/bfd/test/bfd_test_utils.h index 230624cf12f..6b5c35c60b2 100644 --- a/src/bfd/test/bfd_test_utils.h +++ b/src/bfd/test/bfd_test_utils.h @@ -50,7 +50,7 @@ class TestCommunicatorManager { explicit TestCommunicatorManager(boost::asio::io_service *io_service) : io_service(io_service) {} - + static void processPacketAndFreeActual(const callback &cb, const ControlPacket *controlPacket) { cb(controlPacket); diff --git a/src/bgp/bgp_config_yaml.cc b/src/bgp/bgp_config_yaml.cc index b52cb6f261a..b5e4d2e7751 100644 --- a/src/bgp/bgp_config_yaml.cc +++ b/src/bgp/bgp_config_yaml.cc @@ -602,7 +602,7 @@ bool BgpYamlConfigManager::Resolve(Configuration *candidate, void BgpYamlConfigManager::UpdateProtocol( Configuration *current, Configuration *next) { - BgpProtocolConfig *curr_proto = current->GetProtocolConfig(); + BgpProtocolConfig *curr_proto = current->GetProtocolConfig(); BgpProtocolConfig *next_proto = next->GetProtocolConfig(); if (curr_proto->CompareTo(*next_proto) == 0) { Notify(next_proto, CFG_CHANGE); diff --git a/src/bgp/bgp_message_builder.cc b/src/bgp/bgp_message_builder.cc index 3e5555c88f2..52e3d3c7f9b 100644 --- a/src/bgp/bgp_message_builder.cc +++ b/src/bgp/bgp_message_builder.cc @@ -128,7 +128,7 @@ bool BgpMessage::StartReach(const RibOut *ribout, const RibOutAttr *roattr, route->BuildBgpProtoNextHop(nh, attr->nexthop()); BgpMpNlri *nlri = new BgpMpNlri( - BgpAttribute::MPReachNlri, BgpAf::FamilyToAfi(family), + BgpAttribute::MPReachNlri, BgpAf::FamilyToAfi(family), BgpAf::FamilyToSafi(family), nh); update.path_attributes.push_back(nlri); @@ -157,7 +157,7 @@ bool BgpMessage::StartUnreach(const BgpRoute *route) { Address::Family family = table_->family(); BgpMpNlri *nlri = - new BgpMpNlri(BgpAttribute::MPUnreachNlri, + new BgpMpNlri(BgpAttribute::MPUnreachNlri, BgpAf::FamilyToAfi(family), BgpAf::FamilyToSafi(family)); update.path_attributes.push_back(nlri); diff --git a/src/bgp/bgp_show_config.cc b/src/bgp/bgp_show_config.cc index a1e67bbc812..c9b6199d299 100644 --- a/src/bgp/bgp_show_config.cc +++ b/src/bgp/bgp_show_config.cc @@ -587,7 +587,7 @@ void ShowBgpGlobalSystemConfigReq::HandleRequest() const { ShowBgpGlobalSystemConfigReqIterate, ShowBgpGlobalSystemConfigResp, ShowBgpGlobalSystemConfig>::CreateData; - + s1.instances_.push_back(0); ps.stages_.push_back(s1); RequestPipeline rp(ps); @@ -607,13 +607,13 @@ void ShowBgpGlobalSystemConfigReqIterate::HandleRequest() const { ShowBgpGlobalSystemConfigReqIterate, ShowBgpGlobalSystemConfigResp, ShowBgpGlobalSystemConfig>::CallbackIterate, _1, _2, _3, _4, _5); - + s1.allocFn_ = BgpShowHandler< ShowBgpGlobalSystemConfigReq, ShowBgpGlobalSystemConfigReqIterate, ShowBgpGlobalSystemConfigResp, ShowBgpGlobalSystemConfig>::CreateData; - + s1.instances_.push_back(0); ps.stages_.push_back(s1); RequestPipeline rp(ps); diff --git a/src/bgp/evpn/evpn_table.cc b/src/bgp/evpn/evpn_table.cc index 73ad57d246f..a81accd717b 100644 --- a/src/bgp/evpn/evpn_table.cc +++ b/src/bgp/evpn/evpn_table.cc @@ -151,10 +151,10 @@ BgpRoute *EvpnTable::RouteReplicate(BgpServer *server, } if (evpn_prefix.type() == EvpnPrefix::AutoDiscoveryRoute) { - if (IsMaster() || evpn_prefix.tag() != EvpnPrefix::kMaxTag) - return NULL; - community = server->extcomm_db()->ReplaceRTargetAndLocate( - community.get(), ExtCommunity::ExtCommunityList()); + if (IsMaster() || evpn_prefix.tag() != EvpnPrefix::kMaxTag) + return NULL; + community = server->extcomm_db()->ReplaceRTargetAndLocate( + community.get(), ExtCommunity::ExtCommunityList()); } if (evpn_prefix.type() == EvpnPrefix::SegmentRoute) return NULL; diff --git a/src/bgp/mvpn/test/mvpn_table_test.cc b/src/bgp/mvpn/test/mvpn_table_test.cc index 6a3298478ca..71c6b8551c4 100644 --- a/src/bgp/mvpn/test/mvpn_table_test.cc +++ b/src/bgp/mvpn/test/mvpn_table_test.cc @@ -307,9 +307,9 @@ TEST_F(MvpnTableTest, CreateType4LeafADRoutePrefix) { TASK_UTIL_EXPECT_EQ(BgpAf::MVpn, BgpAf::FamilyToSafi(blue_->family())); TASK_UTIL_EXPECT_EQ(4, type4_rt->GetPrefix().type()); TASK_UTIL_EXPECT_EQ(rt->GetPrefix().source(), - type4_rt->GetPrefix().source()); + type4_rt->GetPrefix().source()); TASK_UTIL_EXPECT_EQ(rt->GetPrefix().group(), - type4_rt->GetPrefix().group()); + type4_rt->GetPrefix().group()); DelRoute(blue_, prefix_str); task_util::WaitForIdle(); @@ -351,11 +351,11 @@ TEST_F(MvpnTableTest, CreateType3SPMSIRoutePrefix) { TASK_UTIL_EXPECT_EQ(BgpAf::MVpn, BgpAf::FamilyToSafi(blue_->family())); TASK_UTIL_EXPECT_EQ(3, type3_rt->GetPrefix().type()); TASK_UTIL_EXPECT_EQ(rt->GetPrefix().source(), - type3_rt->GetPrefix().source()); + type3_rt->GetPrefix().source()); TASK_UTIL_EXPECT_EQ(rt->GetPrefix().group(), - type3_rt->GetPrefix().group()); + type3_rt->GetPrefix().group()); TASK_UTIL_EXPECT_EQ(blue_->server()->bgp_identifier(), - rt->GetPrefix().originator().to_ulong()); + rt->GetPrefix().originator().to_ulong()); DelRoute(blue_, prefix_str); task_util::WaitForIdle(); @@ -384,7 +384,7 @@ TEST_F(MvpnTableTest, CreateType2RoutePrefix) { TASK_UTIL_EXPECT_EQ(BgpAf::MVpn, BgpAf::FamilyToSafi(blue_->family())); TASK_UTIL_EXPECT_EQ(2, rt->GetPrefix().type()); TASK_UTIL_EXPECT_EQ(blue_->server()->autonomous_system(), - rt->GetPrefix().asn()); + rt->GetPrefix().asn()); DelRoute(blue_, prefix_str); task_util::WaitForIdle(); @@ -406,7 +406,7 @@ TEST_F(MvpnTableTest, CreateType1RoutePrefix) { TASK_UTIL_EXPECT_EQ(BgpAf::MVpn, BgpAf::FamilyToSafi(blue_->family())); TASK_UTIL_EXPECT_EQ(1, rt->GetPrefix().type()); TASK_UTIL_EXPECT_EQ(blue_->server()->bgp_identifier(), - rt->GetPrefix().originator().to_ulong()); + rt->GetPrefix().originator().to_ulong()); DelRoute(blue_, prefix_str); task_util::WaitForIdle(); diff --git a/src/bgp/routing-instance/routing_instance.cc b/src/bgp/routing-instance/routing_instance.cc index 2d76b810068..f787cfc8c7b 100644 --- a/src/bgp/routing-instance/routing_instance.cc +++ b/src/bgp/routing-instance/routing_instance.cc @@ -713,7 +713,7 @@ void RoutingInstanceMgr::DestroyRoutingInstance(RoutingInstance *rtinstance) { } } -SandeshTraceBufferPtr RoutingInstanceMgr::LocateTraceBuffer( +SandeshTraceBufferPtr RoutingInstanceMgr::LocateTraceBuffer( const std::string &name) { SandeshTraceBufferPtr trace_buf; @@ -730,15 +730,15 @@ SandeshTraceBufferPtr RoutingInstanceMgr::GetTraceBuffer( tbb::spin_rw_mutex::scoped_lock write_lock(rw_mutex_, true); SandeshTraceBufferPtr trace_buf; RoutingInstanceTraceBufferMap::iterator iter; - + iter = trace_buffer_active_.find(name); if (iter != trace_buffer_active_.end()) { return iter->second; } - + iter = trace_buffer_dormant_.find(name); if (iter != trace_buffer_dormant_.end()) { - // tracebuf was created for this RoutingInstance in its prior + // tracebuf was created for this RoutingInstance in its prior // incarnation trace_buf = iter->second; trace_buffer_dormant_.erase(iter); @@ -751,7 +751,7 @@ SandeshTraceBufferPtr RoutingInstanceMgr::GetTraceBuffer( trace_buf = SandeshTraceBufferCreate( name + RTINSTANCE_TRACE_BUF, 1000); trace_buffer_active_.insert(make_pair(name, trace_buf)); - + return trace_buf; } @@ -772,7 +772,7 @@ void RoutingInstanceMgr::DisableTraceBuffer(const std::string &name) { // Move to Dormant map. if (trace_buffer_dormant_.size() >= dormant_trace_buf_size_) { // Make room in the Dormant map, so creating by: - // 1. Delete oldest entries in dormant map + // 1. Delete oldest entries in dormant map // 2. Insert the new entry. size_t del_count = std::min(trace_buffer_dormant_list_.size(), trace_buf_threshold_); @@ -799,10 +799,10 @@ void RoutingInstanceMgr::DisableTraceBuffer(const std::string &name) { return; } -SandeshTraceBufferPtr +SandeshTraceBufferPtr RoutingInstanceMgr::GetActiveTraceBuffer(const std::string &name) const { tbb::spin_rw_mutex::scoped_lock read_lock(rw_mutex_, false); - RoutingInstanceTraceBufferMap::const_iterator iter = + RoutingInstanceTraceBufferMap::const_iterator iter = trace_buffer_active_.find(name); if (iter != trace_buffer_active_.end()) { @@ -815,9 +815,9 @@ RoutingInstanceMgr::GetActiveTraceBuffer(const std::string &name) const { SandeshTraceBufferPtr RoutingInstanceMgr::GetDormantTraceBuffer(const std::string &name) const { tbb::spin_rw_mutex::scoped_lock read_lock(rw_mutex_, false); - RoutingInstanceTraceBufferMap::const_iterator iter = + RoutingInstanceTraceBufferMap::const_iterator iter = trace_buffer_dormant_.find(name); - + if (iter != trace_buffer_dormant_.end()) { return iter->second; } else { @@ -828,16 +828,16 @@ RoutingInstanceMgr::GetDormantTraceBuffer(const std::string &name) const { bool RoutingInstanceMgr::HasRoutingInstanceActiveTraceBuf(const std::string &name) const { tbb::spin_rw_mutex::scoped_lock read_lock(rw_mutex_, false); - RoutingInstanceTraceBufferMap::const_iterator iter = + RoutingInstanceTraceBufferMap::const_iterator iter = trace_buffer_active_.find(name); - + return (iter != trace_buffer_active_.end()); } -bool RoutingInstanceMgr::HasRoutingInstanceDormantTraceBuf(const std::string +bool RoutingInstanceMgr::HasRoutingInstanceDormantTraceBuf(const std::string &name) const { tbb::spin_rw_mutex::scoped_lock read_lock(rw_mutex_, false); - RoutingInstanceTraceBufferMap::const_iterator iter = + RoutingInstanceTraceBufferMap::const_iterator iter = trace_buffer_dormant_.find(name); return (iter != trace_buffer_dormant_.end()); } @@ -850,7 +850,7 @@ RoutingInstanceMgr::GetEnvRoutingInstanceDormantTraceBufferCapacity() const { if (buffer_capacity_str) { size_t env_buffer_capacity = strtoul(buffer_capacity_str, NULL, 0); return env_buffer_capacity; - } + } return 0; } @@ -861,7 +861,7 @@ RoutingInstanceMgr::GetEnvRoutingInstanceDormantTraceBufferThreshold() const { if (buffer_threshold_str) { size_t env_buffer_threshold = strtoul(buffer_threshold_str, NULL, 0); return env_buffer_threshold; - } + } return ROUTING_INSTANCE_DORMANT_TRACE_BUFFER_THRESHOLD_1K; } diff --git a/src/bgp/rtarget/test/rtarget_address_test.cc b/src/bgp/rtarget/test/rtarget_address_test.cc index 94595cc1bf0..f9651471fed 100644 --- a/src/bgp/rtarget/test/rtarget_address_test.cc +++ b/src/bgp/rtarget/test/rtarget_address_test.cc @@ -13,7 +13,7 @@ class RouteTargetTest : public ::testing::Test { TEST_F(RouteTargetTest, ByteArrayType0_1) { RouteTarget::bytes_type data = - { { 0x00, 0x02, 0xff, 0x84, 0x01, 0x02, 0x03, 0x04 } }; + { { 0x00, 0x02, 0xff, 0x84, 0x01, 0x02, 0x03, 0x04 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(0, rtarget.Type()); @@ -23,7 +23,7 @@ TEST_F(RouteTargetTest, ByteArrayType0_1) { TEST_F(RouteTargetTest, ByteArrayType0_2) { RouteTarget::bytes_type data = - { { 0x00, 0x02, 0xff, 0x84, 0x04, 0x03, 0x02, 0x01 } }; + { { 0x00, 0x02, 0xff, 0x84, 0x04, 0x03, 0x02, 0x01 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(0, rtarget.Type()); @@ -33,7 +33,7 @@ TEST_F(RouteTargetTest, ByteArrayType0_2) { TEST_F(RouteTargetTest, ByteArrayType0_3) { RouteTarget::bytes_type data = - { { 0x00, 0x02, 0xff, 0x84, 0x00, 0x00, 0x00, 0x00 } }; + { { 0x00, 0x02, 0xff, 0x84, 0x00, 0x00, 0x00, 0x00 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(0, rtarget.Type()); @@ -43,7 +43,7 @@ TEST_F(RouteTargetTest, ByteArrayType0_3) { TEST_F(RouteTargetTest, ByteArrayType0_4) { RouteTarget::bytes_type data = - { { 0x00, 0x02, 0xff, 0x84, 0xFF, 0xFF, 0xFF, 0xFF } }; + { { 0x00, 0x02, 0xff, 0x84, 0xFF, 0xFF, 0xFF, 0xFF } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(0, rtarget.Type()); @@ -53,7 +53,7 @@ TEST_F(RouteTargetTest, ByteArrayType0_4) { TEST_F(RouteTargetTest, ByteArrayType1_1) { RouteTarget::bytes_type data = - { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x12, 0x34 } }; + { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x12, 0x34 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(1, rtarget.Type()); @@ -63,7 +63,7 @@ TEST_F(RouteTargetTest, ByteArrayType1_1) { TEST_F(RouteTargetTest, ByteArrayType1_2) { RouteTarget::bytes_type data = - { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x43, 0x21 } }; + { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x43, 0x21 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(1, rtarget.Type()); @@ -73,7 +73,7 @@ TEST_F(RouteTargetTest, ByteArrayType1_2) { TEST_F(RouteTargetTest, ByteArrayType1_3) { RouteTarget::bytes_type data = - { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x00, 0x00 } }; + { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0x00, 0x00 } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(1, rtarget.Type()); @@ -83,7 +83,7 @@ TEST_F(RouteTargetTest, ByteArrayType1_3) { TEST_F(RouteTargetTest, ByteArrayType1_4) { RouteTarget::bytes_type data = - { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0xFF, 0xFF } }; + { { 0x01, 0x02, 0x0a, 0x01, 0x01, 0x01, 0xFF, 0xFF } }; RouteTarget rtarget(data); EXPECT_FALSE(rtarget.IsNull()); EXPECT_EQ(1, rtarget.Type()); diff --git a/src/bgp/test/bgp_config_listener_test.cc b/src/bgp/test/bgp_config_listener_test.cc index 33270f24db0..12416d26ac0 100644 --- a/src/bgp/test/bgp_config_listener_test.cc +++ b/src/bgp/test/bgp_config_listener_test.cc @@ -1987,7 +1987,7 @@ TEST_F(BgpConfigListenerTest, RoutingPolicyUpdate_9) { } // -// Validate that routing instance is added to change list when associated +// Validate that routing instance is added to change list when associated // route-aggregate object is updated // TEST_F(BgpConfigListenerTest, RouteAggregate_0) { diff --git a/src/bgp/test/bgp_evpn_aliasing_test.cc b/src/bgp/test/bgp_evpn_aliasing_test.cc index 47e8f4cbad3..f5389c4c45e 100644 --- a/src/bgp/test/bgp_evpn_aliasing_test.cc +++ b/src/bgp/test/bgp_evpn_aliasing_test.cc @@ -429,41 +429,41 @@ class BgpEvpnAliasingTest : public ::testing::Test { TASK_UTIL_EXPECT_TRUE(CheckSegmentPeNoExists(esi, peer)); } - void DisableSegmentUpdateProcessing() { + void DisableSegmentUpdateProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::DisableSegmentUpdateProcessing, blue_manager_), "bgp::Config"); - } + } - void EnableSegmentUpdateProcessing() { + void EnableSegmentUpdateProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::EnableSegmentUpdateProcessing, blue_manager_), "bgp::Config"); - } + } - void DisableSegmentDeleteProcessing() { + void DisableSegmentDeleteProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::DisableSegmentDeleteProcessing, blue_manager_), "bgp::Config"); - } + } - void EnableSegmentDeleteProcessing() { + void EnableSegmentDeleteProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::EnableSegmentDeleteProcessing, blue_manager_), "bgp::Config"); - } + } - void DisableMacUpdateProcessing() { + void DisableMacUpdateProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::DisableMacUpdateProcessing, blue_manager_), "bgp::Config"); - } + } - void EnableMacUpdateProcessing() { + void EnableMacUpdateProcessing() { task_util::TaskFire( boost::bind(&EvpnManager::EnableMacUpdateProcessing, blue_manager_), "bgp::Config"); - } + } EventManager evm_; ServerThread thread_; @@ -591,17 +591,17 @@ TEST_F(BgpEvpnAliasingTest, AddDeleteMac7) { TEST_F(BgpEvpnAliasingTest, AddDeleteMac8) { string mac_prefix = "aa:bb:cc:dd:ee:0"; for (int idx = 1; idx <= 8; ++idx) { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRouteExists(mac_prefix + integerToString(idx)); } VerifySegmentExists(esi1_); for (int idx = 1; idx <= 8; ++idx) { - DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); + DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteNoExists(mac_prefix + integerToString(idx)); + VerifyRouteNoExists(mac_prefix + integerToString(idx)); } VerifySegmentNoExists(esi1_); } @@ -613,24 +613,24 @@ TEST_F(BgpEvpnAliasingTest, AddDeleteMac8) { TEST_F(BgpEvpnAliasingTest, AddDeleteMac9) { string mac_prefix = "aa:bb:cc:dd:ee:0"; for (int idx = 1; idx <= 8; ++idx) { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRouteExists(mac_prefix + integerToString(idx)); } VerifySegmentExists(esi1_); for (int idx = 1; idx <= 8; ++idx) { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi_null_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi_null_); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRouteExists(mac_prefix + integerToString(idx)); } VerifySegmentNoExists(esi1_); for (int idx = 1; idx <= 8; ++idx) { - DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); + DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteNoExists(mac_prefix + integerToString(idx)); + VerifyRouteNoExists(mac_prefix + integerToString(idx)); } VerifySegmentNoExists(esi1_); } @@ -643,21 +643,21 @@ TEST_F(BgpEvpnAliasingTest, AddDeleteMac10) { string mac_prefix = "aa:bb:cc:dd:ee:0"; for (int idx = 1; idx <= 8; ++idx) { if (idx % 2 == 0) { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); } else { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi2_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi2_); } } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRouteExists(mac_prefix + integerToString(idx)); } VerifySegmentExists(esi1_); VerifySegmentExists(esi2_); for (int idx = 1; idx <= 8; ++idx) { - DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); + DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteNoExists(mac_prefix + integerToString(idx)); + VerifyRouteNoExists(mac_prefix + integerToString(idx)); } VerifySegmentNoExists(esi1_); VerifySegmentNoExists(esi2_); @@ -1064,10 +1064,10 @@ TEST_F(BgpEvpnAliasingTest, Aliasing12) { TEST_F(BgpEvpnAliasingTest, Aliasing13) { string mac_prefix = "aa:bb:cc:dd:ee:0"; for (int idx = 1; idx <= 8; ++idx) { - AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); + AddMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx), esi1_); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRouteExists(mac_prefix + integerToString(idx)); } VerifySegmentExists(esi1_); @@ -1075,33 +1075,33 @@ TEST_F(BgpEvpnAliasingTest, Aliasing13) { AddAutoDiscoveryRoute(bgp_peers_[2], esi1_); AddAutoDiscoveryRoute(bgp_peers_[3], esi1_); for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); - VerifyRoutePathExists( - mac_prefix + integerToString(idx), bgp_peers_[1], false); - VerifyRoutePathExists( - mac_prefix + integerToString(idx), bgp_peers_[2], true); - VerifyRoutePathExists( - mac_prefix + integerToString(idx), bgp_peers_[3], true); + VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRoutePathExists( + mac_prefix + integerToString(idx), bgp_peers_[1], false); + VerifyRoutePathExists( + mac_prefix + integerToString(idx), bgp_peers_[2], true); + VerifyRoutePathExists( + mac_prefix + integerToString(idx), bgp_peers_[3], true); } DelAutoDiscoveryRoute(bgp_peers_[3], esi1_); DelAutoDiscoveryRoute(bgp_peers_[2], esi1_); DelAutoDiscoveryRoute(bgp_peers_[1], esi1_); for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteExists(mac_prefix + integerToString(idx)); - VerifyRoutePathExists( - mac_prefix + integerToString(idx), bgp_peers_[1], false); - VerifyRoutePathNoExists( - mac_prefix + integerToString(idx), bgp_peers_[2]); - VerifyRoutePathNoExists( - mac_prefix + integerToString(idx), bgp_peers_[3]); + VerifyRouteExists(mac_prefix + integerToString(idx)); + VerifyRoutePathExists( + mac_prefix + integerToString(idx), bgp_peers_[1], false); + VerifyRoutePathNoExists( + mac_prefix + integerToString(idx), bgp_peers_[2]); + VerifyRoutePathNoExists( + mac_prefix + integerToString(idx), bgp_peers_[3]); } for (int idx = 1; idx <= 8; ++idx) { - DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); + DelMacRoute(bgp_peers_[1], mac_prefix + integerToString(idx)); } for (int idx = 1; idx <= 8; ++idx) { - VerifyRouteNoExists(mac_prefix + integerToString(idx)); + VerifyRouteNoExists(mac_prefix + integerToString(idx)); } VerifySegmentNoExists(esi1_); } diff --git a/src/bgp/test/bgp_evpn_manager_test.cc b/src/bgp/test/bgp_evpn_manager_test.cc index c21271e1246..1c13b2754c3 100644 --- a/src/bgp/test/bgp_evpn_manager_test.cc +++ b/src/bgp/test/bgp_evpn_manager_test.cc @@ -483,7 +483,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { if ((odd && peer->index() % 2 != 0) || (even && peer->index() % 2 == 0)) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) AddXmppPeerBroadcastMacRoute(peer, tag); } } @@ -517,7 +517,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void DelAllXmppPeersBroadcastMacRoute(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) DelXmppPeerBroadcastMacRoute(peer, tag); } } @@ -555,7 +555,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) VerifyXmppPeerInclusiveMulticastRoute(peer, tag); } } @@ -572,7 +572,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) VerifyXmppPeerNoInclusiveMulticastRoute(peer, tag); } } @@ -580,7 +580,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllXmppPeersOddUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, false, tag, false)); } @@ -589,7 +589,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllXmppPeersEvenUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, false, true, tag, false)); } @@ -598,7 +598,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllXmppPeersAllUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, true, tag, false)); } @@ -607,7 +607,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllXmppPeersNoUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, xmpp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE(VerifyPeerNoUpdateInfo(peer, tag)); } } @@ -850,7 +850,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { BOOST_FOREACH(PeerMock *peer, bgp_peers_) { if ((odd && peer->index() % 2 != 0) || (even && peer->index() % 2 == 0)) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) AddBgpPeerInclusiveMulticastRoute(peer, tag); } } @@ -887,7 +887,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { BOOST_FOREACH(PeerMock *peer, bgp_peers_) { if ((odd && peer->index() % 2 != 0) || (even && peer->index() % 2 == 0)) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) DelBgpPeerInclusiveMulticastRoute(peer, tag); } } @@ -1004,7 +1004,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllBgpPeersBgpUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, bgp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, true, tag, false)); } @@ -1013,7 +1013,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllBgpPeersAllUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, bgp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, true, tag, true)); } @@ -1022,7 +1022,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllBgpPeersNoUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, bgp_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE(VerifyPeerNoUpdateInfo(peer, tag)); } } @@ -1338,7 +1338,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllLeafPeersNoUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, leaf_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE(VerifyPeerNoUpdateInfo(peer, tag)); } } @@ -1508,7 +1508,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { continue; if (!even && peer->index() % 2 == 0) continue; - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, false, false, tag, false, true)); } @@ -1529,7 +1529,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllReplicatorPeersNonLeafUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, replicator_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, true, tag, false, false)); } @@ -1538,7 +1538,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { void VerifyAllReplicatorPeersAllUpdateInfo(TagList tag_list = TagList()) { TagList temp_tag_list = GetTagList(tag_list); BOOST_FOREACH(PeerMock *peer, replicator_peers_) { - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE( VerifyPeerUpdateInfoCommon(peer, true, true, tag, false, true)); } @@ -1552,7 +1552,7 @@ class BgpEvpnManagerTest : public ::testing::TestWithParam { continue; if (!even && peer->index() % 2 == 0) continue; - BOOST_FOREACH(uint32_t tag, temp_tag_list) + BOOST_FOREACH(uint32_t tag, temp_tag_list) TASK_UTIL_EXPECT_TRUE(VerifyPeerNoUpdateInfo(peer, tag)); } } diff --git a/src/bgp/test/bgp_ifmap_config_manager_test.cc b/src/bgp/test/bgp_ifmap_config_manager_test.cc index 48d82f8599f..2a677872f63 100644 --- a/src/bgp/test/bgp_ifmap_config_manager_test.cc +++ b/src/bgp/test/bgp_ifmap_config_manager_test.cc @@ -332,23 +332,23 @@ static void ValidateShowGlobalSystemResponse( resp->get_global_instances()) { LOG(DEBUG, "Graceful Restart Time : " << resp_global.get_gr_time()); LOG(DEBUG, "llgr_time : " << resp_global.get_llgr_time()); - LOG(DEBUG, "Last Change at : " << + LOG(DEBUG, "Last Change at : " << resp_global.get_last_change_at()); - LOG(DEBUG, "bgpaas_port_start : " << + LOG(DEBUG, "bgpaas_port_start : " << resp_global.get_bgpaas_port_start()); - LOG(DEBUG, "bgpaas_port_end : " << + LOG(DEBUG, "bgpaas_port_end : " << resp_global.get_bgpaas_port_end()); LOG(DEBUG, "rd_cluster_seed : " << resp_global.get_rd_cluster_seed()); } LOG(DEBUG, "************************************************************"); - + BOOST_FOREACH(const ShowBgpGlobalSystemConfig &global, global_list) { bool found = false; BOOST_FOREACH(const ShowBgpGlobalSystemConfig &resp_global, resp->get_global_instances()) { found = true; - + EXPECT_EQ(global.get_gr_time(), resp_global.get_gr_time()); EXPECT_EQ(global.get_llgr_time(), resp_global.get_llgr_time()); EXPECT_EQ(global.get_last_change_at(), @@ -1710,10 +1710,10 @@ TEST_F(BgpIfmapConfigManagerShowTest, ShowGlobalSystemConfig) { BgpSandeshContext sandesh_context; sandesh_context.bgp_server = &server_; Sandesh::set_client_context(&sandesh_context); - const BgpGlobalSystemConfig *bgsc = + const BgpGlobalSystemConfig *bgsc = sandesh_context.bgp_server->global_config(); vector show_list; - ShowBgpGlobalSystemConfig sbgc; + ShowBgpGlobalSystemConfig sbgc; sbgc.set_gr_time(bgsc->gr_time()); sbgc.set_llgr_time(bgsc->llgr_time()); diff --git a/src/bgp/test/bgp_message_test.h b/src/bgp/test/bgp_message_test.h index 7fe92354a75..5fe2ede8087 100644 --- a/src/bgp/test/bgp_message_test.h +++ b/src/bgp/test/bgp_message_test.h @@ -43,7 +43,7 @@ class BgpMessageTest { open->opt_params.push_back(opt_param); } - static void GenerateUpdateMessage(BgpProto::Update *update, uint16_t afi, + static void GenerateUpdateMessage(BgpProto::Update *update, uint16_t afi, uint8_t safi) { char p[] = {0x1, 0x2, 0x3}; BgpProtoPrefix *prefix = new BgpProtoPrefix; diff --git a/src/bgp/test/bgp_mvpn_test.cc b/src/bgp/test/bgp_mvpn_test.cc index 99de7d02ebc..71b19a1f06b 100644 --- a/src/bgp/test/bgp_mvpn_test.cc +++ b/src/bgp/test/bgp_mvpn_test.cc @@ -488,11 +488,11 @@ class BgpMvpnTest : public ::testing::TestWithParam { if (source_rd) attr_spec.push_back(source_rd); - if (add_leaf_req) { + if (add_leaf_req) { PmsiTunnelSpec *pmsi_spec(new PmsiTunnelSpec()); pmsi_spec->tunnel_flags = PmsiTunnelSpec::LeafInfoRequired; attr_spec.push_back(pmsi_spec); - } + } BgpAttrPtr attr = server_->attr_db()->Locate(attr_spec); if (source_rd) diff --git a/src/bgp/test/bgp_stress_test.cc b/src/bgp/test/bgp_stress_test.cc index 2042f5e5f50..497440da0b6 100644 --- a/src/bgp/test/bgp_stress_test.cc +++ b/src/bgp/test/bgp_stress_test.cc @@ -449,11 +449,11 @@ void BgpStressTest::IFMapInitialize(const string &hostname) { ifmap_server_.reset(new IFMapServerTest(config_db_, config_graph_, evm_.io_service())); - + config_client_manager_.reset(new ConfigClientManager(&evm_, hostname, "BgpServerTest", ConfigClientOptions())); ConfigJsonParser *config_json_parser_ = - static_cast(config_client_manager_->config_json_parser()); + static_cast(config_client_manager_->config_json_parser()); static_cast(ifmap_server_.get())-> set_config_client_manager(config_client_manager_.get()); config_json_parser_->ifmap_server_set(ifmap_server_.get()); diff --git a/src/bgp/test/bgp_stress_test.h b/src/bgp/test/bgp_stress_test.h index b43d09d2202..64599ba5c7d 100644 --- a/src/bgp/test/bgp_stress_test.h +++ b/src/bgp/test/bgp_stress_test.h @@ -42,7 +42,7 @@ class XmppConnection; class ConfigCassandraClientTest : public ConfigCassandraClient { public: ConfigCassandraClientTest(ConfigClientManager *mgr, EventManager *evm, - const ConfigClientOptions &options, int num_workers) + const ConfigClientOptions &options, int num_workers) : ConfigCassandraClient(mgr, evm, options, num_workers) { } diff --git a/src/bgp/test/bgp_xmpp_evpn_test.cc b/src/bgp/test/bgp_xmpp_evpn_test.cc index 1a5ff80e811..453c97443e9 100644 --- a/src/bgp/test/bgp_xmpp_evpn_test.cc +++ b/src/bgp/test/bgp_xmpp_evpn_test.cc @@ -746,18 +746,18 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes1) { // Add routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; - agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; + agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); } task_util::WaitForIdle(); // Add route from agent B. stringstream eroute_b; for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; - agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; + agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); } task_util::WaitForIdle(); @@ -769,9 +769,9 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes1) { // Delete routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; - agent_a_->DeleteEnetRoute("blue", eroute_a.str()); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; + agent_a_->DeleteEnetRoute("blue", eroute_a.str()); } task_util::WaitForIdle(); @@ -783,9 +783,9 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes1) { // Delete route from agent B. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; - agent_b_->DeleteEnetRoute("blue", eroute_b.str()); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; + agent_b_->DeleteEnetRoute("blue", eroute_b.str()); } task_util::WaitForIdle(); @@ -827,18 +827,18 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes2) { // Add routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; - agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; + agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); } task_util::WaitForIdle(); // Add route from agent B. stringstream eroute_b; for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; - agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; + agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); } task_util::WaitForIdle(); @@ -850,9 +850,9 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes2) { // Delete routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; - agent_a_->DeleteEnetRoute("blue", eroute_a.str()); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; + agent_a_->DeleteEnetRoute("blue", eroute_a.str()); } task_util::WaitForIdle(); @@ -864,9 +864,9 @@ TEST_F(BgpXmppEvpnTest1, 2AgentMultipleRoutes2) { // Delete route from agent B. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; - agent_b_->DeleteEnetRoute("blue", eroute_b.str()); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; + agent_b_->DeleteEnetRoute("blue", eroute_b.str()); } task_util::WaitForIdle(); @@ -2940,18 +2940,18 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes1) { // Add routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; - agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; + agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); } task_util::WaitForIdle(); // Add route from agent B. stringstream eroute_b; for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; - agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; + agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); } task_util::WaitForIdle(); @@ -2963,9 +2963,9 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes1) { // Delete routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; - agent_a_->DeleteEnetRoute("blue", eroute_a.str()); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:0" << idx << ",10.1.1." << idx << "/32"; + agent_a_->DeleteEnetRoute("blue", eroute_a.str()); } task_util::WaitForIdle(); @@ -2977,9 +2977,9 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes1) { // Delete route from agent B. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; - agent_b_->DeleteEnetRoute("blue", eroute_b.str()); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:0" << idx << ",10.1.2." << idx << "/32"; + agent_b_->DeleteEnetRoute("blue", eroute_b.str()); } task_util::WaitForIdle(); @@ -3020,18 +3020,18 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes2) { // Add routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; - agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; + agent_a_->AddEnetRoute("blue", eroute_a.str(), "192.168.1.1"); } task_util::WaitForIdle(); // Add route from agent B. stringstream eroute_b; for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; - eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; - agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); + stringstream eroute_b; + eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; + agent_b_->AddEnetRoute("blue", eroute_b.str(), "192.168.1.2"); } task_util::WaitForIdle(); @@ -3043,9 +3043,9 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes2) { // Delete routes from agent A. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_a; - eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; - agent_a_->DeleteEnetRoute("blue", eroute_a.str()); + stringstream eroute_a; + eroute_a << "aa:00:00:00:00:01" << ",10.1.1." << idx << "/32"; + agent_a_->DeleteEnetRoute("blue", eroute_a.str()); } task_util::WaitForIdle(); @@ -3057,9 +3057,9 @@ TEST_F(BgpXmppEvpnTest2, MultipleRoutes2) { // Delete route from agent B. for (int idx = 1; idx <= 4; idx++) { - stringstream eroute_b; + stringstream eroute_b; eroute_b << "bb:00:00:00:00:01" << ",10.1.2." << idx << "/32"; - agent_b_->DeleteEnetRoute("blue", eroute_b.str()); + agent_b_->DeleteEnetRoute("blue", eroute_b.str()); } task_util::WaitForIdle(); diff --git a/src/bgp/test/bgp_xmpp_mvpn_test.cc b/src/bgp/test/bgp_xmpp_mvpn_test.cc index 36212807e54..37b1763d907 100644 --- a/src/bgp/test/bgp_xmpp_mvpn_test.cc +++ b/src/bgp/test/bgp_xmpp_mvpn_test.cc @@ -110,11 +110,11 @@ class BgpXmppMvpnTest : public ::testing::Test { commspec->communities.push_back(tgt.GetExtCommunityValue()); attr_spec.push_back(commspec); - if (add_leaf_req) { + if (add_leaf_req) { PmsiTunnelSpec *pmsi_spec(new PmsiTunnelSpec()); pmsi_spec->tunnel_flags = PmsiTunnelSpec::LeafInfoRequired; attr_spec.push_back(pmsi_spec); - } + } BgpAttrPtr attr = bs_x_->attr_db()->Locate(attr_spec); STLDeleteValues(&attr_spec); diff --git a/src/bgp/test/routing_instance_mgr_test.cc b/src/bgp/test/routing_instance_mgr_test.cc index 85092021063..eec05a2fea3 100644 --- a/src/bgp/test/routing_instance_mgr_test.cc +++ b/src/bgp/test/routing_instance_mgr_test.cc @@ -506,7 +506,7 @@ TEST_F(RoutingInstanceMgrTest, RoutingInstanceTraceBuffer_Test) { TASK_UTIL_EXPECT_EQ(4, GetRoutingInstanceDormantTraceBufferCapacity()); TASK_UTIL_EXPECT_EQ(2, GetRoutingInstanceDormantTraceBufferThreshold()); - + ri1_cfg.reset(BgpTestUtil::CreateBgpInstanceConfig("TestRi#1")); scoped_ptr ri2_cfg; ri2_cfg.reset(BgpTestUtil::CreateBgpInstanceConfig("TestRi#2")); @@ -543,7 +543,7 @@ TEST_F(RoutingInstanceMgrTest, RoutingInstanceTraceBuffer_Test) { trace_buf = GetActiveTraceBuffer("TestRi#1"); DeleteRoutingInstance(ri1_cfg.get()); TASK_UTIL_EXPECT_EQ(false, HasRoutingInstanceActiveTraceBuf("TestRi#1")); - TASK_UTIL_EXPECT_EQ(true, + TASK_UTIL_EXPECT_EQ(true, HasRoutingInstanceDormantTraceBuf("TestRi#1")); TASK_UTIL_EXPECT_EQ((dormant_tracebuf_count + 1), GetRoutingInstanceDormantTraceBufSize()); @@ -562,10 +562,10 @@ TEST_F(RoutingInstanceMgrTest, RoutingInstanceTraceBuffer_Test) { GetRoutingInstanceDormantTraceBufSize()); TASK_UTIL_EXPECT_EQ(active_tracebuf_count, GetRoutingInstanceActiveTraceBufSize()); - + CreateRoutingInstance(ri1_cfg.get()); TASK_UTIL_EXPECT_EQ(true, HasRoutingInstanceActiveTraceBuf("TestRi#1")); - TASK_UTIL_EXPECT_EQ((active_tracebuf_count + 1), + TASK_UTIL_EXPECT_EQ((active_tracebuf_count + 1), GetRoutingInstanceActiveTraceBufSize()); TASK_UTIL_EXPECT_EQ(trace_buf, GetActiveTraceBuffer("TestRi#1")); TASK_UTIL_EXPECT_EQ(false, @@ -582,7 +582,7 @@ TEST_F(RoutingInstanceMgrTest, RoutingInstanceTraceBuffer_Test) { active_tracebuf_count = GetRoutingInstanceActiveTraceBufSize(); dormant_tracebuf_count = GetRoutingInstanceDormantTraceBufSize(); - + DeleteRoutingInstance(ri1_cfg.get()); DeleteRoutingInstance(ri2_cfg.get()); DeleteRoutingInstance(ri3_cfg.get()); @@ -939,7 +939,7 @@ static void SetUp() { ControlNode::SetDefaultSchedulingPolicy(); - // Intialize the environmental variables for this test prior to + // Intialize the environmental variables for this test prior to // the creation of the Routing Instance Manager size_t dormant_trace_buf_size = TEST_DORMANT_TRACE_BUFFER_SIZE; snprintf(value, sizeof(value), "%zu", dormant_trace_buf_size); diff --git a/src/bgp/test/routing_instance_mgr_tracebuf_size_test.cc b/src/bgp/test/routing_instance_mgr_tracebuf_size_test.cc index 12b201c751a..70ab116b04f 100644 --- a/src/bgp/test/routing_instance_mgr_tracebuf_size_test.cc +++ b/src/bgp/test/routing_instance_mgr_tracebuf_size_test.cc @@ -87,7 +87,7 @@ class RoutingInstanceMgrTraceBufferSizeTest : public ::testing::Test { TEST_F(RoutingInstanceMgrTraceBufferSizeTest, RoutingInstanceTraceBufferSize_Test) { bool set_log_disable = false; - size_t dormant_tracebuf_capacity = + size_t dormant_tracebuf_capacity = GetRoutingInstanceDormantTraceBufferCapacity(); TASK_UTIL_EXPECT_EQ(0, dormant_tracebuf_capacity); @@ -124,7 +124,7 @@ TEST_F(RoutingInstanceMgrTraceBufferSizeTest, DeleteRoutingInstance(ri2_cfg.get()); TASK_UTIL_EXPECT_EQ(false, HasRoutingInstanceActiveTraceBuf("TestRi#1")); TASK_UTIL_EXPECT_EQ(false, HasRoutingInstanceActiveTraceBuf("TestRi#2")); - TASK_UTIL_EXPECT_EQ((active_tracebuf_count - 2), + TASK_UTIL_EXPECT_EQ((active_tracebuf_count - 2), GetRoutingInstanceActiveTraceBufSize()); TASK_UTIL_EXPECT_EQ(false, HasRoutingInstanceDormantTraceBuf("TestRi#1")); TASK_UTIL_EXPECT_EQ(false, HasRoutingInstanceDormantTraceBuf("TestRi#2")); @@ -146,7 +146,7 @@ class TestEnvironment : public ::testing::Environment { static void SetUp() { ControlNode::SetDefaultSchedulingPolicy(); - // Intialize the environmental variables for this test prior to + // Intialize the environmental variables for this test prior to // the creation of the Routing Instance Manager char value[100]; diff --git a/src/bgp/test/routing_instance_mgr_tracebuf_threshold_test.cc b/src/bgp/test/routing_instance_mgr_tracebuf_threshold_test.cc index 6a3b076ba4c..a5a18ffeaaf 100644 --- a/src/bgp/test/routing_instance_mgr_tracebuf_threshold_test.cc +++ b/src/bgp/test/routing_instance_mgr_tracebuf_threshold_test.cc @@ -91,12 +91,12 @@ class RoutingInstanceMgrTraceBuffThresholdTest : public ::testing::Test { TEST_F(RoutingInstanceMgrTraceBuffThresholdTest, RoutingInstanceTraceBuffThreshold_Test) { bool set_log_disable = false; - size_t dormant_tracebuf_capacity = + size_t dormant_tracebuf_capacity = GetRoutingInstanceDormantTraceBufferCapacity(); - size_t env_dormant_tracebuf_capacity = + size_t env_dormant_tracebuf_capacity = GetEnvRoutingInstanceDormantTraceBufferCapacity(); - + TASK_UTIL_EXPECT_EQ(4, env_dormant_tracebuf_capacity); TASK_UTIL_EXPECT_EQ(4, dormant_tracebuf_capacity); @@ -140,7 +140,7 @@ TEST_F(RoutingInstanceMgrTraceBuffThresholdTest, TASK_UTIL_EXPECT_EQ(true, HasRoutingInstanceDormantTraceBuf("TestRi#2")); TASK_UTIL_EXPECT_EQ(true, HasRoutingInstanceDormantTraceBuf("TestRi#3")); TASK_UTIL_EXPECT_EQ(true, HasRoutingInstanceDormantTraceBuf("TestRi#4")); - TASK_UTIL_EXPECT_EQ((active_tracebuf_count - 4), + TASK_UTIL_EXPECT_EQ((active_tracebuf_count - 4), GetRoutingInstanceActiveTraceBufSize()); TASK_UTIL_EXPECT_EQ(4, GetRoutingInstanceDormantTraceBufSize()); // With the following delete, exceeding the Dormant capacity @@ -170,9 +170,9 @@ static void SetUp() { ControlNode::SetDefaultSchedulingPolicy(); - // Intialize the environmental variables for this test prior to + // Intialize the environmental variables for this test prior to // the creation of the Routing Instance Manager - + char value[100]; size_t dormant_trace_buf_size = TEST_DORMANT_TRACE_BUFFER_SIZE; snprintf(value, sizeof(value), "%zu", dormant_trace_buf_size); diff --git a/src/bgp/test/rt_network_attr_test.cc b/src/bgp/test/rt_network_attr_test.cc index 08da0ea4a39..611b92d40e2 100644 --- a/src/bgp/test/rt_network_attr_test.cc +++ b/src/bgp/test/rt_network_attr_test.cc @@ -43,7 +43,7 @@ class NetworkConfigTest : public ::testing::Test { ConfigCass2JsonAdapter::set_assert_on_parse_error(false); ConfigJsonParser *config_json_parser_ = static_cast(config_client_manager_->config_json_parser()); - config_json_parser_->ifmap_server_set(&map_server_); + config_json_parser_->ifmap_server_set(&map_server_); vnc_cfg_JsonParserInit(config_json_parser_); bgp_schema_JsonParserInit(config_json_parser_); task_util::WaitForIdle(); @@ -90,8 +90,8 @@ TEST_F(NetworkConfigTest, SoapMessage1) { manager->GetInstanceByTarget(tgt1)); const RoutingInstance *rti = manager->GetInstanceByTarget(tgt1); if (rti != NULL) { - TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), - 0, 1000, 10000, "Wait for vn index.."); + TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), + 0, 1000, 10000, "Wait for vn index.."); string netname = rti->GetVirtualNetworkName(); size_t colon = netname.rfind(":"); if (colon != string::npos) { @@ -106,8 +106,8 @@ TEST_F(NetworkConfigTest, SoapMessage1) { manager->GetInstanceByTarget(tgt2)); rti = manager->GetInstanceByTarget(tgt2); if (rti != NULL) { - TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), - 0, 1000, 10000, "Wait for vn index.."); + TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), + 0, 1000, 10000, "Wait for vn index.."); string netname = rti->GetVirtualNetworkName(); size_t colon = netname.rfind(":"); if (colon != string::npos) { @@ -130,8 +130,8 @@ TEST_F(NetworkConfigTest, SoapMessage2) { manager->GetInstanceByTarget(tgt1)); const RoutingInstance *rti = manager->GetInstanceByTarget(tgt1); if (rti != NULL) { - TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), - 0, 1000, 10000, "Wait for vn index.."); + TASK_UTIL_WAIT_NE_NO_MSG(rti->virtual_network_index(), + 0, 1000, 10000, "Wait for vn index.."); string netname = rti->GetVirtualNetworkName(); size_t colon = netname.rfind(":"); if (colon != string::npos) { diff --git a/src/bgp/test/show_route_test.cc b/src/bgp/test/show_route_test.cc index c92e16c16c0..0941d447120 100644 --- a/src/bgp/test/show_route_test.cc +++ b/src/bgp/test/show_route_test.cc @@ -1174,9 +1174,9 @@ TEST_F(ShowRouteTest2, MatchingPrefix14) { "168.1[1-3].0/24" }; const vector result[] = { - list_of(3)(1)(3), - list_of(3)(3), - list_of(3)(3) + list_of(3)(1)(3), + list_of(3)(3), + list_of(3)(3) }; int i = 0; BOOST_FOREACH(const char *prefix, prefix_formats) { @@ -1188,7 +1188,7 @@ TEST_F(ShowRouteTest2, MatchingPrefix14) { show_req->HandleRequest(); show_req->Release(); TASK_UTIL_EXPECT_EQ(true, validate_done_); - i++; + i++; } } diff --git a/src/bgp/test/svc_static_route_intergration_test3.cc b/src/bgp/test/svc_static_route_intergration_test3.cc index a1d275cce4c..8529d49b9b1 100644 --- a/src/bgp/test/svc_static_route_intergration_test3.cc +++ b/src/bgp/test/svc_static_route_intergration_test3.cc @@ -33,7 +33,7 @@ TYPED_TEST(ServiceChainIntegrationTest, BidirectionalChain) { this->AddTableConnectedRoute(blue_conn_table, false, this->BuildPrefix("1.1.2.3", 32), this->BuildNextHopAddress("88.88.88.88")); - this->AddTableConnectedRoute(red_conn_table, false, + this->AddTableConnectedRoute(red_conn_table, false, this->BuildPrefix("1.1.2.1", 32), this->BuildNextHopAddress("66.66.66.66")); task_util::WaitForIdle(); diff --git a/src/control-node/main.cc b/src/control-node/main.cc index 33a2d777438..77bac63babb 100644 --- a/src/control-node/main.cc +++ b/src/control-node/main.cc @@ -276,7 +276,7 @@ int main(int argc, char *argv[]) { IFMapServer ifmap_server(&config_db, &config_graph, evm.io_service()); ConfigFactory::Register( - boost::factory()); + boost::factory()); ConfigClientManager *config_client_manager = new ConfigClientManager(&evm, options.hostname(), module_name, options.configdb_options()); diff --git a/src/control-node/options.h b/src/control-node/options.h index 3b66cf7a6a3..f2a3632d480 100644 --- a/src/control-node/options.h +++ b/src/control-node/options.h @@ -51,14 +51,14 @@ class Options { std::vector rabbitmq_server_list() const { return configdb_options_.rabbitmq_server_list; } - std::string rabbitmq_user() const { - return configdb_options_.rabbitmq_user; + std::string rabbitmq_user() const { + return configdb_options_.rabbitmq_user; } std::string rabbitmq_password() const { return configdb_options_.rabbitmq_password; } - bool rabbitmq_ssl_enabled() const { - return configdb_options_.rabbitmq_use_ssl; + bool rabbitmq_ssl_enabled() const { + return configdb_options_.rabbitmq_use_ssl; } const ConfigClientOptions &configdb_options() const { return configdb_options_; diff --git a/src/control-node/test/control_node_test.cc b/src/control-node/test/control_node_test.cc index 0d4a3db3379..ff3b5483a5f 100644 --- a/src/control-node/test/control_node_test.cc +++ b/src/control-node/test/control_node_test.cc @@ -37,7 +37,7 @@ ControlNodeTest::ControlNodeTest(EventManager *evm, const std::string &hostname) evm->io_service())), xmpp_manager_(new BgpXmppChannelManager(xmpp_server_, bgp_server_.get())), map_manager_(new IFMapChannelManager(xmpp_server_, map_server_.get())), - config_client_manager_(new ConfigClientManager(evm, "localhost", + config_client_manager_(new ConfigClientManager(evm, "localhost", "config-test", config_options_)) { ControlNode::SetDefaultSchedulingPolicy(); bgp_server_->session_manager()->Initialize(0); diff --git a/src/control-node/test/control_node_test.h b/src/control-node/test/control_node_test.h index 897ec64fbec..5b73559c7cc 100644 --- a/src/control-node/test/control_node_test.h +++ b/src/control-node/test/control_node_test.h @@ -48,7 +48,7 @@ class ControlNodeTest { BgpServerTest *bgp_server(); XmppServer *xmpp_server(); BgpXmppChannelManager *xmpp_channel_manager(); - + void Shutdown(); private: diff --git a/src/control-node/test/options_test.cc b/src/control-node/test/options_test.cc index c6d602f6f7e..5f446cf31ff 100644 --- a/src/control-node/test/options_test.cc +++ b/src/control-node/test/options_test.cc @@ -82,7 +82,7 @@ TEST_F(OptionsTest, NoArguments) { options_.rabbitmq_server_list()); TASK_UTIL_EXPECT_VECTOR_EQ(default_configdb_server_list_, options_.config_db_server_list()); - + EXPECT_EQ(options_.xmpp_port(), default_xmpp_port); EXPECT_EQ(options_.test_mode(), false); EXPECT_EQ(options_.sandesh_config().system_logs_rate_limit, @@ -538,7 +538,7 @@ TEST_F(OptionsTest, DISABLED_UnresolvableHostName) { } TEST_F(OptionsTest, OverrideConfigdbOptionsFromCommandLine) { - int argc = 9; + int argc = 9; char *argv[argc]; char argv_0[] = "options_test"; char argv_1[] = "--conf_file=controller/src/control-node/contrail-control.conf"; diff --git a/src/db/db_entry.cc b/src/db/db_entry.cc index f9630652334..18203c37057 100644 --- a/src/db/db_entry.cc +++ b/src/db/db_entry.cc @@ -86,7 +86,7 @@ void DBEntryBase::ClearState(DBTableBase *tbl_base, ListenerId listener) { bool DBEntryBase::is_state_empty(DBTablePartBase *tpart) { tbb::spin_rw_mutex::scoped_lock lock(tpart->dbstate_mutex(), false); - return state_.empty(); + return state_.empty(); } bool DBEntryBase::is_state_empty_unlocked(DBTablePartBase *tpart) { @@ -101,15 +101,15 @@ void DBEntryBase::set_last_change_at(uint64_t time) { last_change_at_ = time; } -void DBEntryBase::set_table_partition(DBTablePartBase *tpart) { - tpart_ = tpart; +void DBEntryBase::set_table_partition(DBTablePartBase *tpart) { + tpart_ = tpart; } -DBTablePartBase *DBEntryBase::get_table_partition() const { - return tpart_; +DBTablePartBase *DBEntryBase::get_table_partition() const { + return tpart_; } -DBTableBase *DBEntryBase::get_table() const { +DBTableBase *DBEntryBase::get_table() const { return (tpart_ ? tpart_->parent() : NULL); } diff --git a/src/db/db_entry.h b/src/db/db_entry.h index 968c6126bbe..08db3cf2940 100644 --- a/src/db/db_entry.h +++ b/src/db/db_entry.h @@ -98,7 +98,7 @@ class DBEntry : public DBEntryBase { // Set key fields in the DBEntry virtual void SetKey(const DBRequestKey *key) = 0; - // Comparator used in Tree management + // Comparator used in Tree management virtual bool IsLess(const DBEntry &rhs) const = 0; bool operator<(const DBEntry &rhs) const { diff --git a/src/db/db_graph_edge.h b/src/db/db_graph_edge.h index fbb27f1b516..a160621a8a5 100644 --- a/src/db/db_graph_edge.h +++ b/src/db/db_graph_edge.h @@ -37,7 +37,7 @@ class DBGraphEdge : public DBEntry { virtual const std::string &name() const = 0; private: Edge edge_id_; - + DISALLOW_COPY_AND_ASSIGN(DBGraphEdge); }; diff --git a/src/db/db_partition.cc b/src/db/db_partition.cc index 6de43b6182d..a85314c9ed7 100644 --- a/src/db/db_partition.cc +++ b/src/db/db_partition.cc @@ -170,7 +170,7 @@ void DBPartition::SetQueueDisable(bool disable) { class DBPartition::QueueRunner : public Task { public: static const int kMaxIterations = 32; - QueueRunner(WorkQueue *queue) + QueueRunner(WorkQueue *queue) : Task(queue->db_task_id(), queue->db_partition_id()), queue_(queue) { } @@ -211,7 +211,7 @@ class DBPartition::QueueRunner : public Task { return false; } } - + while (true) { DBTablePartBase *tpart = queue_->GetActiveTable(); if (tpart == NULL) { diff --git a/src/db/db_table.cc b/src/db/db_table.cc index 132a2603ea3..76eb3690da1 100644 --- a/src/db/db_table.cc +++ b/src/db/db_table.cc @@ -147,7 +147,7 @@ class DBTableBase::ListenerInfo { bool empty() const { tbb::spin_rw_mutex::scoped_lock read_lock(rw_mutex_, false); - return callbacks_.empty(); + return callbacks_.empty(); } size_t size() const { @@ -507,7 +507,7 @@ size_t DBTable::Size() const { void DBTable::Input(DBTablePartition *tbl_partition, DBClient *client, DBRequest *req) { - DBRequestKey *key = + DBRequestKey *key = static_cast(req->key.get()); DBEntry *entry = NULL; diff --git a/src/db/db_table.h b/src/db/db_table.h index 8298726ae84..60be6e79086 100644 --- a/src/db/db_table.h +++ b/src/db/db_table.h @@ -71,7 +71,7 @@ class DBTableBase { // Determine the table partition depending on the record key. virtual DBTablePartBase *GetTablePartition(const DBRequestKey *key) = 0; - // Determine the table partition depending on the Entry + // Determine the table partition depending on the Entry virtual DBTablePartBase *GetTablePartition(const DBEntryBase *entry) = 0; // Determine the table partition for given index virtual DBTablePartBase *GetTablePartition(const int index) = 0; @@ -161,7 +161,7 @@ class DBTableBase { // DBTableBase directly. // Derive directly from DBTableBase only if there is a strong reason to do so // -// Additionally, provides a set of virtual functions to override the default +// Additionally, provides a set of virtual functions to override the default // functionality class DBTable : public DBTableBase { public: @@ -201,7 +201,7 @@ class DBTable : public DBTableBase { // Override if *really* necessary virtual DBTablePartition *AllocPartition(int index); - // Input processing implemented by derived class. Default + // Input processing implemented by derived class. Default // implementation takes care of Add/Delete/Change. // Override if *really* necessary virtual void Input(DBTablePartition *tbl_partition, DBClient *client, diff --git a/src/db/db_table_partition.cc b/src/db/db_table_partition.cc index 376a10c3443..6beb529d73c 100644 --- a/src/db/db_table_partition.cc +++ b/src/db/db_table_partition.cc @@ -203,7 +203,7 @@ DBEntry *DBTablePartition::GetFirst() { if (it == tree_.end()) { return NULL; } - return it.operator->(); + return it.operator->(); } // Returns the next entry (Doesn't search). Threaded walk diff --git a/src/db/db_table_partition.h b/src/db/db_table_partition.h index 30b8804b20b..013066f401e 100644 --- a/src/db/db_table_partition.h +++ b/src/db/db_table_partition.h @@ -18,9 +18,9 @@ class DBTable; class DBTablePartBase { public: static const int kMaxIterations = 256; - typedef boost::intrusive::member_hook, - &DBEntryBase::chg_list_> ChangeListMember; + typedef boost::intrusive::member_hook, + &DBEntryBase::chg_list_> ChangeListMember; typedef boost::intrusive::list ChangeList; @@ -69,7 +69,7 @@ class DBTablePartition : public DBTablePartBase { boost::intrusive::set_member_hook<>, &DBEntry::node_> SetMember; typedef boost::intrusive::set Tree; - + DBTablePartition(DBTable *parent, int index); /////////////////////////////////////////////////////////////// @@ -83,7 +83,7 @@ class DBTablePartition : public DBTablePartBase { virtual DBEntry *GetNext(const DBEntryBase *entry); virtual DBEntry *GetFirst(); - + /////////////////////////////////////////////////////////// // Methods used in implementing DBTablePartition /////////////////////////////////////////////////////////// @@ -94,7 +94,7 @@ class DBTablePartition : public DBTablePartBase { // Generate Change notification for an entry virtual void Change(DBEntry *entry); - // Remove an entry from DB Table. Entry will not be accessible from + // Remove an entry from DB Table. Entry will not be accessible from // DB anymore virtual void Remove(DBEntryBase *entry); diff --git a/src/db/db_table_walker.cc b/src/db/db_table_walker.cc index 8aa5f084603..32fd7f8db87 100644 --- a/src/db/db_table_walker.cc +++ b/src/db/db_table_walker.cc @@ -18,7 +18,7 @@ int DBTableWalker::max_iteration_to_yield_ = kIterationToYield; class DBTableWalker::Walker { public: Walker(WalkId id, DBTableWalker *wkmgr, DBTable *table, - const DBRequestKey *key, WalkFn walker, + const DBRequestKey *key, WalkFn walker, WalkCompleteFn walk_done, bool postpone_walk); void StopWalk() { @@ -63,7 +63,7 @@ class DBTableWalker::Walker { class DBTableWalker::Worker : public Task { public: - Worker(Walker *walker, int db_partition_id, const DBRequestKey *key) + Worker(Walker *walker, int db_partition_id, const DBRequestKey *key) : Task(walker->task_id(), db_partition_id), walker_(walker), key_start_(key) { tbl_partition_ = static_cast( @@ -135,7 +135,7 @@ bool DBTableWalker::Worker::Run() { next = tbl_partition_->GetNext(entry); // Check whether Walker was requested to be cancelled if (walker_->should_stop_) { - break; + break; } if (count == GetIterationToYield()) { // store the context @@ -178,7 +178,7 @@ DBTableWalker::Walker::Walker(WalkId id, DBTableWalker *wkmgr, WalkFn walker, WalkCompleteFn walk_done, bool postpone_walk) : id_(id), wkmgr_(wkmgr), table_(table), - key_start_(const_cast(key)), + key_start_(const_cast(key)), walker_fn_(walker), done_fn_(walk_done) { int num_worker = table->PartitionCount(); should_stop_ = false; @@ -201,9 +201,9 @@ DBTableWalker::DBTableWalker(int task_id) : task_id_(task_id) { } } -DBTableWalker::WalkId DBTableWalker::WalkTable(DBTable *table, - const DBRequestKey *key_start, - WalkFn walkerfn , +DBTableWalker::WalkId DBTableWalker::WalkTable(DBTable *table, + const DBRequestKey *key_start, + WalkFn walkerfn , WalkCompleteFn walk_complete, bool postpone_walk) { table->incr_walk_request_count(); @@ -211,7 +211,7 @@ DBTableWalker::WalkId DBTableWalker::WalkTable(DBTable *table, size_t i = walker_map_.find_first(); if (i == walker_map_.npos) { i = walkers_.size(); - Walker *walker = new Walker(i, this, table, key_start, + Walker *walker = new Walker(i, this, table, key_start, walkerfn, walk_complete, postpone_walk); walkers_.push_back(walker); } else { @@ -219,7 +219,7 @@ DBTableWalker::WalkId DBTableWalker::WalkTable(DBTable *table, if (walker_map_.none()) { walker_map_.clear(); } - Walker *walker = new Walker(i, this, table, key_start, + Walker *walker = new Walker(i, this, table, key_start, walkerfn, walk_complete, postpone_walk); walkers_[i] = walker; } diff --git a/src/db/test/db_base_test.cc b/src/db/test/db_base_test.cc index 9089b1a7501..ae08ca1d666 100644 --- a/src/db/test/db_base_test.cc +++ b/src/db/test/db_base_test.cc @@ -33,11 +33,11 @@ class Vlan : public DBEntryBase { public: boost::intrusive::avl_set_member_hook<> node_; Vlan(unsigned short tag) : vlan_tag(tag) { } - Vlan(unsigned short tag, std::string desc) + Vlan(unsigned short tag, std::string desc) : vlan_tag(tag), description(desc) { } - friend bool operator< (const Vlan &a, const Vlan &b) { - return a.vlan_tag < b.vlan_tag; - } + friend bool operator< (const Vlan &a, const Vlan &b) { + return a.vlan_tag < b.vlan_tag; + } ~Vlan() { } @@ -74,16 +74,16 @@ class VlanTablePart : public DBTablePartBase { boost::intrusive::avl_set_member_hook<>, &Vlan::node_> VlanSetMember; typedef boost::intrusive::avltree Tree; - + VlanTablePart(VlanTable *parent, int index); virtual void Process(DBClient *client, DBRequest *req); - + void Add(Vlan *entry) { tree_.insert_unique(*entry); Notify(entry); } - + void Change(Vlan *entry) { Notify(entry); } @@ -93,7 +93,7 @@ class VlanTablePart : public DBTablePartBase { tree_.erase(*vlan); delete vlan; } - + Vlan *Find(const Vlan &key) { Tree::iterator loc = tree_.find(key); if (loc != tree_.end()) { @@ -110,15 +110,15 @@ class VlanTablePart : public DBTablePartBase { } return NULL; } - + virtual DBEntryBase *GetFirst() { Tree::iterator it = tree_.begin(); if (it == tree_.end()) { return NULL; } - return it.operator->(); + return it.operator->(); } - + virtual DBEntryBase *GetNext(const DBEntryBase *entry) { const Vlan *vlan = static_cast (entry); Tree::const_iterator it = tree_.iterator_to(*vlan); @@ -141,7 +141,7 @@ class VlanTable : public DBTableBase { partitions_.push_back(new VlanTablePart(this, i)); } } - ~VlanTable() { + ~VlanTable() { STLDeleteValues(&partitions_); } @@ -166,7 +166,7 @@ class VlanTable : public DBTableBase { } virtual int GetPartitionId(const DBRequestKey *req) { - const VlanTableReqKey *vlanreq = + const VlanTableReqKey *vlanreq = dynamic_cast(req); int value = boost::hash_value(vlanreq->tag); return value % DB::PartitionCount(); @@ -179,7 +179,7 @@ class VlanTable : public DBTableBase { } virtual std::auto_ptr GetEntry(const DBRequestKey *req) const { - const VlanTableReqKey *vlanreqkey = + const VlanTableReqKey *vlanreqkey = static_cast(req); Vlan *vlan = new Vlan(vlanreqkey->tag); return std::auto_ptr(vlan); @@ -187,13 +187,13 @@ class VlanTable : public DBTableBase { // Input handler virtual void Input(VlanTablePart *root, DBClient *client, DBRequest *req) { - VlanTableReqKey *vlanreq = + VlanTableReqKey *vlanreq = static_cast(req->key.get()); Vlan *vlan = NULL; vlan = Find(vlanreq); if (req->oper == DBRequest::DB_ENTRY_ADD_CHANGE) { - VlanTableReqData *vlandata = + VlanTableReqData *vlandata = static_cast(req->data.get()); if (vlan) { // The entry may currently be marked as deleted. @@ -212,7 +212,7 @@ class VlanTable : public DBTableBase { // Perform a Vlan lookup. Vlan *Find(const DBRequestKey *vlanreq) { VlanTablePart *rtp = partitions_[GetPartitionId(vlanreq)]; - const VlanTableReqKey *vlanreqkey = + const VlanTableReqKey *vlanreqkey = static_cast(vlanreq); Vlan vlan(vlanreqkey->tag); return rtp->Find(vlan); @@ -234,7 +234,7 @@ class VlanTable : public DBTableBase { DISALLOW_COPY_AND_ASSIGN(VlanTable); }; -VlanTablePart::VlanTablePart(VlanTable *parent, int index) +VlanTablePart::VlanTablePart(VlanTable *parent, int index) : DBTablePartBase(parent, index) { } diff --git a/src/db/test/db_graph_test.cc b/src/db/test/db_graph_test.cc index c8d591baef7..0e0a4b7e218 100644 --- a/src/db/test/db_graph_test.cc +++ b/src/db/test/db_graph_test.cc @@ -259,7 +259,7 @@ TEST_F(DBGraphTest, GraphWithFilterTraversal) { test_filter.include_vertex.push_back("d"); GraphVisitor test_visitor; - test_visitor.clear(); + test_visitor.clear(); graph_.Visit(vertices_[0], boost::bind(&GraphVisitor::VertexVisitor, &test_visitor, _1), boost::bind(&GraphVisitor::EdgeVisitor, &test_visitor, _1), @@ -270,6 +270,6 @@ TEST_F(DBGraphTest, GraphWithFilterTraversal) { int main(int argc, char **argv) { LoggingInit(); ::testing::InitGoogleTest(&argc, argv); - + return RUN_ALL_TESTS(); } diff --git a/src/db/test/db_test.cc b/src/db/test/db_test.cc index 42a068fcecd..fe13c2c9aba 100644 --- a/src/db/test/db_test.cc +++ b/src/db/test/db_test.cc @@ -36,7 +36,7 @@ struct VlanTableReqData : public DBRequestData { class Vlan : public DBEntry { public: Vlan(unsigned short tag) : vlan_tag(tag) { } - Vlan(unsigned short tag, std::string desc) + Vlan(unsigned short tag, std::string desc) : vlan_tag(tag), description(desc) { } ~Vlan() { @@ -44,7 +44,7 @@ class Vlan : public DBEntry { bool IsLess(const DBEntry &rhs) const { const Vlan &a = static_cast(rhs); - return vlan_tag < a.vlan_tag; + return vlan_tag < a.vlan_tag; } void SetKey(const DBRequestKey *key) { diff --git a/src/db/test/db_test_cmn.h b/src/db/test/db_test_cmn.h index 327e0ca9f96..0941e97606a 100644 --- a/src/db/test/db_test_cmn.h +++ b/src/db/test/db_test_cmn.h @@ -159,7 +159,7 @@ TEST_F(DBTest, Basic) { EXPECT_EQ(itbl, db_.FindTable("db.test.vlan.0")); uint32_t retry_delete_count = itbl->retry_delete_count(); - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -168,8 +168,8 @@ TEST_F(DBTest, Basic) { retry_delete_count = itbl->retry_delete_count(); for (int i = 0; i < 15; i++) { - tid_ = - itbl->Register(boost::bind(&DBTest::DBTestListener, + tid_ = + itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, i); } @@ -178,7 +178,7 @@ TEST_F(DBTest, Basic) { // There are pending registers. retry_delete_count is not incremented EXPECT_EQ(itbl->retry_delete_count(), retry_delete_count); - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 7); @@ -200,7 +200,7 @@ TEST_F(DBTest, Basic) { TEST_F(DBTest, DBEntryBase) { // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -254,7 +254,7 @@ TEST_F(DBTest, AddSuppression) { del_notification = 0; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -293,7 +293,7 @@ TEST_F(DBTest, AddSuppression) { // To Test: -// Verify that DBState is stored as per client +// Verify that DBState is stored as per client // Delete entry stays in DB till all DBState is removed // Verify the DBentry is removed from the tree on last DBState removal // Verify that DBEntry is not removed in notification path on removal of last DBState @@ -303,7 +303,7 @@ TEST_F(DBTest, TestState) { del_notification = 0; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -348,11 +348,11 @@ TEST_F(DBTest, TestState) { itbl->Unregister(tid_); // Test set/delete of mydata in Notification - tid_1_ = + tid_1_ = itbl->Register(boost::bind(&DBTest::DBTestListener_1, this, _1, _2)); EXPECT_EQ(tid_1_, 0); - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 1); @@ -405,7 +405,7 @@ TEST_F(DBTest, DBentryReUse) { del_notification = 0; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -499,7 +499,7 @@ TEST_F(DBTest, JWalker) { del_notification = 0; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -631,7 +631,7 @@ TEST_F(DBTest, WalkerStats) { TEST_F(DBTest, Bulk) { int bulk_count = 10; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -697,7 +697,7 @@ TEST_F(DBTest, Bulk) { TEST_F(DBTest, ReqInNotifyPath) { int req_count = 5; // Register a client for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestListener_2, this, _1, _2)); EXPECT_EQ(tid_, 0); @@ -747,12 +747,12 @@ TEST_F(DBTest, DB_RunNotify_Yield) { notify_yield = true; // Register client1 for notification - tid_ = + tid_ = itbl->Register(boost::bind(&DBTest::DBTestYieldListener1, this, _1, _2)); EXPECT_EQ(tid_, 0); // Register client2 for notification - tid_1_ = + tid_1_ = itbl_1->Register(boost::bind(&DBTest::DBTestYieldListener2, this, _1, _2)); EXPECT_EQ(tid_1_, 0); @@ -811,7 +811,7 @@ TEST_F(DBTest, DB_RunNotify_Yield) { itbl->Unregister(tid_); itbl_1->Unregister(tid_1_); - // Clear stats at end + // Clear stats at end add_notification_client1 = 0; add_notification_client2 = 0; del_notification_client1 = 0; diff --git a/src/dns/agent/agent_xmpp_channel.cc b/src/dns/agent/agent_xmpp_channel.cc index e1303374efd..d7703172baf 100644 --- a/src/dns/agent/agent_xmpp_channel.cc +++ b/src/dns/agent/agent_xmpp_channel.cc @@ -20,8 +20,8 @@ #include "sandesh/sandesh_trace.h" #include "cmn/dns_types.h" -DnsAgentXmppChannel:: DnsAgentXmppChannel(XmppChannel *channel, - DnsAgentXmppChannelManager *mgr) +DnsAgentXmppChannel:: DnsAgentXmppChannel(XmppChannel *channel, + DnsAgentXmppChannelManager *mgr) : channel_(channel), mgr_(mgr) { channel_->RegisterReceive(xmps::DNS, boost::bind(&DnsAgentXmppChannel::ReceiveReq, this, _1)); @@ -67,7 +67,7 @@ void DnsAgentXmppChannel::HandleAgentUpdate( DataSet::iterator it = update_data_.find(data); if (it != update_data_.end()) { DnsUpdateData *xmpp_data = *it; - for (DnsItems::iterator iter = data->items.begin(); + for (DnsItems::iterator iter = data->items.begin(); iter != data->items.end();) { bool change; BindUtil::Operation op = BindUtil::ADD_UPDATE; @@ -98,7 +98,7 @@ void DnsAgentXmppChannel::HandleAgentUpdate( delete xmpp_data; } } else { - for (DnsItems::iterator iter = data->items.begin(); + for (DnsItems::iterator iter = data->items.begin(); iter != data->items.end();) { if ((*iter).IsDelete()) data->items.erase(iter++); @@ -118,7 +118,7 @@ void DnsAgentXmppChannel::HandleAgentUpdate( } void DnsAgentXmppChannel::UpdateDnsRecords(BindUtil::Operation op) { - for (DataSet::iterator it = update_data_.begin(); + for (DataSet::iterator it = update_data_.begin(); it != update_data_.end(); ++it) { for (DnsItems::const_iterator item = (*it)->items.begin(); item != (*it)->items.end(); ++item) { @@ -141,13 +141,13 @@ std::string DnsAgentXmppChannel::GetDnsRecordName(std::string &vdns_name, void DnsAgentXmppChannel::GetAgentDnsData(AgentDnsData &data) { data.set_agent(channel_->connection()->endpoint().address().to_string()); std::vector items; - for (DataSet::iterator it = update_data_.begin(); + for (DataSet::iterator it = update_data_.begin(); it != update_data_.end(); ++it) { AgentDnsDataItem item; item.set_virtual_dns((*it)->virtual_dns); item.set_zone((*it)->zone); std::vector records; - for (DnsItems::iterator iter = (*it)->items.begin(); + for (DnsItems::iterator iter = (*it)->items.begin(); iter != (*it)->items.end(); ++iter) { VirtualDnsRecordTraceData record; record.rec_name = (*iter).name; @@ -211,7 +211,7 @@ DnsAgentXmppChannelManager::DnsAgentXmppChannelManager::FindChannel( return it->second; } -void +void DnsAgentXmppChannelManager::HandleXmppChannelEvent(XmppChannel *channel, xmps::PeerState state) { tbb::mutex::scoped_lock lock(mutex_); @@ -219,7 +219,7 @@ DnsAgentXmppChannelManager::HandleXmppChannelEvent(XmppChannel *channel, if (state == xmps::READY) { if (it == channel_map_.end()) { - DnsAgentXmppChannel *agent_xmpp_channel = + DnsAgentXmppChannel *agent_xmpp_channel = new DnsAgentXmppChannel(channel, this); channel_map_.insert(std::make_pair(channel, agent_xmpp_channel)); ConfigClientManager *config_manager = @@ -236,7 +236,7 @@ DnsAgentXmppChannelManager::HandleXmppChannelEvent(XmppChannel *channel, agent_xmpp_channel->Close(); delete agent_xmpp_channel; } else { - DNS_XMPP_TRACE(DnsXmppTrace, + DNS_XMPP_TRACE(DnsXmppTrace, "Peer not found on channel not ready event"); } } @@ -255,7 +255,7 @@ uint8_t DnsAgentXmppChannelManager::ChannelToDscp(const XmppChannel *xc) const { void DnsAgentXmppChannelManager::GetAgentData(std::vector &list) { tbb::mutex::scoped_lock lock(mutex_); - for (ChannelMap::iterator iter = channel_map_.begin(); + for (ChannelMap::iterator iter = channel_map_.begin(); iter != channel_map_.end(); ++iter) { const XmppChannel *channel = iter->first; AgentData agent_data; @@ -275,7 +275,7 @@ void DnsAgentXmppChannelManager::GetAgentData(std::vector &list) { void DnsAgentXmppChannelManager::GetAgentDnsData(std::vector &dt) { tbb::mutex::scoped_lock lock(mutex_); - for (ChannelMap::iterator iter = channel_map_.begin(); + for (ChannelMap::iterator iter = channel_map_.begin(); iter != channel_map_.end(); ++iter) { DnsAgentXmppChannel *ch = iter->second; AgentDnsData data; diff --git a/src/dns/bind/bind_resolver.cc b/src/dns/bind/bind_resolver.cc index a8c5a24faef..dccbd6de8ba 100644 --- a/src/dns/bind/bind_resolver.cc +++ b/src/dns/bind/bind_resolver.cc @@ -29,11 +29,11 @@ BindResolver::BindResolver(boost::asio::io_service &io, : pkt_buf_(NULL), cb_(cb), sock_(io), dscp_value_(dscp) { boost::system::error_code ec; - uint8_t size = (dns_servers.size() > max_dns_servers) ? + uint8_t size = (dns_servers.size() > max_dns_servers) ? dns_servers.size() : max_dns_servers; dns_ep_.resize(size); for (unsigned int i = 0; i < dns_servers.size(); ++i) { - boost::asio::ip::udp::endpoint *ep = + boost::asio::ip::udp::endpoint *ep = new boost::asio::ip::udp::endpoint( boost::asio::ip::address::from_string( dns_servers[i].ip_, ec), dns_servers[i].port_); @@ -122,7 +122,7 @@ void BindResolver::SetupResolver(const DnsServer &server, uint8_t idx) { dns_ep_[idx] = ep; } -bool BindResolver::DnsSend(uint8_t *pkt, unsigned int dns_srv_index, +bool BindResolver::DnsSend(uint8_t *pkt, unsigned int dns_srv_index, std::size_t len) { if (dns_srv_index < dns_ep_.size() && dns_ep_[dns_srv_index] && len > 0) { sock_.async_send_to( diff --git a/src/dns/bind/bind_resolver.h b/src/dns/bind/bind_resolver.h index 4425441576a..2338775451f 100644 --- a/src/dns/bind/bind_resolver.h +++ b/src/dns/bind/bind_resolver.h @@ -25,7 +25,7 @@ class BindResolver { uint16_t port_; }; - BindResolver(boost::asio::io_service &io, + BindResolver(boost::asio::io_service &io, const std::vector &dns_servers, uint16_t client_port, Callback cb, uint8_t dscp); virtual ~BindResolver(); diff --git a/src/dns/bind/bind_util.cc b/src/dns/bind/bind_util.cc index 02aac6033ac..f8df930db2d 100644 --- a/src/dns/bind/bind_util.cc +++ b/src/dns/bind/bind_util.cc @@ -61,7 +61,7 @@ DnsResponseMap g_dns_response_map = map_list_of std::string DnsItem::ToString() const { return BindUtil::DnsClass(eclass) + "/" + BindUtil::DnsType(type) + "/" + name + "/" + data + ";"; -} +} uint16_t BindUtil::DnsClass(const std::string &cl) { if (cl == "IN") @@ -97,7 +97,7 @@ const std::string &BindUtil::DnsResponseCode(uint16_t code) { return iter->second; } -uint8_t *BindUtil::AddName(uint8_t *ptr, const std::string &addr, +uint8_t *BindUtil::AddName(uint8_t *ptr, const std::string &addr, uint16_t plen, uint16_t offset, uint16_t &length) { std::size_t size = addr.size(); std::size_t cur_pos = 0; @@ -129,8 +129,8 @@ uint8_t *BindUtil::AddName(uint8_t *ptr, const std::string &addr, return ptr; } -uint8_t *BindUtil::AddQuestionSection(uint8_t *ptr, const std::string &name, - uint16_t type, uint16_t cl, +uint8_t *BindUtil::AddQuestionSection(uint8_t *ptr, const std::string &name, + uint16_t type, uint16_t cl, uint16_t &length) { ptr = AddName(ptr, name, 0, 0, length); ptr = WriteShort(ptr, type); @@ -140,7 +140,7 @@ uint8_t *BindUtil::AddQuestionSection(uint8_t *ptr, const std::string &name, return ptr; } -uint8_t *BindUtil::AddData(uint8_t *ptr, const DnsItem &item, +uint8_t *BindUtil::AddData(uint8_t *ptr, const DnsItem &item, uint16_t &length) { boost::system::error_code ec; @@ -151,7 +151,7 @@ uint8_t *BindUtil::AddData(uint8_t *ptr, const DnsItem &item, length += 2 + 4; } else if (item.type == DNS_AAAA_RECORD) { ptr = WriteShort(ptr, 16); - boost::asio::ip::address_v6 addr = + boost::asio::ip::address_v6 addr = boost::asio::ip::address_v6::from_string(item.data, ec); if (ec.value()) { memset(ptr, 0, 16); @@ -163,7 +163,7 @@ uint8_t *BindUtil::AddData(uint8_t *ptr, const DnsItem &item, } else if(item.type == DNS_TYPE_SOA) { uint16_t data_len = DataLength(item.soa.ns_plen, item.soa.ns_offset, item.soa.primary_ns.size()) + - DataLength(item.soa.mailbox_plen, + DataLength(item.soa.mailbox_plen, item.soa.mailbox_offset, item.soa.mailbox.size()) + 20; ptr = WriteShort(ptr, data_len); @@ -222,7 +222,7 @@ uint8_t *BindUtil::AddData(uint8_t *ptr, const DnsItem &item, return ptr; } -uint8_t *BindUtil::AddAnswerSection(uint8_t *ptr, const DnsItem &item, +uint8_t *BindUtil::AddAnswerSection(uint8_t *ptr, const DnsItem &item, uint16_t &length) { ptr = AddName(ptr, item.name, item.name_plen, item.name_offset, length); ptr = WriteShort(ptr, item.type); @@ -234,9 +234,9 @@ uint8_t *BindUtil::AddAnswerSection(uint8_t *ptr, const DnsItem &item, return ptr; } -uint8_t *BindUtil::AddAdditionalSection(uint8_t *ptr, const std::string name, - uint16_t type, uint16_t cl, - uint32_t ttl, const std::string &data, +uint8_t *BindUtil::AddAdditionalSection(uint8_t *ptr, const std::string name, + uint16_t type, uint16_t cl, + uint32_t ttl, const std::string &data, uint16_t &length) { ptr = AddQuestionSection(ptr, name, type, cl, length); ptr = WriteWord(ptr, ttl); @@ -512,7 +512,7 @@ bool BindUtil::ParseDnsUpdate(uint8_t *dns, uint16_t dnslen, uint16_t xid = ntohs(hdr->xid); if (zone_count != 1) { - DNS_BIND_TRACE(DnsBindError, + DNS_BIND_TRACE(DnsBindError, "Invalid zone count in Update request : " << zone_count); return false; } @@ -559,7 +559,7 @@ bool BindUtil::ParseDnsUpdate(uint8_t *dns, uint16_t dnslen, return false; } -void BindUtil::BuildDnsHeader(dnshdr *dns, uint16_t xid, DnsReq req, +void BindUtil::BuildDnsHeader(dnshdr *dns, uint16_t xid, DnsReq req, DnsOpcode op, bool rd, bool ra, uint8_t ret, uint16_t ques_count) { dns->xid = htons(xid); @@ -579,11 +579,11 @@ void BindUtil::BuildDnsHeader(dnshdr *dns, uint16_t xid, DnsReq req, dns->add_rrcount = 0; } -int BindUtil::BuildDnsQuery(uint8_t *buf, uint16_t xid, +int BindUtil::BuildDnsQuery(uint8_t *buf, uint16_t xid, const std::string &domain, const DnsItems &items) { dnshdr *dns = (dnshdr *) buf; - BuildDnsHeader(dns, xid, DNS_QUERY_REQUEST, DNS_OPCODE_QUERY, + BuildDnsHeader(dns, xid, DNS_QUERY_REQUEST, DNS_OPCODE_QUERY, 1, 0, 0, items.size()); // TODO : can be optimised to reuse any names using offsets @@ -604,9 +604,9 @@ int BindUtil::BuildDnsQuery(uint8_t *buf, uint16_t xid, return len; } -int BindUtil::BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, - const std::string &domain, - const std::string &zone, +int BindUtil::BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, + const std::string &domain, + const std::string &zone, const DnsItems &items) { dnshdr *dns = (dnshdr *) buf; BuildDnsHeader(dns, xid, DNS_QUERY_REQUEST, DNS_OPCODE_UPDATE, 0, 0, 0, 1); @@ -624,14 +624,14 @@ int BindUtil::BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, switch (op) { case ADD_UPDATE: case CHANGE_UPDATE: - for (DnsItems::const_iterator it = items.begin(); + for (DnsItems::const_iterator it = items.begin(); it != items.end(); ++it) { ptr = AddUpdate(ptr, *it, (*it).eclass, (*it).ttl, len); } break; case DELETE_UPDATE: - for (DnsItems::const_iterator it = items.begin(); + for (DnsItems::const_iterator it = items.begin(); it != items.end(); ++it) { ptr = AddUpdate(ptr, *it, DNS_CLASS_NONE, 0, len); } @@ -643,14 +643,14 @@ int BindUtil::BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, // Add Additional RRs std::string view = "view=" + domain; - ptr = AddAdditionalSection(ptr, "view", DNS_TXT_RECORD, DNS_CLASS_IN, + ptr = AddAdditionalSection(ptr, "view", DNS_TXT_RECORD, DNS_CLASS_IN, 0, view, len); return len; } bool BindUtil::IsIPv4(std::string name, uint32_t &addr) { - boost::system::error_code ec; + boost::system::error_code ec; boost::asio::ip::address_v4 address(boost::asio::ip::address_v4:: from_string(name, ec)); if (!ec.value()) { @@ -678,7 +678,7 @@ void BindUtil::GetReverseZones(const Subnet &subnet, ZoneList &zones) { return; } for (int j = 0; j <= (0xFF >> plen); j++) { - // when prefix len is not a multiple of 8, add reverse zones for all + // when prefix len is not a multiple of 8, add reverse zones for all // addresses upto the nearest 8 byte boundary for the prefix len. For // example, a /22 prefix results in 4 reverse zones. uint32_t last = (addr >> 24) + j; @@ -760,7 +760,7 @@ void BindUtil::RemoveSpecialChars(std::string &name) { } } -void DnsNameEncoder::AddName(std::string &name, uint16_t curr_msg_offset, +void DnsNameEncoder::AddName(std::string &name, uint16_t curr_msg_offset, uint16_t &name_plen, uint16_t &name_offset) { name_plen = 0; name_offset = 0; diff --git a/src/dns/bind/bind_util.h b/src/dns/bind/bind_util.h index 60fd3ccdd2b..477a3294e64 100644 --- a/src/dns/bind/bind_util.h +++ b/src/dns/bind/bind_util.h @@ -76,7 +76,7 @@ struct dns_flags { uint8_t op:4; // opcode uint8_t req:1; // request / response uint8_t ret:4; // return code - uint8_t cd:1; // checking disabled + uint8_t cd:1; // checking disabled uint8_t ad:1; // answer authenticated uint8_t res:1; // reserved uint8_t ra:1; // recursion available @@ -122,8 +122,8 @@ struct DnsSOAData { DnsSOAData() : ns_plen(0), ns_offset(0), mailbox_plen(0), mailbox_offset(0), serial(0), refresh(0), retry(0), expiry(0), ttl(0) {} bool operator ==(const DnsSOAData &rhs) const { - if (primary_ns == rhs.primary_ns && mailbox == rhs.mailbox && - serial == rhs.serial && refresh == rhs.refresh && + if (primary_ns == rhs.primary_ns && mailbox == rhs.mailbox && + serial == rhs.serial && refresh == rhs.refresh && retry == rhs.retry && expiry == rhs.expiry && ttl == rhs.ttl) return true; return false; @@ -163,7 +163,7 @@ struct DnsItem { std::string ToString() const; bool operator ==(const DnsItem &rhs) const { - if (eclass == rhs.eclass && type == rhs.type && + if (eclass == rhs.eclass && type == rhs.type && name == rhs.name && data == rhs.data && soa == rhs.soa) return true; return false; @@ -203,7 +203,7 @@ struct DnsUpdateData { mutable DnsItems items; DnsUpdateData() {} - DnsUpdateData(const std::string &vdns, const std::string &z) + DnsUpdateData(const std::string &vdns, const std::string &z) : virtual_dns(vdns), zone(z) {} struct Compare { @@ -240,7 +240,7 @@ struct DnsUpdateData { } return change; } -}; +}; struct Subnet { boost::asio::ip::address_v4 prefix; @@ -249,7 +249,7 @@ struct Subnet { enum DnsConfigFlags { DeleteMarked = 1 << 0, - }; + }; Subnet() : plen(0), flags(0) {} Subnet(std::string addr, uint32_t len) : plen(len), flags(0) { @@ -296,22 +296,22 @@ class BindUtil { DnsItems &ans, DnsItems &auth, DnsItems &add); static bool ParseDnsUpdate(uint8_t *dns, uint16_t dnslen, DnsUpdateData &data); - static int BuildDnsQuery(uint8_t *buf, uint16_t xid, + static int BuildDnsQuery(uint8_t *buf, uint16_t xid, const std::string &domain, const DnsItems &items); - static int BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, - const std::string &domain, - const std::string &zone, + static int BuildDnsUpdate(uint8_t *buf, Operation op, uint16_t xid, + const std::string &domain, + const std::string &zone, const DnsItems &items); - static uint8_t *AddQuestionSection(uint8_t *ptr, const std::string &name, - uint16_t type, uint16_t cl, + static uint8_t *AddQuestionSection(uint8_t *ptr, const std::string &name, + uint16_t type, uint16_t cl, uint16_t &length); - static uint8_t *AddAnswerSection(uint8_t *ptr, const DnsItem &item, + static uint8_t *AddAnswerSection(uint8_t *ptr, const DnsItem &item, uint16_t &length); static uint8_t *AddUpdate(uint8_t *ptr, const DnsItem &item, uint16_t cl, uint32_t ttl, uint16_t &length); - static void BuildDnsHeader(dnshdr *dns, uint16_t xid, DnsReq req, - DnsOpcode op, bool rd, bool ra, uint8_t ret, + static void BuildDnsHeader(dnshdr *dns, uint16_t xid, DnsReq req, + DnsOpcode op, bool rd, bool ra, uint8_t ret, uint16_t ques_count); static inline uint16_t DataLength(uint16_t plen, uint16_t offset, @@ -322,7 +322,7 @@ class BindUtil { static void GetReverseZones(const Subnet &subnet, ZoneList &zones); static void GetReverseZone(uint32_t addr, uint32_t plen, std::string &zone); static bool GetAddrFromPtrName(std::string &ptr_name, uint32_t &mask); - static std::string GetFQDN(const std::string &name, const std::string &domain, + static std::string GetFQDN(const std::string &name, const std::string &domain, const std::string &match); static bool HasSpecialChars(const std::string &name); static void RemoveSpecialChars(std::string &name); @@ -381,11 +381,11 @@ class BindUtil { return ptr; } - static uint8_t *AddData(uint8_t *ptr, const DnsItem &item, + static uint8_t *AddData(uint8_t *ptr, const DnsItem &item, uint16_t &length); - static uint8_t *AddAdditionalSection(uint8_t *ptr, const std::string name, - uint16_t type, uint16_t cl, - uint32_t ttl, const std::string &data, + static uint8_t *AddAdditionalSection(uint8_t *ptr, const std::string name, + uint16_t type, uint16_t cl, + uint32_t ttl, const std::string &data, uint16_t &length); static bool ReadName(uint8_t *dns, uint16_t dnslen, int *remlen, std::string &name, uint16_t &plen, uint16_t &offset); @@ -408,7 +408,7 @@ class DnsNameEncoder { DnsNameEncoder() {}; virtual ~DnsNameEncoder() {}; - void AddName(std::string &name, uint16_t curr_msg_offset, + void AddName(std::string &name, uint16_t curr_msg_offset, uint16_t &name_plen, uint16_t &name_offset); private: diff --git a/src/dns/bind/named_config.cc b/src/dns/bind/named_config.cc index fda2f665bc7..942a082dfc7 100644 --- a/src/dns/bind/named_config.cc +++ b/src/dns/bind/named_config.cc @@ -43,7 +43,7 @@ void NamedConfig::Shutdown() { delete singleton_; } -// Reset bind config +// Reset bind config void NamedConfig::Reset() { reset_flag_ = true; CreateRndcConf(); @@ -263,7 +263,7 @@ void NamedConfig::WriteViewConfig(const VirtualDnsConfig *updated_vdns) { std::string next_dns = curr_vdns->GetNextDns(); if (!next_dns.empty()) { boost::system::error_code ec; - boost::asio::ip::address_v4 + boost::asio::ip::address_v4 next_addr(boost::asio::ip::address_v4::from_string(next_dns, ec)); if (!ec.value()) { file_ << " forwarders {" << next_addr.to_string() << ";};" << endl; @@ -293,7 +293,7 @@ void NamedConfig::WriteViewConfig(const VirtualDnsConfig *updated_vdns) { } void NamedConfig::WriteDefaultView(ZoneViewMap &zone_view_map) { - // Create a default view first for any requests which do not have + // Create a default view first for any requests which do not have // view name TXT record file_ << "view \"_default_view_\" {" << endl; file_ << " match-clients {any;};" << endl; @@ -302,7 +302,7 @@ void NamedConfig::WriteDefaultView(ZoneViewMap &zone_view_map) { if (!default_forwarders_.empty()) { file_ << " forwarders {" << default_forwarders_ << "};" << endl; } - for (ZoneViewMap::iterator it = zone_view_map.begin(); + for (ZoneViewMap::iterator it = zone_view_map.begin(); it != zone_view_map.end(); ++it) { WriteZone(it->second, it->first, false, false, ""); } @@ -338,7 +338,7 @@ void NamedConfig::AddZoneFiles(ZoneList &zones, const VirtualDnsConfig *vdns) { } } -void NamedConfig::RemoveZoneFiles(const VirtualDnsConfig *vdns, +void NamedConfig::RemoveZoneFiles(const VirtualDnsConfig *vdns, ZoneList &zones) { for (unsigned int i = 0; i < zones.size(); i++) { RemoveZoneFile(vdns, zones[i]); @@ -379,7 +379,7 @@ string NamedConfig::GetZoneMXName(const string domain_name) { return (NamedZoneMXPrefix + "." + domain_name); } -void NamedConfig::CreateZoneFile(std::string &zone_name, +void NamedConfig::CreateZoneFile(std::string &zone_name, const VirtualDnsConfig *vdns, bool ns) { ofstream zfile; string ns_name; @@ -393,7 +393,7 @@ void NamedConfig::CreateZoneFile(std::string &zone_name, zfile << "$TTL " << Defaults::GlobalTTL << endl; } zfile << left << setw(NameWidth) << zone_name << " IN SOA " << - GetZoneNSName(vdns->GetDomainName()) << " " << + GetZoneNSName(vdns->GetDomainName()) << " " << GetZoneMXName(vdns->GetDomainName()) << " (" << endl; zfile << setw(NameWidth + 8) << "" << setw(NumberWidth) << Defaults::Serial << endl; zfile << setw(NameWidth + 8) << "" << setw(NumberWidth) << Defaults::Refresh << endl; @@ -402,11 +402,11 @@ void NamedConfig::CreateZoneFile(std::string &zone_name, zfile << setw(NameWidth + 8) << "" << setw(NumberWidth) << Defaults::Minimum << endl; zfile << setw(NameWidth + 8) << "" << ")" << endl; /* NS records are mandatory in zone file. They are required for the following reasons - 1. Name servers returns NS RR in responses to queries, in the authority section + 1. Name servers returns NS RR in responses to queries, in the authority section of the DNS message. 2. Name servers use the NS records to determine where to send NOTIFY messages. */ - zfile << setw(NameWidth + 4) << "" << setw(TypeWidth) << " NS " << + zfile << setw(NameWidth + 4) << "" << setw(TypeWidth) << " NS " << setw(NameWidth) << GetZoneNSName(vdns->GetDomainName()) << endl; zfile << "$ORIGIN " << zone_name << endl; //Write the NS record @@ -492,7 +492,7 @@ void NamedConfig::GetDefaultForwarders() { /////////////////////////////////////////////////////////////////////////////// -BindStatus::BindStatus(BindEventHandler handler) +BindStatus::BindStatus(BindEventHandler handler) : named_pid_(-1), handler_(handler), change_timeout_(true) { status_timer_ = TimerManager::CreateTimer( *Dns::GetEventManager()->io_service(), "BindStatusTimer", diff --git a/src/dns/bind/named_config.h b/src/dns/bind/named_config.h index 4582dc867cb..9e5414d5a1c 100644 --- a/src/dns/bind/named_config.h +++ b/src/dns/bind/named_config.h @@ -98,9 +98,9 @@ class NamedConfig { virtual void UpdateNamedConf(const VirtualDnsConfig *updated_vdns = NULL); void RemoveZoneFiles(const VirtualDnsConfig *vdns, ZoneList &zones); - virtual std::string GetZoneFileName(const std::string &vdns, + virtual std::string GetZoneFileName(const std::string &vdns, const std::string &name); - virtual std::string GetZoneFilePath(const std::string &vdns, + virtual std::string GetZoneFilePath(const std::string &vdns, const std::string &name); virtual std::string GetResolveFile() { return "/etc/resolv.conf"; } std::string GetPidFilePath(); @@ -125,7 +125,7 @@ class NamedConfig { void RemoveZoneFile(const VirtualDnsConfig *vdns, std::string &zone); std::string GetZoneNSName(const std::string domain_name); std::string GetZoneMXName(const std::string domain_name); - void CreateZoneFile(std::string &zone_name, + void CreateZoneFile(std::string &zone_name, const VirtualDnsConfig *vdns, bool ns); void MakeZoneList(const VirtualDnsConfig *vdns_config, ZoneList &zones); void MakeReverseZoneList(const VirtualDnsConfig *vdns_config, diff --git a/src/dns/bind/xmpp_dns_agent.cc b/src/dns/bind/xmpp_dns_agent.cc index 60f9d8e95f3..474fe22b07d 100644 --- a/src/dns/bind/xmpp_dns_agent.cc +++ b/src/dns/bind/xmpp_dns_agent.cc @@ -15,7 +15,7 @@ SandeshTraceBufferPtr AgentXmppTraceBuf(SandeshTraceBufferCreate("Xmpp", 500)); std::size_t DnsAgentXmpp::DnsAgentXmppEncode(XmppChannel *channel, XmppType type, - uint32_t trans_id, + uint32_t trans_id, uint32_t response_code, DnsUpdateData *xmpp_data, uint8_t *data) { @@ -24,8 +24,8 @@ DnsAgentXmpp::DnsAgentXmppEncode(XmppChannel *channel, std::auto_ptr impl(XmppStanza::AllocXmppXmlImpl()); XmlPugi *pugi = reinterpret_cast(impl.get()); - std::string iq_type = - (type == DnsQuery) ? "get" : + std::string iq_type = + (type == DnsQuery) ? "get" : (type == Update) ? "set" : "result"; pugi->AddNode("iq", ""); @@ -46,7 +46,7 @@ DnsAgentXmpp::DnsAgentXmppEncode(XmppChannel *channel, code << response_code; pugi::xml_node node; switch (type) { - case Update: + case Update: pugi->AddChildNode("update", ""); node = pugi->FindNode("update"); break; @@ -58,7 +58,7 @@ DnsAgentXmpp::DnsAgentXmppEncode(XmppChannel *channel, node = pugi->FindNode("update"); break; - case DnsQuery: + case DnsQuery: pugi->AddChildNode("query", ""); node = pugi->FindNode("query"); break; @@ -77,8 +77,8 @@ DnsAgentXmpp::DnsAgentXmppEncode(XmppChannel *channel, EncodeDnsData(&node, xmpp_data); return XmppProto::EncodeMessage(impl.get(), data, sizeof(data)); } - -void + +void DnsAgentXmpp::EncodeDnsData(pugi::xml_node *node, DnsUpdateData *xmpp_data) { pugi::xml_node node_c; @@ -95,7 +95,7 @@ DnsAgentXmpp::EncodeDnsData(pugi::xml_node *node, DnsUpdateData *xmpp_data) { } } -void +void DnsAgentXmpp::EncodeDnsItem(pugi::xml_node *node, DnsItem &item) { pugi::xml_node node_c; @@ -124,8 +124,8 @@ DnsAgentXmpp::EncodeDnsItem(pugi::xml_node *node, DnsItem &item) { } } -bool -DnsAgentXmpp::DnsAgentXmppDecode(const pugi::xml_node dns, +bool +DnsAgentXmpp::DnsAgentXmppDecode(const pugi::xml_node dns, XmppType &type, uint32_t &xid, uint16_t &resp_code, DnsUpdateData *data) { std::stringstream id(dns.attribute("transid").value()); @@ -140,10 +140,10 @@ DnsAgentXmpp::DnsAgentXmppDecode(const pugi::xml_node dns, return DecodeDns(resp, type, false, data); } -bool -DnsAgentXmpp::DecodeDns(const pugi::xml_node node, - XmppType &type, - bool is_resp, +bool +DnsAgentXmpp::DecodeDns(const pugi::xml_node node, + XmppType &type, + bool is_resp, DnsUpdateData *data) { if (strcmp(node.name(), "update") == 0) { type = is_resp ? UpdateResponse : Update; @@ -153,15 +153,15 @@ DnsAgentXmpp::DecodeDns(const pugi::xml_node node, return DecodeDnsItems(node, data); } - DNS_XMPP_TRACE(DnsXmppTrace, "Dns XMPP response : unknown tag : " << + DNS_XMPP_TRACE(DnsXmppTrace, "Dns XMPP response : unknown tag : " << node.name()); return false; } -bool -DnsAgentXmpp::DecodeDnsItems(const pugi::xml_node dnsdata, +bool +DnsAgentXmpp::DecodeDnsItems(const pugi::xml_node dnsdata, DnsUpdateData *data) { - for (pugi::xml_node node = dnsdata.first_child(); node; + for (pugi::xml_node node = dnsdata.first_child(); node; node = node.next_sibling()) { if (strcmp(node.name(), "virtual-dns") == 0) { data->virtual_dns = node.child_value(); @@ -169,7 +169,7 @@ DnsAgentXmpp::DecodeDnsItems(const pugi::xml_node dnsdata, data->zone = node.child_value(); } else if (strcmp(node.name(), "entry") == 0) { DnsItem item; - for (pugi::xml_node entry = node.first_child(); entry; + for (pugi::xml_node entry = node.first_child(); entry; entry = entry.next_sibling()) { if (strcmp(entry.name(), "class") == 0) { std::stringstream cl(entry.child_value()); @@ -188,8 +188,8 @@ DnsAgentXmpp::DecodeDnsItems(const pugi::xml_node dnsdata, std::stringstream prio(entry.child_value()); prio >> item.priority; } else { - DNS_XMPP_TRACE(DnsXmppTrace, - "Dns XMPP response : unknown tag : " << + DNS_XMPP_TRACE(DnsXmppTrace, + "Dns XMPP response : unknown tag : " << node.name()); return false; } diff --git a/src/dns/bind/xmpp_dns_agent.h b/src/dns/bind/xmpp_dns_agent.h index e1eeee201e1..21c7bb57a7b 100644 --- a/src/dns/bind/xmpp_dns_agent.h +++ b/src/dns/bind/xmpp_dns_agent.h @@ -33,20 +33,20 @@ class DnsAgentXmpp { DnsQueryResponse }; - static std::size_t DnsAgentXmppEncode(XmppChannel *channel, XmppType type, - uint32_t trans_id, uint32_t resp_code, + static std::size_t DnsAgentXmppEncode(XmppChannel *channel, XmppType type, + uint32_t trans_id, uint32_t resp_code, DnsUpdateData *xmpp_data, uint8_t *data); - static bool DnsAgentXmppDecode(const pugi::xml_node dns, + static bool DnsAgentXmppDecode(const pugi::xml_node dns, XmppType &type, uint32_t &xid, uint16_t &resp_code, DnsUpdateData *data); private: static void EncodeDnsData(pugi::xml_node *node, DnsUpdateData *xmpp_data); static void EncodeDnsItem(pugi::xml_node *node, DnsItem &entry); - static bool DecodeDns(const pugi::xml_node node, XmppType &type, + static bool DecodeDns(const pugi::xml_node node, XmppType &type, bool is_resp, DnsUpdateData *data); - static bool DecodeDnsItems(const pugi::xml_node dnsdata, + static bool DecodeDnsItems(const pugi::xml_node dnsdata, DnsUpdateData *data); }; diff --git a/src/dns/cfg/config_listener.cc b/src/dns/cfg/config_listener.cc index d5c1a8543b5..d63580aeeb9 100644 --- a/src/dns/cfg/config_listener.cc +++ b/src/dns/cfg/config_listener.cc @@ -149,7 +149,7 @@ class ConfigListener::DependencyTracker { } return &react->second; } - + bool IsInterestingEvent(const IFMapNode *node, const string &metadata) const { if (node->IsDeleted()) { @@ -171,7 +171,7 @@ class ConfigListener::DependencyTracker { if (plist == NULL) { continue; } - PropagateEdge(target, link->metadata(), in_edges, change_list); + PropagateEdge(target, link->metadata(), in_edges, change_list); } } @@ -232,7 +232,7 @@ ConfigListener::ConfigListener(DnsConfigManager *manager) ConfigListener::~ConfigListener() { } -void ConfigListener::Initialize(DB *database, int ntypes, +void ConfigListener::Initialize(DB *database, int ntypes, const char *config_types[]) { DBTable *link_table = static_cast( database->FindTable("__ifmap_metadata__.0")); diff --git a/src/dns/cfg/config_listener.h b/src/dns/cfg/config_listener.h index 6e869674986..d5264216239 100644 --- a/src/dns/cfg/config_listener.h +++ b/src/dns/cfg/config_listener.h @@ -35,7 +35,7 @@ class ConfigListener { typedef std::map TableMap; typedef std::set ChangeSet; class DependencyTracker; - + void NodeObserver(DBTablePartBase *root, DBEntryBase *db_entry); void LinkObserver(DBTablePartBase *root, DBEntryBase *db_entry); diff --git a/src/dns/cfg/dns_config.cc b/src/dns/cfg/dns_config.cc index 2efe8bb588f..a9b50c0d712 100644 --- a/src/dns/cfg/dns_config.cc +++ b/src/dns/cfg/dns_config.cc @@ -164,7 +164,7 @@ void DnsConfigManager::ProcessGlobalQosConfig(const ConfigDelta &delta) { ProcessNode(delta, global_qos_config_, obs_.global_qos); } -IFMapNode *DnsConfigManager::FindTarget(IFMapNode *node, +IFMapNode *DnsConfigManager::FindTarget(IFMapNode *node, std::string link_name) { for (DBGraphVertex::edge_iterator iter = node->edge_list_begin(graph()); iter != node->edge_list_end(graph()); ++iter) { @@ -176,7 +176,7 @@ IFMapNode *DnsConfigManager::FindTarget(IFMapNode *node, } IFMapNode *DnsConfigManager::FindTarget(IFMapNode *node, - std::string link_name, + std::string link_name, std::string node_type) { for (DBGraphVertex::edge_iterator iter = node->edge_list_begin(graph()); iter != node->edge_list_end(graph()); ++iter) { @@ -185,7 +185,7 @@ IFMapNode *DnsConfigManager::FindTarget(IFMapNode *node, IFMapNode *targ_node = static_cast(iter.target()); if (targ_node->table()->Typename() == node_type) return targ_node; - } + } } return NULL; } diff --git a/src/dns/cfg/dns_config.h b/src/dns/cfg/dns_config.h index 35b9739f17f..30032e54f1b 100644 --- a/src/dns/cfg/dns_config.h +++ b/src/dns/cfg/dns_config.h @@ -34,7 +34,7 @@ extern SandeshTraceBufferPtr DnsConfigTraceBuf; #define DNS_TRACE(Obj, ...) \ do { \ Obj::TraceMsg(DnsConfigTraceBuf, __FILE__, __LINE__, ##__VA_ARGS__); \ -} while (false) +} while (false) typedef boost::shared_ptr IFMapNodeProxyRef; @@ -107,7 +107,7 @@ class DnsConfigManager { void Terminate(); IFMapNode *FindTarget(IFMapNode *node, std::string link_name); - IFMapNode *FindTarget(IFMapNode *node, std::string link_name, + IFMapNode *FindTarget(IFMapNode *node, std::string link_name, std::string node_type); private: typedef std::vector ChangeList; diff --git a/src/dns/cfg/dns_config_parser.cc b/src/dns/cfg/dns_config_parser.cc index 74eda3e11ab..24ab42d296c 100644 --- a/src/dns/cfg/dns_config_parser.cc +++ b/src/dns/cfg/dns_config_parser.cc @@ -81,7 +81,7 @@ static void SetData(const string &identifier, const string &id_type, } static void ClearData(const string &identifier, const string &id_type, - const string &metadata, + const string &metadata, DnsConfigParser::RequestList *requests) { DBRequest *request = new DBRequest; request->oper = DBRequest::DB_ENTRY_DELETE; @@ -96,7 +96,7 @@ static void ClearData(const string &identifier, const string &id_type, requests->push_back(request); } -static bool ParseVnNetworkIpam(const xml_node &node, bool add_change, +static bool ParseVnNetworkIpam(const xml_node &node, bool add_change, DnsConfigParser::RequestList *requests) { xml_attribute name_attr = node.attribute("name"); xml_attribute ipam_attr = node.attribute("ipam"); @@ -118,11 +118,11 @@ static bool ParseVnNetworkIpam(const xml_node &node, bool add_change, } if (add_change) { - MapObjectLinkAttr("virtual-network", vn, "network-ipam", ipam, - "virtual-network-network-ipam", params.release(), requests, + MapObjectLinkAttr("virtual-network", vn, "network-ipam", ipam, + "virtual-network-network-ipam", params.release(), requests, DBRequest::DB_ENTRY_ADD_CHANGE); } else { - MapObjectLinkAttr("virtual-network", vn, "network-ipam", ipam, + MapObjectLinkAttr("virtual-network", vn, "network-ipam", ipam, "virtual-network-network-ipam", params.release(), requests, DBRequest::DB_ENTRY_DELETE); } @@ -130,7 +130,7 @@ static bool ParseVnNetworkIpam(const xml_node &node, bool add_change, return true; } -static bool ParseNetworkIpam(const xml_node &node, bool add_change, +static bool ParseNetworkIpam(const xml_node &node, bool add_change, DnsConfigParser::RequestList *requests) { xml_attribute name = node.attribute("name"); string identifier; @@ -143,7 +143,7 @@ static bool ParseNetworkIpam(const xml_node &node, bool add_change, } if (add_change) { - SetData(identifier, "network-ipam", "network-ipam-mgmt", + SetData(identifier, "network-ipam", "network-ipam-mgmt", params.release(), requests); } else { ClearData(identifier, "network-ipam", "network-ipam-mgmt", requests); @@ -152,7 +152,7 @@ static bool ParseNetworkIpam(const xml_node &node, bool add_change, return true; } -static bool ParseVirtualDNS(const xml_node &node, bool add_change, +static bool ParseVirtualDNS(const xml_node &node, bool add_change, DnsConfigParser::RequestList *requests) { xml_attribute name = node.attribute("name"); xml_attribute domain = node.attribute("domain"); @@ -172,12 +172,12 @@ static bool ParseVirtualDNS(const xml_node &node, bool add_change, if (add_change) { SetData(identifier, "virtual-DNS", "virtual-DNS-data", params.release(), requests); - MapObjectLink("domain", view, "virtual-DNS", identifier, - "domain-virtual-DNS", requests, + MapObjectLink("domain", view, "virtual-DNS", identifier, + "domain-virtual-DNS", requests, DBRequest::DB_ENTRY_ADD_CHANGE); } else { ClearData(identifier, "virtual-DNS", "virtual-DNS-data", requests); - MapObjectLink("domain", view, "virtual-DNS", identifier, + MapObjectLink("domain", view, "virtual-DNS", identifier, "domain-virtual-DNS", requests, DBRequest::DB_ENTRY_DELETE); } @@ -185,7 +185,7 @@ static bool ParseVirtualDNS(const xml_node &node, bool add_change, return true; } -static bool ParseVirtualDNSRecord(const xml_node &node, bool add_change, +static bool ParseVirtualDNSRecord(const xml_node &node, bool add_change, DnsConfigParser::RequestList *requests) { xml_attribute name = node.attribute("name"); xml_attribute dns = node.attribute("dns"); @@ -206,14 +206,14 @@ static bool ParseVirtualDNSRecord(const xml_node &node, bool add_change, SetData(identifier, "virtual-DNS-record", "virtual-DNS-record-data", params.release(), requests); MapObjectLink("virtual-DNS", virtual_dns, - "virtual-DNS-record", identifier, + "virtual-DNS-record", identifier, "virtual-DNS-virtual-DNS-record", requests, DBRequest::DB_ENTRY_ADD_CHANGE); } else { - ClearData(identifier, "virtual-DNS-record", + ClearData(identifier, "virtual-DNS-record", "virtual-DNS-record-data", requests); MapObjectLink("virtual-DNS", virtual_dns, - "virtual-DNS-record", identifier, + "virtual-DNS-record", identifier, "virtual-DNS-virtual-DNS-record", requests, DBRequest::DB_ENTRY_DELETE); } diff --git a/src/dns/cmn/dns.h b/src/dns/cmn/dns.h index c1e64e4131d..06b3515d906 100644 --- a/src/dns/cmn/dns.h +++ b/src/dns/cmn/dns.h @@ -72,7 +72,7 @@ class Dns { SetTaskSchedulingPolicy(); } - + private: static void SetTaskSchedulingPolicy(); diff --git a/src/dns/main.cc b/src/dns/main.cc index 832e97f5f54..f3f2258c284 100644 --- a/src/dns/main.cc +++ b/src/dns/main.cc @@ -204,7 +204,7 @@ int main(int argc, char *argv[]) { ConfigFactory::Register( boost::factory()); ConfigClientManager *config_client_manager = - new ConfigClientManager(Dns::GetEventManager(), options.hostname(), + new ConfigClientManager(Dns::GetEventManager(), options.hostname(), module_name, options.configdb_options()); ConfigJsonParser *json_parser = static_cast(config_client_manager->config_json_parser()); diff --git a/src/dns/mgr/dns_mgr.cc b/src/dns/mgr/dns_mgr.cc index 9faf54cee00..5defe9ea643 100644 --- a/src/dns/mgr/dns_mgr.cc +++ b/src/dns/mgr/dns_mgr.cc @@ -217,7 +217,7 @@ void DnsManager::DnsPtrZone(const Subnet &subnet, const VirtualDnsConfig *vdns, DNS_BIND_TRACE(DnsBindTrace, "Ptr Zone <" << vdns->GetName() << "> ; ignoring event: " << DnsConfig::ToEventString(ev) << " Domain: " << dns_domain << " Reverse Resolution: " << - (vdns->IsReverseResolutionEnabled()? "enabled" : + (vdns->IsReverseResolutionEnabled()? "enabled" : "disabled")); return; } @@ -360,7 +360,7 @@ void DnsManager::SendRetransmit(uint16_t xid, BindUtil::Operation op, uint8_t *pkt = new uint8_t[BindResolver::max_pkt_size]; int len = BindUtil::BuildDnsUpdate(pkt, op, xid, view, zone, items); if (BindResolver::Resolver()->DnsSend(pkt, 0, len)) { - DNS_BIND_TRACE(DnsBindTrace, + DNS_BIND_TRACE(DnsBindTrace, "DNS transmit sent for DNS record; xid = " << xid << "; View = " << view << "; Zone = " << zone << "; " << DnsItemsToString(items) << " Retry = " << @@ -447,7 +447,7 @@ bool DnsManager::ResendRecordsinBatch() { dp_pending_map_.insert(PendingListPair(it->first, PendingList(it->first, it->second.view, it->second.zone, it->second.items, - it->second.op, + it->second.op, it->second.retransmit_count))); ResetTransId(it->first); pending_map_.erase(it++); diff --git a/src/dns/mgr/dns_mgr.h b/src/dns/mgr/dns_mgr.h index db7bbdc65b7..330a9bfa9e2 100644 --- a/src/dns/mgr/dns_mgr.h +++ b/src/dns/mgr/dns_mgr.h @@ -36,7 +36,7 @@ class DnsManager { uint32_t retransmit_count; PendingList(uint16_t id, const std::string &v, const std::string &z, - const DnsItems &it, BindUtil::Operation o, + const DnsItems &it, BindUtil::Operation o, uint32_t recount = 0) { xid = id; view = v; @@ -107,7 +107,7 @@ class DnsManager { friend class DnsBindTest; friend class DnsManagerTest; - bool SendRecordUpdate(BindUtil::Operation op, + bool SendRecordUpdate(BindUtil::Operation op, const VirtualDnsRecordConfig *config); bool PendingDone(uint16_t xid); bool ResendRecordsinBatch(); @@ -142,7 +142,7 @@ class DnsManager { tbb::mutex mutex_; BindStatus bind_status_; - DnsConfigManager config_mgr_; + DnsConfigManager config_mgr_; ConfigClientManager *config_client_manager_; static uint16_t g_trans_id_; PendingListMap pending_map_; diff --git a/src/dns/mgr/dns_oper.cc b/src/dns/mgr/dns_oper.cc index 9a30766031c..0876d5001f7 100644 --- a/src/dns/mgr/dns_oper.cc +++ b/src/dns/mgr/dns_oper.cc @@ -116,14 +116,14 @@ void VnniConfig::FindSubnets(IFMapNode *node, Subnets &subnets) { if (!node || node->IsDeleted()) return; - autogen::VirtualNetworkNetworkIpam *vnni = + autogen::VirtualNetworkNetworkIpam *vnni = static_cast (node->GetObject()); if (!vnni) return; const autogen::VnSubnetsType &subnets_type = vnni->data(); for (unsigned int i = 0; i < subnets_type.ipam_subnets.size(); ++i) { - Subnet subnet(subnets_type.ipam_subnets[i].subnet.ip_prefix, + Subnet subnet(subnets_type.ipam_subnets[i].subnet.ip_prefix, subnets_type.ipam_subnets[i].subnet.ip_prefix_len); subnets.push_back(subnet); } @@ -151,15 +151,15 @@ bool VnniConfig::NotifySubnets(Subnets &old_nets, Subnets &new_nets, // no change in entry it_old++; it_new++; - } - } + } + } // delete remaining old entries for (; it_old != old_nets.end(); ++it_old) { it_old->MarkDelete(); VdnsZoneCallback(*it_old, vdns, DnsConfig::CFG_DELETE); change = true; - } + } // add remaining new entries for (; it_new != new_nets.end(); ++it_new) { @@ -181,7 +181,7 @@ VnniConfig *VnniConfig::Find(std::string name) { //////////////////////////////////////////////////////////////////////////////// -IpamConfig::IpamConfig(IFMapNode *node) +IpamConfig::IpamConfig(IFMapNode *node) : DnsConfig(node->name()), virtual_dns_(NULL) { GetObject(node, rec_); ipam_config_.insert(DataPair(GetName(), this)); @@ -283,7 +283,7 @@ void IpamConfig::AssociateIpamVdns(VirtualDnsConfig *vdns) { IpamConfig *ipam = iter->second; if (!ipam->GetVirtualDns() && ipam->GetVirtualDnsName() == vdns->GetName()) { - ipam->virtual_dns_ = vdns; + ipam->virtual_dns_ = vdns; vdns->AddIpam(ipam); } } @@ -393,7 +393,7 @@ bool VirtualDnsConfig::GetSubnet(uint32_t addr, Subnet &subnet) const { vnni_it != vnni.end(); ++vnni_it) { Subnets &subnets = (*vnni_it)->GetSubnets(); for (unsigned int i = 0; i < subnets.size(); i++) { - uint32_t mask = + uint32_t mask = subnets[i].plen ? (0xFFFFFFFF << (32 - subnets[i].plen)) : 0; if ((addr & mask) == (subnets[i].prefix.to_ulong() & mask)) { subnet = subnets[i]; @@ -451,19 +451,19 @@ void VirtualDnsConfig::Trace(const std::string &ev) { DNS_TRACE(VirtualDnsTrace, ev, rec); } -std::string VirtualDnsConfig::GetViewName() const { +std::string VirtualDnsConfig::GetViewName() const { std::string name(GetName()); BindUtil::RemoveSpecialChars(name); - return name; + return name; } -std::string VirtualDnsConfig::GetNextDns() const { +std::string VirtualDnsConfig::GetNextDns() const { std::string name(rec_.next_virtual_DNS); BindUtil::RemoveSpecialChars(name); - return name; -} + return name; +} -bool VirtualDnsConfig::DynamicUpdatesEnabled() const { +bool VirtualDnsConfig::DynamicUpdatesEnabled() const { return rec_.dynamic_records_from_client; } @@ -485,7 +485,7 @@ VirtualDnsRecordConfig::VirtualDnsRecordConfig(IFMapNode *node) UpdateVdns(node); } -VirtualDnsRecordConfig::VirtualDnsRecordConfig(const std::string &name, +VirtualDnsRecordConfig::VirtualDnsRecordConfig(const std::string &name, const std::string &vdns_name, const DnsItem &item) : DnsConfig(name), rec_(item), virt_dns_(NULL), @@ -625,7 +625,7 @@ bool VirtualDnsRecordConfig::OnlyTtlChange(DnsItem &rhs) { return false; } -autogen::VirtualDnsType VirtualDnsRecordConfig::GetVDns() const { +autogen::VirtualDnsType VirtualDnsRecordConfig::GetVDns() const { autogen::VirtualDnsType data; data.dynamic_records_from_client = false; data.default_ttl_seconds = 0; @@ -634,9 +634,9 @@ autogen::VirtualDnsType VirtualDnsRecordConfig::GetVDns() const { return data; } -std::string VirtualDnsRecordConfig::GetViewName() const { +std::string VirtualDnsRecordConfig::GetViewName() const { if (virt_dns_) { - return virt_dns_->GetViewName(); + return virt_dns_->GetViewName(); } else return ""; } diff --git a/src/dns/mgr/dns_oper.h b/src/dns/mgr/dns_oper.h index c97b0908d69..e39a51f5d0e 100644 --- a/src/dns/mgr/dns_oper.h +++ b/src/dns/mgr/dns_oper.h @@ -33,7 +33,7 @@ struct DnsConfig { CFG_CHANGE, CFG_DELETE, }; - + enum DnsConfigFlags { DnsConfigValid = 1 << 0, // DnsManager received the config DnsConfigNotified = 1 << 1, // DnsManager installed the config @@ -64,7 +64,7 @@ struct DnsConfig { static Callback VdnsRecordCallback; static ZoneCallback VdnsZoneCallback; static const std::string EventString[]; - static const std::string &ToEventString(DnsConfigEvent ev) { + static const std::string &ToEventString(DnsConfigEvent ev) { return EventString[ev]; } @@ -121,8 +121,8 @@ struct IpamConfig : public DnsConfig { bool GetObject(IFMapNode *node, autogen::IpamType &data); void AddVnni(VnniConfig *vnni) { vnni_list_.insert(vnni); } void DelVnni(VnniConfig *vnni) { vnni_list_.erase(vnni); } - std::string &GetVirtualDnsName() { - return rec_.ipam_dns_server.virtual_dns_server_name; + std::string &GetVirtualDnsName() { + return rec_.ipam_dns_server.virtual_dns_server_name; } VirtualDnsConfig *GetVirtualDns() { return virtual_dns_; } const VnniList &GetVnniList() const { return vnni_list_; } diff --git a/src/dns/test/dns_bind_test.cc b/src/dns/test/dns_bind_test.cc index 7ba46213756..bdb5a573451 100644 --- a/src/dns/test/dns_bind_test.cc +++ b/src/dns/test/dns_bind_test.cc @@ -48,14 +48,14 @@ class NamedConfigTest : public NamedConfig { virtual void UpdateNamedConf(const VirtualDnsConfig *updated_vdns) { CreateNamedConf(updated_vdns); } - std::string GetZoneFileName(const std::string &vdns, + std::string GetZoneFileName(const std::string &vdns, const std::string &name) { if (name.size() && name.at(name.size() - 1) == '.') return (name + "zone"); else return (name + ".zone"); } - std::string GetZoneFilePath(const std::string &vdns, + std::string GetZoneFilePath(const std::string &vdns, const string &name) { return (named_config_dir_ + GetZoneFileName("", name)); } @@ -66,11 +66,11 @@ class NamedConfigTest : public NamedConfig { }; static bool FileExists(const char *file) { - ifstream f(file); + ifstream f(file); if (f.is_open()) { - return true; - } - return false; + return true; + } + return false; } static string FileRead(const string &filename) { @@ -112,7 +112,7 @@ static bool FilesEqual(const char *file1, const char *file2) { buf1 = new char[size1]; buf2 = new char[size2]; - // get file data + // get file data pbuf1->sgetn(buf1, size1); pbuf2->sgetn(buf2, size2); @@ -180,13 +180,13 @@ TEST_F(DnsBindTest, Config) { EXPECT_TRUE(FilesEqual(cfg->GetConfFilePath().c_str(), "controller/src/dns/testdata/named.conf.1")); string s1 = cfg->GetZoneFilePath(dns_domains[0]); - EXPECT_TRUE(FilesEqual(s1.c_str(), + EXPECT_TRUE(FilesEqual(s1.c_str(), "controller/src/dns/testdata/contrail.juniper.net.zone.1")); string s2 = cfg->GetZoneFilePath(dns_domains[1]); - EXPECT_TRUE(FilesEqual(s2.c_str(), + EXPECT_TRUE(FilesEqual(s2.c_str(), "controller/src/dns/testdata/test.example.com.zone.1")); s1 = cfg->GetZoneFilePath(dns_domains[3]); - EXPECT_TRUE(FilesEqual(s1.c_str(), + EXPECT_TRUE(FilesEqual(s1.c_str(), "controller/src/dns/testdata/2.1.1.in-addr.arpa.zone")); for (int i = 0; i < 3; i++) { s1 = cfg->GetZoneFilePath(dns_domains[i+4]); @@ -210,10 +210,10 @@ TEST_F(DnsBindTest, Config) { EXPECT_TRUE(FilesEqual(cfg->GetConfFilePath().c_str(), "controller/src/dns/testdata/named.conf.2")); s1 = cfg->GetZoneFilePath(dns_domains[2]); - EXPECT_TRUE(FilesEqual(s1.c_str(), + EXPECT_TRUE(FilesEqual(s1.c_str(), "controller/src/dns/testdata/contrail.juniper.com.zone.1")); s2 = cfg->GetZoneFilePath(dns_domains[1]); - EXPECT_TRUE(FilesEqual(s2.c_str(), + EXPECT_TRUE(FilesEqual(s2.c_str(), "controller/src/dns/testdata/test.example.com.zone.1")); boost::replace_all(content, "", ""); diff --git a/src/dns/test/dns_config_test.cc b/src/dns/test/dns_config_test.cc index a5470e88067..661349bd07c 100644 --- a/src/dns/test/dns_config_test.cc +++ b/src/dns/test/dns_config_test.cc @@ -91,7 +91,7 @@ class DnsConfigManagerTest : public ::testing::Test { task_util::WaitForIdle(); db_util::Clear(&db_); } - void DnsIpamCallback(const Subnet &subnet, const VirtualDnsConfig *c, + void DnsIpamCallback(const Subnet &subnet, const VirtualDnsConfig *c, DnsConfig::DnsConfigEvent ev) { counts_[DNS_NETWORK_IPAM][ev]++; } @@ -117,10 +117,10 @@ class DnsConfigManagerTest : public ::testing::Test { Subnets &subnets = (*vnni_it)->GetSubnets(); counts_[DNS_NETWORK_IPAM][ev] += subnets.size(); } - } - } + } + } if (ev == DnsConfig::CFG_DELETE) { - counts_[DNS_VIRT_DOMAIN_RECORD][ev] += + counts_[DNS_VIRT_DOMAIN_RECORD][ev] += c->virtual_dns_records_.size(); } } @@ -143,7 +143,7 @@ class DnsConfigManagerTest : public ::testing::Test { counts_[i][j] = 0; } void Register() { - DnsConfig::VdnsCallback = + DnsConfig::VdnsCallback = boost::bind(&DnsConfigManagerTest::VDnsCallback, this, _1, _2); DnsConfig::VdnsRecordCallback = boost::bind(&DnsConfigManagerTest::VDnsRecCallback, this, _1, _2); diff --git a/src/dns/test/dns_options_test.cc b/src/dns/test/dns_options_test.cc index eaf2319fb27..360b4d8faf0 100644 --- a/src/dns/test/dns_options_test.cc +++ b/src/dns/test/dns_options_test.cc @@ -77,10 +77,10 @@ TEST_F(OptionsTest, NoArguments) { EXPECT_EQ(options_.rabbitmq_password(), "guest"); EXPECT_EQ(options_.rabbitmq_ssl_enabled(), false); TASK_UTIL_EXPECT_VECTOR_EQ(default_rabbitmq_server_list_, - options_.rabbitmq_server_list()); + options_.rabbitmq_server_list()); TASK_UTIL_EXPECT_VECTOR_EQ(default_configdb_server_list_, options_.config_db_server_list()); - + EXPECT_EQ(options_.test_mode(), false); EXPECT_EQ(options_.sandesh_config().system_logs_rate_limit, g_sandesh_constants.DEFAULT_SANDESH_SEND_RATELIMIT); @@ -126,7 +126,7 @@ TEST_F(OptionsTest, DefaultConfFile) { EXPECT_EQ(options_.rabbitmq_password(), "guest"); EXPECT_EQ(options_.rabbitmq_ssl_enabled(), false); TASK_UTIL_EXPECT_VECTOR_EQ(default_rabbitmq_server_list_, - options_.rabbitmq_server_list()); + options_.rabbitmq_server_list()); TASK_UTIL_EXPECT_VECTOR_EQ(default_configdb_server_list_, options_.config_db_server_list()); EXPECT_EQ(options_.test_mode(), false); diff --git a/src/ifmap/client/config_json_parser.cc b/src/ifmap/client/config_json_parser.cc index 92e27231755..22bf6d03133 100644 --- a/src/ifmap/client/config_json_parser.cc +++ b/src/ifmap/client/config_json_parser.cc @@ -319,7 +319,7 @@ void ConfigJsonParser::InsertRequestIntoQ(IFMapOrigin::Origin origin, const string &metaname, auto_ptr pvalue, const IFMapTable::RequestKey &key, bool add_change, RequestList *req_list) const { - + IFMapServerTable::RequestData *data = new IFMapServerTable::RequestData(origin, neigh_type, neigh_name); data->metadata = metaname; diff --git a/src/ifmap/client/config_json_parser.h b/src/ifmap/client/config_json_parser.h index 973a484b51a..65dce2ade29 100644 --- a/src/ifmap/client/config_json_parser.h +++ b/src/ifmap/client/config_json_parser.h @@ -31,7 +31,7 @@ class ConfigJsonParser : public ConfigJsonParserBase { > MetadataParseFn; typedef std::map MetadataParseMap; typedef std::list RequestList; - + ConfigJsonParser(); ~ConfigJsonParser(); diff --git a/src/ifmap/ifmap_agent_parser.cc b/src/ifmap/ifmap_agent_parser.cc index b3ff9a5827a..2fcc505678d 100644 --- a/src/ifmap/ifmap_agent_parser.cc +++ b/src/ifmap/ifmap_agent_parser.cc @@ -45,7 +45,7 @@ void IFMapAgentParser::NodeParse(xml_node &node, DBRequest::DBOperation oper, ui node_parse_errors_[msg_type]++; return; } - + IFMapObject *obj; IFMapTable::RequestKey *req_key = new IFMapTable::RequestKey; @@ -79,7 +79,7 @@ void IFMapAgentParser::LinkParse(xml_node &link, DBRequest::DBOperation oper, ui const char *name2; IFMapTable *table; IFMapAgentLinkTable *link_table; - + int msg_type; if (oper == DBRequest::DB_ENTRY_ADD_CHANGE) msg_type = UPDATE; @@ -88,7 +88,7 @@ void IFMapAgentParser::LinkParse(xml_node &link, DBRequest::DBOperation oper, ui link_table = static_cast( db_->FindTable(IFMAP_AGENT_LINK_DB_NAME)); - + assert(link_table); // Get both first and second node and its corresponding tables @@ -174,15 +174,15 @@ void IFMapAgentParser::ConfigParse(const xml_node config, const uint64_t seq) { if (strcmp(node.name(), "update") == 0) { oper = DBRequest::DB_ENTRY_ADD_CHANGE; msg_type = UPDATE; - } else if (strcmp(node.name(), "delete") == 0) { + } else if (strcmp(node.name(), "delete") == 0) { oper = DBRequest::DB_ENTRY_DELETE; msg_type = DEL; - } else { + } else { continue; } for(xml_node chld = node.first_child(); chld; chld = chld.next_sibling()) { - + // Handle the links between the nodes if (strcmp(chld.name(), "link") == 0) { links_processed_[msg_type]++; @@ -194,6 +194,6 @@ void IFMapAgentParser::ConfigParse(const xml_node config, const uint64_t seq) { nodes_processed_[msg_type]++; NodeParse(chld, oper, seq); } - } + } } } diff --git a/src/ifmap/ifmap_agent_parser.h b/src/ifmap/ifmap_agent_parser.h index 54c1e9cc701..4faa09162a5 100644 --- a/src/ifmap/ifmap_agent_parser.h +++ b/src/ifmap/ifmap_agent_parser.h @@ -29,7 +29,7 @@ class IFMapAgentParser { IFMapAgentParser(DB *db) : db_(db) { reset_statistics(); } ; - typedef boost::function< IFMapObject *(const pugi::xml_node, DB *, + typedef boost::function< IFMapObject *(const pugi::xml_node, DB *, std::string *id_name) > NodeParseFn; typedef std::map NodeParseMap; void NodeRegister(const std::string &node, NodeParseFn parser); diff --git a/src/ifmap/ifmap_agent_sandesh.cc b/src/ifmap/ifmap_agent_sandesh.cc index 39e4dba309f..b4d72d9077f 100644 --- a/src/ifmap/ifmap_agent_sandesh.cc +++ b/src/ifmap/ifmap_agent_sandesh.cc @@ -133,7 +133,7 @@ void xml_parse(pugi::xml_node &node, string &s, int n) { for (pugi::xml_attribute_iterator ait = node.attributes_begin(); ait != node.attributes_end(); ++ait) { s = s + t + ait->name() + ":" + ait->value() + "\n"; } - + for(pugi::xml_node chld = node.first_child(); chld; chld = chld.next_sibling()) { xml_parse(chld, s, n + 1); } @@ -177,7 +177,7 @@ void ShowIFMapAgentTable::MakeNode(const string &name_sub_string, // Display its adjacencies dst = dst + "Adjacencies:\n"; IFMapAgentTable *table = static_cast(node->table()); - for (DBGraphVertex::adjacency_iterator + for (DBGraphVertex::adjacency_iterator iter = node->begin(table->GetGraph()); iter != node->end(table->GetGraph()); ++iter) { IFMapNode *adj_node = static_cast(iter.operator->()); @@ -221,7 +221,7 @@ void ShowIFMapAgentTable::TableToBuffer(const ShowIFMapAgentReq *request, bool ShowIFMapAgentTable::BufferSomeTables(const RequestPipeline::PipeSpec ps, RequestPipeline::InstData *data) { - const ShowIFMapAgentReq *request = + const ShowIFMapAgentReq *request = static_cast(ps.snhRequest_.get()); IFMapTable *table = IFMapTable::FindTable(db_, request->get_table_name()); @@ -263,7 +263,7 @@ bool ShowIFMapAgentTable::BufferStage(const Sandesh *sr, int stage, int instNum, RequestPipeline::InstData *data) { - const ShowIFMapAgentReq *request = + const ShowIFMapAgentReq *request = static_cast(ps.snhRequest_.get()); // If table name has not been passed, print all tables if (request->get_table_name().length()) { @@ -278,9 +278,9 @@ bool ShowIFMapAgentTable::SendStage(const Sandesh *sr, int stage, int instNum, RequestPipeline::InstData *data) { const RequestPipeline::StageData *stage_data = ps.GetStageData(0); - const ShowIFMapAgentTable::ShowData &show_data = + const ShowIFMapAgentTable::ShowData &show_data = static_cast (stage_data->at(0)); - const ShowIFMapAgentReq *request = + const ShowIFMapAgentReq *request = static_cast(ps.snhRequest_.get()); ShowIFMapAgentResp *response = new ShowIFMapAgentResp(); response->set_table_data(show_data.send_buffer); @@ -332,7 +332,7 @@ void ShowIFMapAgentDefLinkReq::HandleRequest() const { const IFMapAgentLinkTable::LinkDefMap &def_list = link_table->GetLinkDefMap(); //Get Sandesh response's output list - std::vector &list = + std::vector &list = const_cast&>(resp->get_def_list()); //Iterate left node list @@ -349,7 +349,7 @@ void ShowIFMapAgentDefLinkReq::HandleRequest() const { data.set_metadata((*it).link_metadata); data.set_right_node((*it).node_key.id_type + ":" + (*it).node_key.id_name); - list.push_back(data); + list.push_back(data); } } resp->set_context(context()); diff --git a/src/ifmap/ifmap_agent_table.h b/src/ifmap/ifmap_agent_table.h index b8da9de0b09..7d4bc130e46 100644 --- a/src/ifmap/ifmap_agent_table.h +++ b/src/ifmap/ifmap_agent_table.h @@ -15,7 +15,7 @@ #include "sandesh/sandesh_trace.h" #define IFMAP_AGENT_LINK_DB_NAME "__ifmap_agentlinkdata__.0" -extern SandeshTraceBufferPtr IFMapAgentTraceBuf; +extern SandeshTraceBufferPtr IFMapAgentTraceBuf; #define IFMAP_AGENT_TRACE(obj, ...) do { \ if (LoggingDisabled()) break; \ @@ -43,7 +43,7 @@ class IFMapAgentTable : public IFMapTable { // Allocate an IFMapNode. virtual std::auto_ptr AllocEntry(const DBRequestKey *key) const; - + static IFMapNode *TableEntryLookup(DB *db, RequestKey *key); void NotifyNode(IFMapNode *node); const DBGraph *GetGraph() const {return graph();}; @@ -74,9 +74,9 @@ class IFMapAgentLinkTable : public IFMapLinkTable { class comp { public: - bool operator()(const IFMapTable::RequestKey &left, + bool operator()(const IFMapTable::RequestKey &left, const IFMapTable::RequestKey &right) const { - if (left.id_type != right.id_type) + if (left.id_type != right.id_type) return left.id_type < right.id_type; return left.id_name < right.id_name; diff --git a/src/ifmap/ifmap_encoder.cc b/src/ifmap/ifmap_encoder.cc index 9ff6d6bd6be..fbaa481d628 100644 --- a/src/ifmap/ifmap_encoder.cc +++ b/src/ifmap/ifmap_encoder.cc @@ -22,7 +22,7 @@ void IFMapMessage::Open() { xml_node iq = doc_.append_child("iq"); // set iq (type, from, to) attributes iq.append_attribute("type") = "set"; - iq.append_attribute("from") = "network-control@contrailsystems.com"; + iq.append_attribute("from") = "network-control@contrailsystems.com"; iq.append_attribute("to") = ""; config_ = iq.append_child("config"); } @@ -83,7 +83,7 @@ void IFMapMessage::EncodeNode(const IFMapUpdate *update) { node->EncodeNodeDetail(&op_node_); } else { node->EncodeNode(&op_node_); - } + } } void IFMapMessage::EncodeLink(const IFMapUpdate *update) { diff --git a/src/ifmap/ifmap_exporter.cc b/src/ifmap/ifmap_exporter.cc index c791e733616..339433c574f 100644 --- a/src/ifmap/ifmap_exporter.cc +++ b/src/ifmap/ifmap_exporter.cc @@ -242,7 +242,7 @@ bool IFMapExporter::UpdateRemove(ObjectType *obj, IFMapState *state, update = new IFMapUpdate(obj, false); state->Insert(update); } - + update->SetAdvertise(rm_set); queue()->Enqueue(update); sender()->QueueActive(); @@ -255,7 +255,7 @@ void IFMapExporter::EnqueueDelete(ObjectType *obj, IFMapState *state) { if (update != NULL) { queue()->Dequeue(update); state->Remove(update); - delete update; + delete update; } update = state->GetUpdate(IFMapListEntry::DEL); @@ -282,7 +282,7 @@ IFMapLinkState *IFMapExporter::LinkStateLookup(IFMapLink *link) { return NULL; IFMapLinkState *state = static_cast( link->GetState(link_table_, tinfo->id())); - return state; + return state; } void IFMapExporter::MoveDependentLinks(IFMapNodeState *state) { @@ -394,7 +394,7 @@ void IFMapExporter::NodeTableExport(DBTablePartBase *partition, rm_set.BuildComplement(state->advertised(), state->interest()); bool change = ConfigChanged(node); - + // enqueue update // If there is a previous update in the queue, if that update has // been seen by any of receivers, we need to move the update to @@ -507,7 +507,7 @@ void IFMapExporter::LinkTableExport(DBTablePartBase *partition, } UpdateAddChange(link, state, add_set, rm_set, false); - + bool move = UpdateRemove(link, state, rm_set); if (move) { MoveAdjacentNode(s_left); diff --git a/src/ifmap/ifmap_factory.h b/src/ifmap/ifmap_factory.h index 15d62e2797e..eb1e9a595d1 100644 --- a/src/ifmap/ifmap_factory.h +++ b/src/ifmap/ifmap_factory.h @@ -23,7 +23,7 @@ class XmppChannel; class IFMapFactory : public Factory { FACTORY_TYPE_N3(IFMapFactory, IFMapXmppChannel, XmppChannel *, IFMapServer *, IFMapChannelManager *); - + FACTORY_TYPE_N5(IFMapFactory, CqlIf, EventManager *, const std::vector &, int, const std::string &, const std::string &); diff --git a/src/ifmap/ifmap_graph_walker.cc b/src/ifmap/ifmap_graph_walker.cc index b6d07ff1b21..0e38aa01562 100644 --- a/src/ifmap/ifmap_graph_walker.cc +++ b/src/ifmap/ifmap_graph_walker.cc @@ -125,7 +125,7 @@ void IFMapGraphWalker::LinkRemove(const BitSet &bset) { link_delete_walk_trigger_->Set(); } -// Check if the neighbor or link to neighbor should be filtered. Returns true +// Check if the neighbor or link to neighbor should be filtered. Returns true // if rnode or link to rnode should be filtered. bool IFMapGraphWalker::FilterNeighbor(IFMapNode *lnode, IFMapLink *link) { IFMapNode *rnode = link->left(); @@ -333,11 +333,11 @@ const IFMapTypenameWhiteList &IFMapGraphWalker::get_traversal_white_list() return *traversal_white_list_.get(); } -// The nodes listed below and the nodes in -// IFMapGraphTraversalFilterCalculator::CreateNodeBlackList() are mutually +// The nodes listed below and the nodes in +// IFMapGraphTraversalFilterCalculator::CreateNodeBlackList() are mutually // exclusive void IFMapGraphWalker::AddNodesToWhitelist() { - traversal_white_list_->include_vertex = map_list_of > + traversal_white_list_->include_vertex = map_list_of > ("virtual-router", list_of("physical-router-virtual-router") ("virtual-router-virtual-machine") @@ -350,7 +350,7 @@ void IFMapGraphWalker::AddNodesToWhitelist() { list_of("virtual-machine-service-instance") ("virtual-machine-interface-virtual-machine") ("virtual-machine-tag")) - ("bgp-router", + ("bgp-router", list_of("instance-bgp-router") ("physical-router-bgp-router")) ("global-system-config", diff --git a/src/ifmap/ifmap_link.h b/src/ifmap/ifmap_link.h index 8cd8e1cac7f..f40366ead0d 100644 --- a/src/ifmap/ifmap_link.h +++ b/src/ifmap/ifmap_link.h @@ -16,7 +16,7 @@ class IFMapLink : public DBGraphEdge { public: struct LinkOriginInfo { - explicit LinkOriginInfo() : + explicit LinkOriginInfo() : origin(IFMapOrigin::UNKNOWN), sequence_number(0) { } explicit LinkOriginInfo(IFMapOrigin origin, uint64_t seq_num) : @@ -29,34 +29,34 @@ class IFMapLink : public DBGraphEdge { IFMapLink(const std::string &name); const std::string &link_name() const { return link_name_; } virtual const std::string &name() const { return metadata_; } - + // Initialize the link. void SetProperties(IFMapNode *left, IFMapNode *right, const std::string &metadata, uint64_t sequence_number, const IFMapOrigin &origin); // Update some fields - void UpdateProperties(const IFMapOrigin &in_origin, + void UpdateProperties(const IFMapOrigin &in_origin, uint64_t sequence_number); // Called by IFMapLinkTable when the node is deleted. void ClearNodes(); - + virtual KeyPtr GetDBRequestKey() const; virtual void SetKey(const DBRequestKey *genkey); virtual std::string ToString() const; virtual bool IsLess(const DBEntry &rgen) const; - + // Return the left node. If the link is deleted, the node is retrieved // by doing a database table lookup iff db in non-NULL. If db is NULL, // the method returns NULL. The actual node may have already been deleted. IFMapNode *LeftNode(DB *db); const IFMapNode *LeftNode(DB *db) const; - + // Return the right node. As with the corresponding Left methods these // return the cached value if the node is not deleted and perform a DB // lookup (when the parameter db is non-NULL) when the node is deleted. IFMapNode *RightNode(DB *db); const IFMapNode *RightNode(DB *db) const; - + IFMapNode *left() { return left_node_; } const IFMapNode *left() const { return left_node_; } IFMapNode *right() { return right_node_; } @@ -64,7 +64,7 @@ class IFMapLink : public DBGraphEdge { const IFMapNode::Descriptor &left_id() const { return left_id_; } const IFMapNode::Descriptor &right_id() const { return right_id_; } - + const std::string &metadata() const { return metadata_; } void AddOriginInfo(const IFMapOrigin &in_origin, uint64_t seq_num); diff --git a/src/ifmap/ifmap_link_table.cc b/src/ifmap/ifmap_link_table.cc index 508e6110708..72ff0e552ad 100644 --- a/src/ifmap/ifmap_link_table.cc +++ b/src/ifmap/ifmap_link_table.cc @@ -31,9 +31,9 @@ std::auto_ptr IFMapLinkTable::AllocEntry( return entry; } -// Generate an unique name for the link node and it should +// Generate an unique name for the link node and it should // be independent of the order in which the right and left nodes are specified -std::string IFMapLinkTable::LinkKey(const string &metadata, +std::string IFMapLinkTable::LinkKey(const string &metadata, IFMapNode *left, IFMapNode *right) { ostringstream oss; if (left->ToString() < right->ToString()) { @@ -95,7 +95,7 @@ void IFMapLinkTable::DeleteLink(IFMapLink *link) { link->ClearNodes(); DBTablePartition *partition = static_cast(GetTablePartition(0)); - partition->Delete(edge); + partition->Delete(edge); } void IFMapLinkTable::DeleteLink(IFMapLink *link, const IFMapOrigin &origin) { diff --git a/src/ifmap/ifmap_link_table.h b/src/ifmap/ifmap_link_table.h index da3dbf39f82..79ded4fe67e 100644 --- a/src/ifmap/ifmap_link_table.h +++ b/src/ifmap/ifmap_link_table.h @@ -35,7 +35,7 @@ class IFMapLinkTable : public DBGraphTable { virtual void Input(DBTablePartition *partition, DBClient *client, DBRequest *req); - std::string LinkKey(const std::string &metadata, IFMapNode *left, + std::string LinkKey(const std::string &metadata, IFMapNode *left, IFMapNode *right); IFMapLink *AddLink(IFMapNode *left, IFMapNode *right, const std::string &metadata, uint64_t sequence_number, diff --git a/src/ifmap/ifmap_node.h b/src/ifmap/ifmap_node.h index ad22de43b1f..6a4351139c7 100644 --- a/src/ifmap/ifmap_node.h +++ b/src/ifmap/ifmap_node.h @@ -17,40 +17,40 @@ class IFMapNode : public DBGraphVertex { typedef boost::intrusive::member_hook, &IFMapObject::node_> MemberHook; - + typedef boost::intrusive::list ObjectList; typedef std::pair Descriptor; - + explicit IFMapNode(IFMapTable *table); virtual ~IFMapNode(); - + virtual std::string ToString() const; - + IFMapTable *table() { return table_; } const IFMapTable *table() const { return table_; } - + virtual KeyPtr GetDBRequestKey() const; - + virtual void SetKey(const DBRequestKey *genkey); - + virtual bool IsLess(const DBEntry &db_entry) const { const IFMapNode &rhs = static_cast(db_entry); return name_ < rhs.name_; } - + void EncodeNodeDetail(pugi::xml_node *parent) const; void EncodeNode(pugi::xml_node *parent) const; static void EncodeNode(const Descriptor &descriptor, pugi::xml_node *parent); - + static IFMapNode *DescriptorLookup(DB *db, const Descriptor &descriptor); - + const std::string &name() const { return name_; } IFMapObject *Find(IFMapOrigin origin); void Insert(IFMapObject *obj); void Remove(IFMapObject *obj); - + IFMapObject *GetObject(); const IFMapObject *GetObject() const; crc32type GetConfigCrc(); diff --git a/src/ifmap/ifmap_object.h b/src/ifmap/ifmap_object.h index 5b2a4a72cce..063911e092b 100644 --- a/src/ifmap/ifmap_object.h +++ b/src/ifmap/ifmap_object.h @@ -45,7 +45,7 @@ class IFMapObject { friend void intrusive_ptr_release(IFMapObject *object); friend void intrusive_ptr_add_ref(const IFMapObject *object); friend void intrusive_ptr_release(const IFMapObject *object); - + static void Release(IFMapObject *object); boost::intrusive::list_member_hook<> node_; diff --git a/src/ifmap/ifmap_update.cc b/src/ifmap/ifmap_update.cc index a9c821dac35..364746bf1d5 100644 --- a/src/ifmap/ifmap_update.cc +++ b/src/ifmap/ifmap_update.cc @@ -7,17 +7,17 @@ #include "base/time_util.h" #include "ifmap/ifmap_node.h" -IFMapObjectPtr::IFMapObjectPtr() +IFMapObjectPtr::IFMapObjectPtr() : type(NIL) { u.ptr = NULL; } -IFMapObjectPtr::IFMapObjectPtr(IFMapNode *node) +IFMapObjectPtr::IFMapObjectPtr(IFMapNode *node) : type(NODE) { u.node = node; } -IFMapObjectPtr::IFMapObjectPtr(IFMapLink *link) +IFMapObjectPtr::IFMapObjectPtr(IFMapLink *link) : type(LINK) { u.link = link; } diff --git a/src/ifmap/ifmap_update.h b/src/ifmap/ifmap_update.h index 7a3ac4f9914..ee2e7f9f95a 100644 --- a/src/ifmap/ifmap_update.h +++ b/src/ifmap/ifmap_update.h @@ -137,7 +137,7 @@ class IFMapState : public DBState { void InterestOr(const BitSet &bset) { interest_ |= bset; } void SetInterest(const BitSet &bset) { interest_ = bset; } void InterestReset(const BitSet &set) { interest_.Reset(set); } - + void AdvertisedOr(const BitSet &set) { advertised_ |= set; } void AdvertisedReset(const BitSet &set) { advertised_.Reset(set); } diff --git a/src/ifmap/ifmap_update_queue.cc b/src/ifmap/ifmap_update_queue.cc index 35010b3b0e3..672f8ebd120 100644 --- a/src/ifmap/ifmap_update_queue.cc +++ b/src/ifmap/ifmap_update_queue.cc @@ -185,7 +185,7 @@ IFMapMarker* IFMapUpdateQueue::MarkerSplit(IFMapMarker *marker, } IFMapMarker* IFMapUpdateQueue::MarkerSplitBefore(IFMapMarker *marker, - IFMapListEntry *current, + IFMapListEntry *current, const BitSet &msplit) { bool before = true; IFMapMarker *ret_marker = MarkerSplit(marker, current, msplit, before); @@ -193,7 +193,7 @@ IFMapMarker* IFMapUpdateQueue::MarkerSplitBefore(IFMapMarker *marker, } IFMapMarker* IFMapUpdateQueue::MarkerSplitAfter(IFMapMarker *marker, - IFMapListEntry *current, + IFMapListEntry *current, const BitSet &msplit) { bool before = false; IFMapMarker *ret_marker = MarkerSplit(marker, current, msplit, before); @@ -368,9 +368,9 @@ bool ShowIFMapUpdateQueue::BufferStage(const Sandesh *sr, const RequestPipeline::PipeSpec ps, int stage, int instNum, RequestPipeline::InstData *data) { - const IFMapUpdateQueueShowReq *request = + const IFMapUpdateQueueShowReq *request = static_cast(ps.snhRequest_.get()); - IFMapSandeshContext *sctx = + IFMapSandeshContext *sctx = static_cast(request->module_context("IFMap")); ShowData *show_data = static_cast(data); @@ -378,7 +378,7 @@ bool ShowIFMapUpdateQueue::BufferStage(const Sandesh *sr, assert(queue); show_data->send_buffer.reserve(queue->list_.size()); - IFMapUpdateQueue::List::iterator iter = + IFMapUpdateQueue::List::iterator iter = queue->list_.iterator_to(queue->list_.front()); while (iter != queue->list_.end()) { IFMapListEntry *item = iter.operator->(); @@ -399,7 +399,7 @@ bool ShowIFMapUpdateQueue::SendStage(const Sandesh *sr, int stage, int instNum, RequestPipeline::InstData *data) { const RequestPipeline::StageData *prev_stage_data = ps.GetStageData(0); - const ShowIFMapUpdateQueue::ShowData &show_data = + const ShowIFMapUpdateQueue::ShowData &show_data = static_cast (prev_stage_data->at(0)); // Data for this stage @@ -426,7 +426,7 @@ bool ShowIFMapUpdateQueue::SendStage(const Sandesh *sr, } else { more = false; } - const IFMapUpdateQueueShowReq *request = + const IFMapUpdateQueueShowReq *request = static_cast(ps.snhRequest_.get()); IFMapUpdateQueueShowResp *response = new IFMapUpdateQueueShowResp(); response->set_queue(dest_buffer); diff --git a/src/ifmap/ifmap_update_queue.h b/src/ifmap/ifmap_update_queue.h index 0b5f6430119..12101e51598 100644 --- a/src/ifmap/ifmap_update_queue.h +++ b/src/ifmap/ifmap_update_queue.h @@ -105,7 +105,7 @@ class IFMapUpdateQueue { void InsertIntoListAfter(IFMapListEntry *ptr, IFMapListEntry *item); void EraseFromList(IFMapListEntry *item); void ClearAndDisposeList(); - IFMapMarker* MarkerSplit(IFMapMarker *marker, IFMapListEntry *current, + IFMapMarker* MarkerSplit(IFMapMarker *marker, IFMapListEntry *current, const BitSet &msplit, bool before); }; diff --git a/src/ifmap/ifmap_update_sender.cc b/src/ifmap/ifmap_update_sender.cc index d9f278c3d4e..3c3c69679de 100644 --- a/src/ifmap/ifmap_update_sender.cc +++ b/src/ifmap/ifmap_update_sender.cc @@ -153,7 +153,7 @@ void IFMapUpdateSender::Send(IFMapMarker *imarker) { } // ...else its an update or delete - + IFMapUpdate *update = static_cast(curr); BitSet send_set = update->advertise() & marker->mask; if (send_set.empty()) { @@ -263,7 +263,7 @@ void IFMapUpdateSender::SendUpdate(BitSet send_set, BitSet *blocked_set) { // Send the string version of the message to the client. send_result = client->SendUpdate(message_->get_string()); - // Keep track of all the clients whose buffers are full. + // Keep track of all the clients whose buffers are full. if (!send_result) { blocked_set->set(i); send_blocked_.set(i); diff --git a/src/ifmap/ifmap_update_sender.h b/src/ifmap/ifmap_update_sender.h index 8cc415d8bdc..0657e3fa273 100644 --- a/src/ifmap/ifmap_update_sender.h +++ b/src/ifmap/ifmap_update_sender.h @@ -53,7 +53,7 @@ class IFMapUpdateSender { void SendUpdate(BitSet send_set, BitSet *blocked_set); IFMapMarker* ProcessMarker(IFMapMarker *marker, IFMapMarker *next_marker, - bool *done); + bool *done); void ProcessUpdate(IFMapUpdate *update, const BitSet &base_send_set); void GetSendScheduled(BitSet *current); diff --git a/src/ifmap/ifmap_util.h b/src/ifmap/ifmap_util.h index e561e584023..1316e5d5af2 100644 --- a/src/ifmap/ifmap_util.h +++ b/src/ifmap/ifmap_util.h @@ -15,7 +15,7 @@ typedef std::mapIsPropertySet(autogen::VirtualMachine::ID_PERMS)) { autogen::UuidType uuid = vm->id_perms().uuid; - std::string vm_uuid = + std::string vm_uuid = uuid_mapper_.Add(uuid.uuid_mslong, uuid.uuid_lslong, vm_node); // Insert into the node-uuid-map diff --git a/src/ifmap/ifmap_xmpp.cc b/src/ifmap/ifmap_xmpp.cc index 82e799c9801..80eed24f001 100644 --- a/src/ifmap/ifmap_xmpp.cc +++ b/src/ifmap/ifmap_xmpp.cc @@ -125,19 +125,19 @@ void IFMapXmppChannel::WriteReadyCb(const boost::system::error_code &ec) { } IFMapXmppChannel::IFMapXmppChannel(XmppChannel *channel, IFMapServer *server, - IFMapChannelManager *ifmap_channel_manager) + IFMapChannelManager *ifmap_channel_manager) : peer_id_(xmps::CONFIG), channel_(channel), ifmap_server_(server), ifmap_channel_manager_(ifmap_channel_manager), ifmap_client_(new IFMapSender(this)), client_added_(false), channel_name_(channel->connection()->ToUVEKey()) { ifmap_client_->SetName(channel->connection()->ToUVEKey()); - channel_->RegisterReceive(xmps::CONFIG, - boost::bind(&IFMapXmppChannel::ReceiveUpdate, + channel_->RegisterReceive(xmps::CONFIG, + boost::bind(&IFMapXmppChannel::ReceiveUpdate, this, _1)); } -IFMapXmppChannel::~IFMapXmppChannel() { +IFMapXmppChannel::~IFMapXmppChannel() { delete ifmap_client_; // Enqueue Unregister and process in the context of bgp::Config task channel_->UnRegisterWriteReady(xmps::CONFIG); @@ -282,7 +282,7 @@ void IFMapXmppChannel::ReceiveUpdate(const XmppStanza::XmppMessage *msg) { const char* const vr_string = "virtual-router:"; const char* const vm_string = "virtual-machine:"; - if ((iq->iq_type.compare("set") == 0) && + if ((iq->iq_type.compare("set") == 0) && (iq->action.compare("subscribe") == 0)) { if (iq->node.compare(0, strlen(vr_string), vr_string) == 0) { bool valid_message = false; @@ -305,7 +305,7 @@ void IFMapXmppChannel::ReceiveUpdate(const XmppStanza::XmppMessage *msg) { iq->action, iq->node, channel_name()); } } - if ((iq->iq_type.compare("set") == 0) && + if ((iq->iq_type.compare("set") == 0) && (iq->action.compare("unsubscribe") == 0)) { if (iq->node.compare(0, strlen(vm_string), vm_string) == 0) { bool valid_message = false; @@ -334,7 +334,7 @@ uint64_t IFMapXmppChannel::msgs_sent() const { // IFMapClient Manager routines IFMapChannelManager::IFMapChannelManager(XmppServer *xmpp_server, - IFMapServer *ifmap_server) + IFMapServer *ifmap_server) : xmpp_server_(xmpp_server), ifmap_server_(ifmap_server), config_task_work_queue_( TaskScheduler::GetInstance()->GetTaskId("bgp::Config"), @@ -374,7 +374,7 @@ IFMapXmppChannel *IFMapChannelManager::FindChannel(XmppChannel *channel) { IFMapXmppChannel *IFMapChannelManager::FindChannel(std::string tostring) { tbb::mutex::scoped_lock lock(channel_map_mutex_); BOOST_FOREACH(ChannelMap::value_type &i, channel_map_) { - if (i.second->ToString() == tostring) + if (i.second->ToString() == tostring) return i.second; } return NULL; @@ -442,7 +442,7 @@ void IFMapChannelManager::EnqueueChannelEvent(XCEvent event, scheduler->Enqueue(proc_task); } -// This runs in the context of the "xmpp::StateMachine" +// This runs in the context of the "xmpp::StateMachine" void IFMapChannelManager::IFMapXmppChannelEventCb(XmppChannel *channel, xmps::PeerState state) { if (state == xmps::READY) { diff --git a/src/ifmap/ifmap_xmpp.h b/src/ifmap/ifmap_xmpp.h index 0e806abdc71..522050f45e6 100644 --- a/src/ifmap/ifmap_xmpp.h +++ b/src/ifmap/ifmap_xmpp.h @@ -51,9 +51,9 @@ class IFMapXmppChannel { void ClearCounters(); uint64_t msgs_sent() const; - std::string VrSubscribeGetVrName(const std::string &iqnode, + std::string VrSubscribeGetVrName(const std::string &iqnode, bool *valid_message); - std::string VmSubscribeGetVmUuid(const std::string &iqnode, + std::string VmSubscribeGetVmUuid(const std::string &iqnode, bool *valid_message); bool MustProcessChannelNotReady(); @@ -124,7 +124,7 @@ class IFMapChannelManager { } uint64_t get_unknown_subscribe_messages() { - return unknown_subscribe_messages; + return unknown_subscribe_messages; } uint64_t get_unknown_unsubscribe_messages() { return unknown_unsubscribe_messages; diff --git a/src/ifmap/ifmap_xmpp_client_show.cc b/src/ifmap/ifmap_xmpp_client_show.cc index fa93f407861..7c745fac122 100644 --- a/src/ifmap/ifmap_xmpp_client_show.cc +++ b/src/ifmap/ifmap_xmpp_client_show.cc @@ -73,9 +73,9 @@ bool ShowIFMapXmppClientInfo::BufferStage(const Sandesh *sr, const RequestPipeline::PipeSpec ps, int stage, int instNum, RequestPipeline::InstData *data) { - const IFMapXmppClientInfoShowReq *request = + const IFMapXmppClientInfoShowReq *request = static_cast(ps.snhRequest_.get()); - IFMapSandeshContext *sctx = + IFMapSandeshContext *sctx = static_cast(request->module_context("IFMap")); IFMapServer* server = sctx->ifmap_server(); @@ -86,9 +86,9 @@ bool ShowIFMapXmppClientInfo::BufferStage(const Sandesh *sr, for (IFMapServer::ClientMap::iterator iter = client_map.begin(); iter != client_map.end(); ++iter) { - IFMapXmppClientInfo dest; + IFMapXmppClientInfo dest; IFMapClient *src = iter->second; - CopyNode(&dest, src); + CopyNode(&dest, src); show_data->send_buffer.push_back(dest); } @@ -101,7 +101,7 @@ bool ShowIFMapXmppClientInfo::SendStage(const Sandesh *sr, int stage, int instNum, RequestPipeline::InstData *data) { const RequestPipeline::StageData *prev_stage_data = ps.GetStageData(0); - const ShowIFMapXmppClientInfo::ShowData &show_data = + const ShowIFMapXmppClientInfo::ShowData &show_data = static_cast (prev_stage_data->at(0)); @@ -129,7 +129,7 @@ bool ShowIFMapXmppClientInfo::SendStage(const Sandesh *sr, } else { more = false; } - const IFMapXmppClientInfoShowReq *request = + const IFMapXmppClientInfoShowReq *request = static_cast(ps.snhRequest_.get()); IFMapXmppClientInfoShowResp *response = new IFMapXmppClientInfoShowResp(); response->set_client_stats(dest_buffer); diff --git a/src/ifmap/test/ifmap_client_mock.cc b/src/ifmap/test/ifmap_client_mock.cc index 35de52575e9..1889ef3abef 100644 --- a/src/ifmap/test/ifmap_client_mock.cc +++ b/src/ifmap/test/ifmap_client_mock.cc @@ -17,7 +17,7 @@ using pugi::xml_parse_result; IFMapClientMock::IFMapClientMock(const string &addr) : identifier_(addr), count_(0) { } - + const string &IFMapClientMock::identifier() const { return identifier_; } @@ -111,7 +111,7 @@ static pair NodeIdentifier(const xml_node &node) { string name = node.child("name").child_value(); return make_pair(type, name); } - + void IFMapClientMock::NodeParse(const xml_node &node, bool update) { string type, name; boost::tie(type, name) = NodeIdentifier(node); diff --git a/src/ifmap/test/ifmap_exporter_test.cc b/src/ifmap/test/ifmap_exporter_test.cc index 0504c94873b..9635d70f0de 100644 --- a/src/ifmap/test/ifmap_exporter_test.cc +++ b/src/ifmap/test/ifmap_exporter_test.cc @@ -59,7 +59,7 @@ class TestClient : public IFMapClient { class IFMapUpdateSenderMock : public IFMapUpdateSender { public: // Use the original server and its queue - IFMapUpdateSenderMock(IFMapServer *server) : + IFMapUpdateSenderMock(IFMapServer *server) : IFMapUpdateSender(server, server->queue()) { } virtual void QueueActive() { return; } @@ -263,9 +263,9 @@ TEST_F(IFMapExporterTest, Basic) { IFMapMsgLink("domain", "project", "user1", "vnc"); IFMapMsgLink("project", "virtual-network", "vnc", "blue"); IFMapMsgLink("project", "virtual-network", "vnc", "red"); - IFMapMsgLink("virtual-machine", "virtual-machine-interface", + IFMapMsgLink("virtual-machine", "virtual-machine-interface", "vm_x", "vm_x:veth0", "virtual-machine-interface-virtual-machine"); - IFMapMsgLink("virtual-machine-interface", "virtual-network", + IFMapMsgLink("virtual-machine-interface", "virtual-network", "vm_x:veth0", "blue"); task_util::WaitForIdle(); @@ -278,7 +278,7 @@ TEST_F(IFMapExporterTest, Basic) { IFMapMsgLink("virtual-router", "virtual-machine", "192.168.1.1", "vm_x"); task_util::WaitForIdle(); - + state = exporter_->NodeStateLookup(idn); ASSERT_TRUE(state != NULL); TASK_UTIL_EXPECT_FALSE(state->interest().empty()); @@ -537,13 +537,13 @@ TEST_F(IFMapExporterTest, NodeAddDependency) { server_->SetSender(new IFMapUpdateSenderMock(server_.get())); TestClient c1("192.168.1.1"); ClientSetup(&c1); - + IFMapMsgLink("domain", "project", "user1", "vnc"); IFMapMsgLink("project", "virtual-network", "vnc", "blue"); IFMapMsgLink("project", "virtual-network", "vnc", "red"); - IFMapMsgLink("virtual-machine", "virtual-machine-interface", + IFMapMsgLink("virtual-machine", "virtual-machine-interface", "vm_x", "vm_x:veth0", "virtual-machine-interface-virtual-machine"); - IFMapMsgLink("virtual-machine-interface", "virtual-network", + IFMapMsgLink("virtual-machine-interface", "virtual-network", "vm_x:veth0", "blue"); IFMapMsgLink("virtual-router", "virtual-machine", "192.168.1.1", "vm_x"); @@ -588,18 +588,18 @@ TEST_F(IFMapExporterTest, LinkDeleteDependency) { server_->SetSender(new IFMapUpdateSenderMock(server_.get())); TestClient c1("192.168.1.1"); ClientSetup(&c1); - + IFMapMsgLink("domain", "project", "user1", "vnc"); IFMapMsgLink("project", "virtual-network", "vnc", "blue"); IFMapMsgLink("project", "virtual-network", "vnc", "red"); - IFMapMsgLink("virtual-machine", "virtual-machine-interface", + IFMapMsgLink("virtual-machine", "virtual-machine-interface", "vm_x", "vm_x:veth0", "virtual-machine-interface-virtual-machine"); - IFMapMsgLink("virtual-machine-interface", "virtual-network", + IFMapMsgLink("virtual-machine-interface", "virtual-network", "vm_x:veth0", "blue"); - + IFMapMsgLink("virtual-router", "virtual-machine", "192.168.1.1", "vm_x"); task_util::WaitForIdle(); - + TASK_UTIL_ASSERT_TRUE(TableLookup("virtual-network", "blue") != NULL); IFMapNode *blue = TableLookup("virtual-network", "blue"); ASSERT_TRUE(blue != NULL); @@ -836,9 +836,9 @@ TEST_F(IFMapExporterTest, DISABLED_ChangePropertiesIncrementally) { IFMapMsgLink("domain", "project", "user1", "vnc"); IFMapMsgLink("project", "virtual-network", "vnc", "blue"); IFMapMsgLink("project", "virtual-network", "vnc", "red"); - IFMapMsgLink("virtual-machine", "virtual-machine-interface", + IFMapMsgLink("virtual-machine", "virtual-machine-interface", "vm_x", "vm_x:veth0", "virtual-machine-interface-virtual-machine"); - IFMapMsgLink("virtual-machine-interface", "virtual-network", + IFMapMsgLink("virtual-machine-interface", "virtual-network", "vm_x:veth0", "blue"); IFMapMsgLink("virtual-router", "virtual-machine", "vr-test", "vm_x"); task_util::WaitForIdle(); @@ -855,7 +855,7 @@ TEST_F(IFMapExporterTest, DISABLED_ChangePropertiesIncrementally) { IFMapState::crc32type crc0 = state->crc(); ProcessQueue(); EXPECT_TRUE(state->GetUpdate(IFMapListEntry::UPDATE) == NULL); - + // Add the 'id-perms' property autogen::IdPermsType *prop1 = new autogen::IdPermsType(); IFMapMsgNodeAdd("virtual-router", "vr-test", 1, "id-perms", prop1); diff --git a/src/ifmap/test/ifmap_graph_walker_test.cc b/src/ifmap/test/ifmap_graph_walker_test.cc index b62dd27958f..126b7b83fe4 100644 --- a/src/ifmap/test/ifmap_graph_walker_test.cc +++ b/src/ifmap/test/ifmap_graph_walker_test.cc @@ -38,7 +38,7 @@ class IFMapGraphWalkerTest : public ::testing::Test { thread_(&evm_), db_(TaskScheduler::GetInstance()->GetTaskId("db::IFMapTable")), server_(new IFMapServer(&db_, &db_graph_, evm_.io_service())), - config_client_manager_(new ConfigClientManager(&evm_, "localhost", + config_client_manager_(new ConfigClientManager(&evm_, "localhost", "config-test", config_options_)) { config_cassandra_client_ = dynamic_cast( config_client_manager_->config_db_client()); @@ -129,7 +129,7 @@ TEST_F(IFMapGraphWalkerTest, ToggleIpamLink) { "network-ipam"); TASK_UTIL_EXPECT_EQ(l_mid, r_mid); TASK_UTIL_EXPECT_NE(0, right.size()); - + #if 0 ifmap_test_util::IFMapMsgUnlink(&db_, "virtual-network", left, "network-ipam", right, @@ -141,7 +141,7 @@ TEST_F(IFMapGraphWalkerTest, ToggleIpamLink) { ifmap_test_util::IFMapMsgLink(&db_, "virtual-network", left, "network-ipam", right, "virtual-network-network-ipam"); - + task_util::WaitForIdle(); TASK_UTIL_EXPECT_EQ(1, c1.object_map().count("network-ipam")); // virtual-network-network-ipam is a LinkAttr. There are 2 nodes and @@ -154,7 +154,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn1Vm3Add) { ParseEventsJson("controller/src/ifmap/testdata/cli1_vn1_vm3_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -171,7 +171,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn1Vm3Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); task_util::WaitForIdle(); @@ -194,7 +194,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Vm2Add) { ParseEventsJson("controller/src/ifmap/testdata/cli2_vn2_vm2_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -205,7 +205,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Vm2Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); server_->ProcessVmSubscribe( @@ -252,7 +252,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn2Np2Add) { ParseEventsJson("controller/src/ifmap/testdata/cli1_vn2_np2_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -266,7 +266,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn2Np2Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); task_util::WaitForIdle(); @@ -303,7 +303,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn2Np1Add) { ParseEventsJson("controller/src/ifmap/testdata/cli1_vn2_np1_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -317,7 +317,7 @@ TEST_F(IFMapGraphWalkerTest, Cli1Vn2Np1Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); task_util::WaitForIdle(); @@ -354,7 +354,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Np2Add) { ParseEventsJson("controller/src/ifmap/testdata/cli2_vn2_np2_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -365,7 +365,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Np2Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); server_->ProcessVmSubscribe( @@ -390,7 +390,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Np2Add) { TASK_UTIL_EXPECT_FALSE(c1.LinkExists("virtual-network", "virtual-network-network-policy", "default-domain:demo:vn27", "attr(default-domain:demo:27to28tcp,default-domain:demo:vn27)")); - TASK_UTIL_EXPECT_EQ(c1.LinkKeyCount("virtual-network", + TASK_UTIL_EXPECT_EQ(c1.LinkKeyCount("virtual-network", "virtual-network-network-policy"), 0); TASK_UTIL_EXPECT_TRUE(c2.NodeExists("virtual-network", @@ -407,7 +407,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn2Np2Add) { TASK_UTIL_EXPECT_FALSE(c2.LinkExists("virtual-network", "virtual-network-network-policy", "default-domain:demo:vn28", "attr(default-domain:demo:28to27udp,default-domain:demo:vn28)")); - TASK_UTIL_EXPECT_EQ(c2.LinkKeyCount("virtual-network", + TASK_UTIL_EXPECT_EQ(c2.LinkKeyCount("virtual-network", "virtual-network-network-policy"), 0); // Since network-policy and virtual-network-network-policy is not downloaded @@ -426,7 +426,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn3Vm6Np2Add) { ParseEventsJson("controller/src/ifmap/testdata/cli2_vn3_vm6_np2_add.json"); FeedEventsJson(); - IFMapClientMock + IFMapClientMock c1("default-global-system-config:a1s27.contrail.juniper.net"); server_->AddClient(&c1); server_->ProcessVmSubscribe( @@ -446,7 +446,7 @@ TEST_F(IFMapGraphWalkerTest, Cli2Vn3Vm6Np2Add) { TASK_UTIL_EXPECT_NE(0, c1.node_count()); TASK_UTIL_EXPECT_NE(0, c1.link_count()); - IFMapClientMock + IFMapClientMock c2("default-global-system-config:a1s28.contrail.juniper.net"); server_->AddClient(&c2); server_->ProcessVmSubscribe( @@ -514,7 +514,7 @@ TEST_F(IFMapGraphWalkerTest, ConfigVrsub) { FeedEventsJson(); task_util::WaitForIdle(); - // VR-reg + // VR-reg IFMapClientMock c1("gsc1:vr1"); server_->AddClient(&c1); task_util::WaitForIdle(); @@ -535,7 +535,7 @@ TEST_F(IFMapGraphWalkerTest, ConfigVrsub) { // Receive VR-subscribe and then config TEST_F(IFMapGraphWalkerTest, VrsubConfig) { - // VR-reg + // VR-reg IFMapClientMock c1("gsc1:vr1"); server_->AddClient(&c1); task_util::WaitForIdle(); diff --git a/src/ifmap/test/ifmap_server_table_test.cc b/src/ifmap/test/ifmap_server_table_test.cc index b55d302514a..43e80745765 100644 --- a/src/ifmap/test/ifmap_server_table_test.cc +++ b/src/ifmap/test/ifmap_server_table_test.cc @@ -401,7 +401,7 @@ TEST_F(IFMapServerTableTest, CreateDelete) { EXPECT_EQ(0, TableCount(tbl)); tbl = IFMapTable::FindTable(&db_, "virtual-network"); - EXPECT_EQ(0, TableCount(tbl)); + EXPECT_EQ(0, TableCount(tbl)); } TEST_F(IFMapServerTableTest, Traversal) { @@ -429,7 +429,7 @@ TEST_F(IFMapServerTableTest, Traversal) { ASSERT_TRUE(vs1 != NULL); graph_visitor visitor; - + graph_.Visit(vs1, boost::bind(&graph_visitor::Visit, &visitor, _1), 0); EXPECT_EQ(5, visitor.count); @@ -443,7 +443,7 @@ TEST_F(IFMapServerTableTest, Traversal) { IFMapTypenameFilter criteria; criteria.exclude_vertex = list_of ("tenant"); - criteria.exclude_edge = map_list_of > + criteria.exclude_edge = map_list_of > ("virtual-network", list_of("virtual-network-virtual-machine")); LOG(DEBUG, "filtered visit 1"); @@ -459,7 +459,7 @@ TEST_F(IFMapServerTableTest, Traversal) { graph_visitor f2; graph_.Visit(vs1, boost::bind(&graph_visitor::Visit, &f2, _1), 0, criteria); EXPECT_EQ(5, f2.count); - + IFMapMsgUnlink("virtual-network", "virtual-machine", "vn2", "vm1"); Wait(); diff --git a/src/ifmap/test/ifmap_test_util_server.cc b/src/ifmap/test/ifmap_test_util_server.cc index 14819cd068c..cc7d84410fb 100644 --- a/src/ifmap/test/ifmap_test_util_server.cc +++ b/src/ifmap/test/ifmap_test_util_server.cc @@ -49,7 +49,7 @@ void IFMapMsgUnlink(DB *db, const string &lhs, const string &lid, } void IFMapNodeCommon(IFMapTable *table, DBRequest *request, const string &type, - const string &id, uint64_t sequence_number, + const string &id, uint64_t sequence_number, const string &metadata, AutogenProperty *content) { IFMapTable::RequestKey *key = new IFMapTable::RequestKey(); request->key.reset(key); diff --git a/src/ifmap/test/ifmap_update_queue_test.cc b/src/ifmap/test/ifmap_update_queue_test.cc index 0841e976d8c..6192f7008ed 100644 --- a/src/ifmap/test/ifmap_update_queue_test.cc +++ b/src/ifmap/test/ifmap_update_queue_test.cc @@ -71,7 +71,7 @@ TEST_F(IFMapUpdateQueueTest, Basic) { IFMapUpdate *u3 = CreateUpdate(n3.get()); IFMapUpdate *u4 = CreateUpdate(n4.get()); - queue_->Join(1); // client 1 + queue_->Join(1); // client 1 queue_->Join(2); // client 2 queue_->Join(3); // client 3 queue_->Join(5); // client 5 @@ -114,7 +114,7 @@ TEST_F(IFMapUpdateQueueTest, Basic) { EXPECT_EQ(queue_->tail_marker()->get_sequence(), 1); rem_bs.Reset(rem_bs); ASSERT_TRUE(rem_bs.empty()); - + // Insert marker for client 3 after u3 marker = queue_->GetMarker(3); ASSERT_TRUE(marker != NULL); @@ -186,7 +186,7 @@ TEST_F(IFMapUpdateQueueTest, Basic) { // Should print only the tail_marker_ queue_->PrintQueue(); - queue_->Leave(1); // client 1 + queue_->Leave(1); // client 1 queue_->Leave(2); // client 2 queue_->Leave(3); // client 3 queue_->Leave(5); // client 5 diff --git a/src/ifmap/test/ifmap_update_sender_test.cc b/src/ifmap/test/ifmap_update_sender_test.cc index a1a607dd00d..53383cfcdec 100644 --- a/src/ifmap/test/ifmap_update_sender_test.cc +++ b/src/ifmap/test/ifmap_update_sender_test.cc @@ -517,7 +517,7 @@ TEST_F(IFMapUpdateSenderTest, MarkerMergeTest) { queue_->tail_marker()); TASK_UTIL_EXPECT_TRUE(queue_->GetMarker(c2.index()) == queue_->tail_marker()); - + // Move marker for c2 (tail_marker) after u3 marker = queue_->GetMarker(c2.index()); ASSERT_TRUE(marker != NULL); @@ -1054,7 +1054,7 @@ TEST_F(IFMapUpdateSenderTest, MarkerMergeTest2) { TASK_UTIL_EXPECT_EQ(8, queue_->size()); // same as before, just moving TM TASK_UTIL_EXPECT_TRUE(queue_->GetMarker(c3.index()) == queue_->tail_marker()); - + queue_->PrintQueue(); // c0/c2 will block after sending one node. c1/c3 will not block diff --git a/src/ifmap/test/ifmap_xmpp_client_mock.cc b/src/ifmap/test/ifmap_xmpp_client_mock.cc index 1ec4ed5ca7e..e8e41f2c99f 100644 --- a/src/ifmap/test/ifmap_xmpp_client_mock.cc +++ b/src/ifmap/test/ifmap_xmpp_client_mock.cc @@ -47,7 +47,7 @@ IFMapXmppClientMock::~IFMapXmppClientMock() { void IFMapXmppClientMock::RegisterWithXmpp() { XmppChannel *xmpp_channel = FindChannel(xmpp_server_name_); assert(xmpp_channel); - xmpp_channel->RegisterReceive(xmps::CONFIG, + xmpp_channel->RegisterReceive(xmps::CONFIG, boost::bind(&IFMapXmppClientMock::ReceiveUpdate, this, _1)); } @@ -60,7 +60,7 @@ void IFMapXmppClientMock::UnRegisterWithXmpp() { bool IFMapXmppClientMock::IsEstablished() { XmppConnection *xmpp_connection = FindConnection(xmpp_server_name_); if (xmpp_connection) { - return (xmpp_connection->GetStateMcState() == xmsm::ESTABLISHED); + return (xmpp_connection->GetStateMcState() == xmsm::ESTABLISHED); } return false; } @@ -240,7 +240,7 @@ bool IFMapXmppClientMock::OutputFileCompare(string master_file_path) { if (set1 == set2) { return true; } else { - cout << "Error: File compare mismatch. set1 is " + cout << "Error: File compare mismatch. set1 is " << set1.size() << " set2 is " << set2.size() << endl; return false; } diff --git a/src/ifmap/test/ifmap_xmpp_test.cc b/src/ifmap/test/ifmap_xmpp_test.cc index aaa0b74efb5..9eaddacdfae 100644 --- a/src/ifmap/test/ifmap_xmpp_test.cc +++ b/src/ifmap/test/ifmap_xmpp_test.cc @@ -206,7 +206,7 @@ class XmppIfmapTest : public ::testing::Test { TimerImpl timer(*evm_.io_service()); boost::system::error_code ec; timer.expires_from_now(timeout * 1000, ec); - timer.async_wait(boost::bind(&XmppIfmapTest::on_timeout, + timer.async_wait(boost::bind(&XmppIfmapTest::on_timeout, boost::asio::placeholders::error, &is_expired)); while (!is_expired) { evm_.RunOnce(); @@ -383,7 +383,7 @@ static bool ServerIsEstablished(XmppServer *server, const string &client_name) { if (connection == NULL) { return false; } - return (connection->GetStateMcState() == xmsm::ESTABLISHED); + return (connection->GetStateMcState() == xmsm::ESTABLISHED); } bool IsIFMapClientUnregistered(IFMapServer *ifmap_server, @@ -523,7 +523,7 @@ TEST_F(XmppIfmapTest, CheckClientGraphCleanupTest) { ///////////////////////////////////////////////////////// // repeat the whole thing by creating one more connection ///////////////////////////////////////////////////////// - + // create the mock client filename = "/tmp/" + GetUserName() + "_graph_cleanup_2.output"; vnsw_client = @@ -2387,7 +2387,7 @@ TEST_F(XmppIfmapTest, Reg_CfgAdd_CfgDel_Unreg) { vnsw_client->SendConfigSubscribe(); TASK_UTIL_EXPECT_TRUE(ifmap_server_.FindClient(client_name) != NULL); - // Allow sender to run + // Allow sender to run usleep(1000); IFMapClient *client = ifmap_server_.FindClient(client_name); EXPECT_TRUE(client != NULL); @@ -2570,7 +2570,7 @@ TEST_F(XmppIfmapTest, Reg_CfgAdd_Unreg_CfgDel) { vnsw_client->SendConfigSubscribe(); TASK_UTIL_EXPECT_TRUE(ifmap_server_.FindClient(client_name) != NULL); - // Allow sender to run + // Allow sender to run usleep(1000); IFMapClient *client = ifmap_server_.FindClient(client_name); EXPECT_TRUE(client != NULL); @@ -2742,7 +2742,7 @@ TEST_F(XmppIfmapTest, Reg_CfgAdd_Unreg_Close) { vnsw_client->SendConfigSubscribe(); TASK_UTIL_EXPECT_TRUE(ifmap_server_.FindClient(client_name) != NULL); - // Allow sender to run + // Allow sender to run usleep(1000); IFMapClient *client = ifmap_server_.FindClient(client_name); EXPECT_TRUE(client != NULL); @@ -2934,7 +2934,7 @@ TEST_F(XmppIfmapTest, CheckIFMapObjectSeqInList) { vnsw_client->SendConfigSubscribe(); TASK_UTIL_EXPECT_TRUE(ifmap_server_.FindClient(client_name) != NULL); - // Allow sender to run + // Allow sender to run usleep(1000); IFMapClient *client = ifmap_server_.FindClient(client_name); EXPECT_TRUE(client != NULL); @@ -3067,7 +3067,7 @@ TEST_F(XmppIfmapTest, CheckIFMapObjectSeqInList) { vm_uuid_mapper_->PrintAllNodeUuidMappedEntries(); // New cycle - the nodes do not exist right now - + // Read from config first FeedEventsJson(); // "controller/src/ifmap/testdata/vr_3vm_add.xml" @@ -3100,7 +3100,7 @@ TEST_F(XmppIfmapTest, CheckIFMapObjectSeqInList) { vm_uuid_mapper_->PrintAllUuidMapperEntries(); vm_uuid_mapper_->PrintAllNodeUuidMappedEntries(); - // Add the vm-sub + // Add the vm-sub vnsw_client->SendVmConfigSubscribe("2d308482-c7b3-4e05-af14-e732b7b50117"); usleep(1000); @@ -3265,7 +3265,7 @@ TEST_F(XmppIfmapTest, Bug788) { TASK_UTIL_EXPECT_EQ(vnsw_client->Count(), 3); // Simulate the condition where we get a link delete. Exporter has finished - // processing it and before the sender sends the update, we process a + // processing it and before the sender sends the update, we process a // client-delete EXPECT_EQ(ifmap_server_.GetClientMapSize(), 1); EXPECT_EQ(ifmap_server_.GetIndexMapSize(), 1); diff --git a/src/ksync/ksync_entry.h b/src/ksync/ksync_entry.h index 3b74ed200ec..eb385c0a769 100644 --- a/src/ksync/ksync_entry.h +++ b/src/ksync/ksync_entry.h @@ -2,8 +2,8 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -#ifndef ctrlplane_ksync_entry_h -#define ctrlplane_ksync_entry_h +#ifndef ctrlplane_ksync_entry_h +#define ctrlplane_ksync_entry_h #include #include @@ -101,24 +101,24 @@ class KSyncEntry { // Convert KSync to String virtual std::string ToString() const = 0; - // Create handler. + // Create handler. // Return true if operation is complete // Return false if operation asynchronously virtual bool Add() = 0; - // Change handler. + // Change handler. // Return true if operation is complete // Return false if operation asynchronously virtual bool Change() = 0; - // Delete handler. + // Delete handler. // Return true if operation is complete // Return false if operation asynchronously virtual bool Delete() = 0; // KSyncObject for this entry. Used to release the index virtual KSyncObject *GetObject() const = 0; - // Get an unresolved reference. + // Get an unresolved reference. // This entry will be added into resolveq_ of unresolved-entry virtual KSyncEntry *UnresolvedReference() = 0; virtual bool ShouldReEvalBackReference() const { return true; } @@ -155,7 +155,7 @@ class KSyncEntry { size_t GetIndex() const {return index_;}; KSyncState GetState() const {return state_;}; bool del_add_pending() const {return del_add_pending_;} - uint32_t GetRefCount() const {return refcount_;} + uint32_t GetRefCount() const {return refcount_;} bool Seen() const {return seen_;} bool stale() const {return stale_;} void SetSeen() {seen_ = true;} @@ -201,7 +201,7 @@ class KSyncEntry { // Implementation of KSyncEntry with with DBTable. Must be used along // with KSyncDBObject. -// Registers with DBTable and drives state-machine based on DBTable +// Registers with DBTable and drives state-machine based on DBTable // notifications // Applications are not needed to generate any events to the state-machine class KSyncDBEntry : public KSyncEntry, public DBState { @@ -227,4 +227,4 @@ class KSyncDBEntry : public KSyncEntry, public DBState { DISALLOW_COPY_AND_ASSIGN(KSyncDBEntry); }; -#endif // ctrlplane_ksync_entry_h +#endif // ctrlplane_ksync_entry_h diff --git a/src/ksync/ksync_index.h b/src/ksync/ksync_index.h index c59d176ffbb..35aeb785219 100644 --- a/src/ksync/ksync_index.h +++ b/src/ksync/ksync_index.h @@ -2,8 +2,8 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -#ifndef ctrlplane_ksync_index_table_h -#define ctrlplane_ksync_index_table_h +#ifndef ctrlplane_ksync_index_table_h +#define ctrlplane_ksync_index_table_h #include diff --git a/src/ksync/ksync_netlink.cc b/src/ksync/ksync_netlink.cc index d234d3a4266..2fdfff2ed34 100644 --- a/src/ksync/ksync_netlink.cc +++ b/src/ksync/ksync_netlink.cc @@ -83,7 +83,7 @@ bool KSyncNetlinkEntry::Delete() { bool KSyncNetlinkDBEntry::Add() { int len = MsgLen(); char *msg = (char *)malloc(len); - int msg_len = AddMsg(msg, len); + int msg_len = AddMsg(msg, len); assert(msg_len <= len); if (msg_len == 0) { free(msg); diff --git a/src/ksync/ksync_object.cc b/src/ksync/ksync_object.cc index 1045d1146c1..e1c133b4fe7 100644 --- a/src/ksync/ksync_object.cc +++ b/src/ksync/ksync_object.cc @@ -269,7 +269,7 @@ void KSyncObject::Free(KSyncEntry *entry) { delete entry; } -void KSyncObject::SafeNotifyEvent(KSyncEntry *entry, +void KSyncObject::SafeNotifyEvent(KSyncEntry *entry, KSyncEntry::KSyncEvent event) { tbb::recursive_mutex::scoped_lock lock(lock_); NotifyEvent(entry, event); @@ -702,13 +702,13 @@ void intrusive_ptr_release(KSyncEntry *p) { // ADD_DEFER : Object deferred since it has some unmet constraints. // Ex: Obj-A refers to Obj-B. Obj-B is not yet added to kernel. // Obj-A will get to ADD_DEFER state -// Obj-A goes into BackRefTree for Obj-B. +// Obj-A goes into BackRefTree for Obj-B. // Creation of Obj-B will take Obj-A out of this state -// CHANGE_DEFER : Object already added to kernel, subsequent change deferred +// CHANGE_DEFER : Object already added to kernel, subsequent change deferred // since it has some unmet constraints. // Ex: Obj-A refers to Obj-B. Obj-B is not yet added to kernel. // Obj-A will get to ADD_DEFER state -// Obj-A goes into BackRefTree for Obj-B. +// Obj-A goes into BackRefTree for Obj-B. // Add of Obj-B will take Obj-A out of this state // IN_SYNC : Object in-sync with kernel // SYNC_WAIT : Add or Change sent to kernel. Waiting for ACK from Kernel @@ -724,9 +724,9 @@ void intrusive_ptr_release(KSyncEntry *p) { // Can get renewed if there is request to ADD in this case // RENEW_WAIT : Object being renewed. Waiting for ACK of delete to renew the // object -// FREE_WAIT : Object marked to be freed at the end of this function call. +// FREE_WAIT : Object marked to be freed at the end of this function call. // Can only be a temporary state -// +// // Brief description of Events: // ADD_CHANGE_REQ : Request to Add or Change an entry // ADD_ACK, : Ack from kernel for ADD request @@ -734,7 +734,7 @@ void intrusive_ptr_release(KSyncEntry *p) { // DEL_REQ : Request to DEL an entry // DEL_ADD_REQ : Request to DEL an entry followed by ADD for the same // DEL_ACK : Ack from kernel for DEL request -// RE_EVAL : Event to re-evaluate dependencies. +// RE_EVAL : Event to re-evaluate dependencies. // Ex: If Obj-A is added into Obj-B back-ref tree // When Obj-B is created, RE_EVAL is sent to Obj-A /////////////////////////////////////////////////////////////////////////////// @@ -776,9 +776,9 @@ KSyncEntry::KSyncState KSyncSM_Change(KSyncObject *obj, KSyncEntry *entry) { // Utility function to handle Delete of KSyncEntry. // If there are more references to the object, then move it to DEL_DEFER -// state. Object will be deleted when all references drop. If object is +// state. Object will be deleted when all references drop. If object is // still not seen by Kernel yet we don't have to delete it. -// +// // If operation is complete, move state to IN_SYNC. Else move to SYNC_WAIT KSyncEntry::KSyncState KSyncSM_Delete(KSyncEntry *entry) { if (entry->GetRefCount() > 1) { @@ -799,7 +799,7 @@ KSyncEntry::KSyncState KSyncSM_Delete(KSyncEntry *entry) { // Utility function to handle Delete followed by ADD of KSyncEntry. // delete is triggered irrespective of the references to the object // followed by ADD of the object -// +// // If operation is complete, move state to IN_SYNC. Else move to SYNC_WAIT KSyncEntry::KSyncState KSyncSM_DeleteAdd(KSyncObject *obj, KSyncEntry *entry) { // DeleteAdd operation is not supported/defined for stale entries @@ -821,12 +821,12 @@ KSyncEntry::KSyncState KSyncSM_DeleteAdd(KSyncObject *obj, KSyncEntry *entry) { // // -// ADD_CHANGE_REQ : +// ADD_CHANGE_REQ : // If entry has unresolved references, move it to ADD_DEFER // Else, send ADD message and move to SYNC_WAIT state // // No other events are expected in this state -KSyncEntry::KSyncState KSyncSM_Init(KSyncObject *obj, KSyncEntry *entry, +KSyncEntry::KSyncState KSyncSM_Init(KSyncObject *obj, KSyncEntry *entry, KSyncEntry::KSyncEvent event) { KSyncEntry::KSyncState state = KSyncEntry::INIT; @@ -844,7 +844,7 @@ KSyncEntry::KSyncState KSyncSM_Init(KSyncObject *obj, KSyncEntry *entry, return state; } -// ADD_CHANGE_REQ : +// ADD_CHANGE_REQ : // ADD_CHANGE_REQ event for an entry in TEMP state. // If entry has unresolved references, move it to ADD_DEFER // Else, send ADD message and move to SYNC_WAIT state @@ -852,7 +852,7 @@ KSyncEntry::KSyncState KSyncSM_Init(KSyncObject *obj, KSyncEntry *entry, // DEL_REQ : // DEL_REQ event for an entry in TEMP state. Can happen only when reference // for the TEMP entry is dropped -// +// // Explicit DEL_REQ event is not expected. This is enforced by checking // ref-count // @@ -886,9 +886,9 @@ KSyncEntry::KSyncState KSyncSM_Temp(KSyncObject *obj, KSyncEntry *entry, return state; } -// ADD_CHANGE_REQ : +// ADD_CHANGE_REQ : // ADD_CHANGE_REQ event for an entry in ADD_DEFER state. -// Remove the old dependency constraint. +// Remove the old dependency constraint. // Re-evaluate to see if there are any further unmet dependencies // // RE_EVAL: @@ -943,11 +943,11 @@ KSyncEntry::KSyncState KSyncSM_AddDefer(KSyncObject *obj, KSyncEntry *entry, return state; } -// ADD_CHANGE_REQ : +// ADD_CHANGE_REQ : // ADD_CHANGE_REQ event for an entry in CHANGE_DEFER state. -// Remove the old dependency constraint. +// Remove the old dependency constraint. // Re-evaluate to see if there are any further unmet dependencies -// +// // RE_EVAL: // Triggred from back-ref tree when KSyncEntry waited on is added to Kernel // Entry would already be removed from backref tree @@ -992,7 +992,7 @@ KSyncEntry::KSyncState KSyncSM_ChangeDefer(KSyncObject *obj, KSyncEntry *entry, // Object state IN-SYNC with kernel // -// ADD_CHANGE_REQ : +// ADD_CHANGE_REQ : // Invoke Change on the object // // DEL_REQ : @@ -1494,7 +1494,7 @@ void KSyncObject::BackRefReEval(KSyncEntry *key) { std::vector buf; KSyncBackReference node(key, NULL); - for (BackRefTree::iterator it = back_ref_tree_.upper_bound(node); + for (BackRefTree::iterator it = back_ref_tree_.upper_bound(node); it != back_ref_tree_.end(); ) { BackRefTree::iterator it_work = it; @@ -1581,7 +1581,7 @@ void KSyncObjectManager::Enqueue(KSyncObjectEvent *event) { } void KSyncObjectManager::Unregister(KSyncObject *table) { - KSyncObjectEvent *event = new KSyncObjectEvent(table, + KSyncObjectEvent *event = new KSyncObjectEvent(table, KSyncObjectEvent::UNREGISTER); singleton_->Enqueue(event); } diff --git a/src/ksync/ksync_object.h b/src/ksync/ksync_object.h index be64f17aee3..e610808626c 100644 --- a/src/ksync/ksync_object.h +++ b/src/ksync/ksync_object.h @@ -2,8 +2,8 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -#ifndef ctrlplane_ksync_object_h -#define ctrlplane_ksync_object_h +#ifndef ctrlplane_ksync_object_h +#define ctrlplane_ksync_object_h #include #include @@ -19,21 +19,21 @@ // -------------- // An entry of type means that key-entry is // waiting for back-ref-entry to be added to kernel. -// Note, there can be more than one key-entry waiting on a single +// Note, there can be more than one key-entry waiting on a single // back-ref-entry. However, a key-entry can be waiting on only one // back-ref-entry at a time. // // This is a dynamic tree. Entries are added only when constraints are not // met. Entries will not be in tree when constraints are met. // -// Fwd-Ref tree: +// Fwd-Ref tree: // ------------- // Holds forward reference information. If Object-A is waiting on Object-B // Fwd-Ref tree will have an entry with Object-A as key and Object-B as data. ///////////////////////////////////////////////////////////////////////////// struct KSyncFwdReference { - KSyncFwdReference(KSyncEntry *key, KSyncEntry *ref) : key_(key), + KSyncFwdReference(KSyncEntry *key, KSyncEntry *ref) : key_(key), reference_(ref) { }; bool operator<(const KSyncFwdReference &rhs) const { @@ -46,7 +46,7 @@ struct KSyncFwdReference { }; struct KSyncBackReference { - KSyncBackReference(KSyncEntry *key, KSyncEntry *ref) : + KSyncBackReference(KSyncEntry *key, KSyncEntry *ref) : key_(key), back_reference_(ref) { }; bool operator<(const KSyncBackReference &rhs) const { @@ -55,7 +55,7 @@ struct KSyncBackReference { if (key_ > rhs.key_) return false; - + if (back_reference_ < rhs.back_reference_) return true; @@ -135,7 +135,7 @@ class KSyncObject { //Callback when all the entries in table are deleted virtual void EmptyTable(void) { }; - bool IsEmpty(void) { return tree_.empty(); }; + bool IsEmpty(void) { return tree_.empty(); }; virtual bool DoEventTrace(void) { return true; } virtual void PreFree(KSyncEntry *entry) { } @@ -165,7 +165,7 @@ class KSyncObject { friend class KSyncEntry; friend void TestTriggerStaleEntryCleanupCb(KSyncObject *obj); - // Free indication of an KSyncElement. + // Free indication of an KSyncElement. // Removes from tree and free index if allocated earlier void FreeInd(KSyncEntry *entry, uint32_t index); void NetlinkAckInternal(KSyncEntry *entry, KSyncEntry::KSyncEvent event); @@ -306,4 +306,4 @@ do {\ KSync##obj::TraceMsg(parent->GetKSyncTraceBuf(), __FILE__, __LINE__, ##__VA_ARGS__);\ } while (false);\ -#endif // ctrlplane_ksync_object_h +#endif // ctrlplane_ksync_object_h diff --git a/src/ksync/ksync_sock.cc b/src/ksync/ksync_sock.cc index c216308c2d2..dd8bbcbc6e5 100644 --- a/src/ksync/ksync_sock.cc +++ b/src/ksync/ksync_sock.cc @@ -50,7 +50,7 @@ pid_t KSyncSock::pid_; tbb::atomic KSyncSock::shutdown_; // Name of task used in KSync Response work-queues -const char* IoContext::io_wq_names[IoContext::MAX_WORK_QUEUES] = +const char* IoContext::io_wq_names[IoContext::MAX_WORK_QUEUES] = { "Agent::Uve", "Agent::KSync" @@ -358,7 +358,7 @@ bool KSyncSock::ValidateAndEnqueue(char *data, KSyncBulkMsgContext *context) { void KSyncSock::ReadHandler(const boost::system::error_code& error, size_t bytes_transferred) { if (error) { - LOG(ERROR, "Error reading from Ksync sock. Error : " << + LOG(ERROR, "Error reading from Ksync sock. Error : " << boost::system::system_error(error).what()); if (shutdown_ == false) { assert(0); @@ -422,7 +422,7 @@ bool KSyncSock::BlockingRecv() { // Use non-bulk version of decoder Decoder(data, ctxt); if (ctxt->GetErrno() != 0 && ctxt->GetErrno() != EEXIST) { - KSYNC_ERROR(VRouterError, "VRouter operation failed. Error <", + KSYNC_ERROR(VRouterError, "VRouter operation failed. Error <", ctxt->GetErrno(), ":", KSyncEntry::VrouterErrorToString(ctxt->GetErrno()), ">. Object <", "N/A", ">. State <", "N/A", @@ -792,7 +792,7 @@ void KSyncSockNetlink::Receive(mutable_buffers_1 buf) { sock_.receive(buf); struct nlmsghdr *nlh = buffer_cast(buf); if (nlh->nlmsg_type == NLMSG_ERROR) { - LOG(ERROR, "Netlink error for seqno " << nlh->nlmsg_seq + LOG(ERROR, "Netlink error for seqno " << nlh->nlmsg_seq << " len " << nlh->nlmsg_len); assert(0); } @@ -1108,7 +1108,7 @@ struct IoContextDisposer { }; KSyncBulkMsgContext::~KSyncBulkMsgContext() { - assert(vr_response_count_ == io_context_list_.size()); + assert(vr_response_count_ == io_context_list_.size()); io_context_list_.clear_and_dispose(IoContextDisposer()); for (uint32_t i = 0; i < rx_buffer_index_; i++) { delete[] rx_buffers_[i]; diff --git a/src/ksync/ksync_sock.h b/src/ksync/ksync_sock.h index 61d4a4316f8..ca195f8881f 100644 --- a/src/ksync/ksync_sock.h +++ b/src/ksync/ksync_sock.h @@ -2,8 +2,8 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -#ifndef ctrlplane_ksync_sock_h -#define ctrlplane_ksync_sock_h +#ifndef ctrlplane_ksync_sock_h +#define ctrlplane_ksync_sock_h #include #include @@ -50,7 +50,7 @@ void UpdateNetlink(nl_client *client, uint32_t len, uint32_t seq_no); void DecodeSandeshMessages(char *buf, uint32_t buf_len, SandeshContext *sandesh_context, uint32_t alignment); -/* Base class to hold sandesh context information which is passed to +/* Base class to hold sandesh context information which is passed to * Sandesh decode */ class AgentSandeshContext : public SandeshContext { @@ -87,7 +87,7 @@ class AgentSandeshContext : public SandeshContext { }; -/* Base class for context management. Used while sending and +/* Base class for context management. Used while sending and * receiving data via ksync socket */ class IoContext { @@ -108,17 +108,17 @@ class IoContext { sandesh_context_(NULL), msg_(NULL), msg_len_(0), seqno_(0), type_(IOC_KSYNC), index_(0), rx_buffer1_(NULL), rx_buffer2_(NULL) { } - IoContext(char *msg, uint32_t len, uint32_t seq, AgentSandeshContext *ctx, + IoContext(char *msg, uint32_t len, uint32_t seq, AgentSandeshContext *ctx, Type type) : sandesh_context_(ctx), msg_(msg), msg_len_(len), seqno_(seq), type_(type), index_(0), rx_buffer1_(NULL), rx_buffer2_(NULL) { } - IoContext(char *msg, uint32_t len, uint32_t seq, AgentSandeshContext *ctx, + IoContext(char *msg, uint32_t len, uint32_t seq, AgentSandeshContext *ctx, Type type, uint32_t index) : sandesh_context_(ctx), msg_(msg), msg_len_(len), seqno_(seq), type_(type), index_(index), rx_buffer1_(NULL), rx_buffer2_(NULL) { } - virtual ~IoContext() { + virtual ~IoContext() { if (msg_ != NULL) free(msg_); assert(rx_buffer1_ == NULL); @@ -394,7 +394,7 @@ class KSyncSock { return ksync_rx_queue[index]; } // Allocate a recieve work-queue - + KSyncReceiveQueue *AllocQueue(KSyncBulkSandeshContext ctxt[], uint32_t task_id, uint32_t instance, const char *name); diff --git a/src/ksync/ksync_sock_user.cc b/src/ksync/ksync_sock_user.cc index 59d9be3da60..b99214f45ad 100644 --- a/src/ksync/ksync_sock_user.cc +++ b/src/ksync/ksync_sock_user.cc @@ -57,7 +57,7 @@ void KSyncSockTypeMap::AddNetlinkTxBuff(struct nl_client *cl) { //process sandesh messages that are being sent from the agent //this is used to store a local copy of what is being send to kernel //Also handles bulk request messages. -void KSyncSockTypeMap::ProcessSandesh(const uint8_t *parse_buf, size_t buf_len, +void KSyncSockTypeMap::ProcessSandesh(const uint8_t *parse_buf, size_t buf_len, KSyncUserSockContext *ctx) { int decode_len; uint8_t *decode_buf; @@ -104,7 +104,7 @@ void KSyncSockTypeMap::PurgeTxBuffer() { count++; } - // If there are more than one NETLINK messages, we need to add + // If there are more than one NETLINK messages, we need to add struct nlmsghdr nlh; if (count > 1) { //Send Netlink-Done message NLMSG_DONE at end @@ -463,7 +463,7 @@ void KSyncSockTypeMap::VxlanDelete(int id) { } } -void KSyncSockTypeMap::IfStatsUpdate(int idx, int ibytes, int ipkts, int ierrors, +void KSyncSockTypeMap::IfStatsUpdate(int idx, int ibytes, int ipkts, int ierrors, int obytes, int opkts, int oerrors) { KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); vr_interface_req req = sock->if_map[idx]; @@ -476,7 +476,7 @@ void KSyncSockTypeMap::IfStatsUpdate(int idx, int ibytes, int ipkts, int ierrors sock->if_map[idx] = req; } -void KSyncSockTypeMap::IfStatsSet(int idx, int ibytes, int ipkts, int ierrors, +void KSyncSockTypeMap::IfStatsSet(int idx, int ibytes, int ipkts, int ierrors, int obytes, int opkts, int oerrors) { KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); vr_interface_req req = sock->if_map[idx]; @@ -513,7 +513,7 @@ int KSyncSockTypeMap::VxLanCount() { KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); return sock->vxlan_map.size(); } - + uint32_t KSyncSockTypeMap::GetSeqno(char *data) { struct nlmsghdr *nlh = (struct nlmsghdr *)data; return nlh->nlmsg_seq; @@ -539,7 +539,7 @@ bool KSyncSockTypeMap::Decoder(char *data, AgentSandeshContext *context) { bool KSyncSockTypeMap::Validate(char *data) { struct nlmsghdr *nlh = (struct nlmsghdr *)data; if (nlh->nlmsg_type == NLMSG_ERROR) { - LOG(ERROR, "Ignoring Netlink error for seqno " << nlh->nlmsg_seq + LOG(ERROR, "Ignoring Netlink error for seqno " << nlh->nlmsg_seq << " len " << nlh->nlmsg_len); assert(0); return true; @@ -814,7 +814,7 @@ void KSyncUserSockIfContext::Process() { vr_interface_req if_info(*req_); sock->if_map[req_->get_vifr_idx()] = if_info; } - KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); + KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); } void KSyncUserSockContext::IfMsgHandler(vr_interface_req *req) { @@ -869,7 +869,7 @@ void KSyncUserSockFlowContext::Process() { req_->set_fr_index(fwd_flow_idx); req_->set_fr_gen_id((fwd_flow_idx % 255)); } - } + } if (fwd_flow_idx != 0xFFFFFFFF) { //store info from binary sandesh message @@ -956,7 +956,7 @@ void KSyncUserSockMplsContext::Process() { vr_mpls_req mpls_info(*req_); sock->mpls_map[req_->get_mr_label()] = mpls_info; } - KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); + KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); } void KSyncUserSockContext::MplsMsgHandler(vr_mpls_req *req) { @@ -989,7 +989,7 @@ void KSyncUserSockRouteContext::Process() { } else { sock->RouteAdd(*req_); } - KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); + KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); } void KSyncUserSockContext::RouteMsgHandler(vr_route_req *req) { @@ -1065,7 +1065,7 @@ void KSyncUserSockVxLanContext::Process() { void KSyncUserSockContext::VxLanMsgHandler(vr_vxlan_req *req) { KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); - KSyncUserSockVxLanContext *vxlanctx = + KSyncUserSockVxLanContext *vxlanctx = new KSyncUserSockVxLanContext(GetSeqNum(), req); if (sock->IsBlockMsgProcessing()) { @@ -1124,12 +1124,12 @@ void KSyncUserSockVrfAssignContext::Process() { assert(ret.second == true); } } - KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); + KSyncSockTypeMap::SimulateResponse(GetSeqNum(), 0, 0); } void KSyncUserSockContext::VrfAssignMsgHandler(vr_vrf_assign_req *req) { KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); - KSyncUserSockVrfAssignContext *ctx = + KSyncUserSockVrfAssignContext *ctx = new KSyncUserSockVrfAssignContext(GetSeqNum(), req); if (sock->IsBlockMsgProcessing()) { @@ -1202,7 +1202,7 @@ void MockDumpHandlerBase::SendDumpResponse(uint32_t seq_num, Sandesh *from_req) ret_code &= ~VR_MESSAGE_DUMP_INCOMPLETE; KSyncSockTypeMap::SimulateResponse(seq_num, ret_code, 0); return; - } + } Sandesh *req = GetFirst(from_req); if (req != NULL) { nl_init_generic_client_req(&cl, KSyncSock::GetNetlinkFamilyId()); @@ -1236,7 +1236,7 @@ void MockDumpHandlerBase::SendDumpResponse(uint32_t seq_num, Sandesh *from_req) } if (error) { - KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); + KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); nl_free(&cl); return; } @@ -1267,8 +1267,8 @@ void MockDumpHandlerBase::SendGetResponse(uint32_t seq_num, int idx) { uint32_t buf_len = 0, encode_len = 0; struct nlmsghdr *nlh; - /* To simulate error code return the test code has to call - * KSyncSockTypeMap::set_error_code() with required error code and + /* To simulate error code return the test code has to call + * KSyncSockTypeMap::set_error_code() with required error code and * invoke get request */ if (KSyncSockTypeMap::error_code()) { int ret_code = -KSyncSockTypeMap::error_code(); @@ -1278,7 +1278,7 @@ void MockDumpHandlerBase::SendGetResponse(uint32_t seq_num, int idx) { } Sandesh *req = Get(idx); if (req == NULL) { - KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); + KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); return; } nl_init_generic_client_req(&cl, KSyncSock::GetNetlinkFamilyId()); @@ -1297,7 +1297,7 @@ void MockDumpHandlerBase::SendGetResponse(uint32_t seq_num, int idx) { encode_len = req->WriteBinary(buf, buf_len, &error); if (error) { - KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); + KSyncSockTypeMap::SimulateResponse(seq_num, -ENOENT, 0); nl_free(&cl); return; } diff --git a/src/ksync/ksync_sock_user.h b/src/ksync/ksync_sock_user.h index 65bfd31d586..51404205ef8 100644 --- a/src/ksync/ksync_sock_user.h +++ b/src/ksync/ksync_sock_user.h @@ -2,8 +2,8 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -#ifndef ctrlplane_ksync_sock_user_h -#define ctrlplane_ksync_sock_user_h +#ifndef ctrlplane_ksync_sock_user_h +#define ctrlplane_ksync_sock_user_h #include @@ -106,25 +106,25 @@ class KSyncSockTypeMap : public KSyncSock { } typedef std::map ksync_map_nh; - ksync_map_nh nh_map; + ksync_map_nh nh_map; typedef boost::unordered_map ksync_map_flow; - ksync_map_flow flow_map; + ksync_map_flow flow_map; typedef std::map ksync_map_if; - ksync_map_if if_map; + ksync_map_if if_map; typedef std::set ksync_rt_tree; - ksync_rt_tree rt_tree; + ksync_rt_tree rt_tree; typedef std::map ksync_map_mpls; - ksync_map_mpls mpls_map; + ksync_map_mpls mpls_map; typedef std::map ksync_map_mirror; - ksync_map_mirror mirror_map; + ksync_map_mirror mirror_map; typedef std::set ksync_vrf_assign_tree; - ksync_vrf_assign_tree vrf_assign_tree; + ksync_vrf_assign_tree vrf_assign_tree; typedef std::map ksync_map_vrf_stats; - ksync_map_vrf_stats vrf_stats_map; + ksync_map_vrf_stats vrf_stats_map; vr_drop_stats_req drop_stats; vrouter_ops ksync_vrouter_ops; typedef std::map ksync_map_vxlan; - ksync_map_vxlan vxlan_map; + ksync_map_vxlan vxlan_map; typedef std::queue ksync_map_ctx_queue; ksync_map_ctx_queue ctx_queue_; @@ -292,7 +292,7 @@ class RouteDumpHandler : public MockDumpHandlerBase { virtual Sandesh* GetFirst(Sandesh *); virtual Sandesh* GetNext(Sandesh *); /* GET operation is not supported for vrf assign */ - virtual Sandesh* Get(int idx) { + virtual Sandesh* Get(int idx) { return NULL; } }; @@ -303,7 +303,7 @@ class VrfAssignDumpHandler : public MockDumpHandlerBase { virtual Sandesh* GetFirst(Sandesh *); virtual Sandesh* GetNext(Sandesh *); /* GET operation is not supported for route */ - virtual Sandesh* Get(int idx) { + virtual Sandesh* Get(int idx) { return NULL; } }; @@ -323,7 +323,7 @@ class VxLanDumpHandler : public MockDumpHandlerBase { virtual Sandesh* GetNext(Sandesh *); virtual Sandesh* Get(int idx); }; - + class DropStatsDumpHandler : public MockDumpHandlerBase { public: DropStatsDumpHandler() : MockDumpHandlerBase() {} @@ -363,7 +363,7 @@ class KSyncUserSockIfContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_interface_req *req_; }; @@ -384,7 +384,7 @@ class KSyncUserSockNHContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_nexthop_req *req_; }; @@ -405,7 +405,7 @@ class KSyncUserSockMplsContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_mpls_req *req_; }; @@ -426,7 +426,7 @@ class KSyncUserSockFlowContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_flow_req *req_; }; @@ -466,14 +466,14 @@ class KSyncUserSockRouteContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_route_req *req_; }; class KSyncUserSockVrfAssignContext : public KSyncUserSockContext { public: - KSyncUserSockVrfAssignContext(uint32_t seq_num, vr_vrf_assign_req *req) : + KSyncUserSockVrfAssignContext(uint32_t seq_num, vr_vrf_assign_req *req) : KSyncUserSockContext(seq_num) { if (req) { req_ = new vr_vrf_assign_req(*req); @@ -488,7 +488,7 @@ class KSyncUserSockVrfAssignContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_vrf_assign_req *req_; }; @@ -509,7 +509,7 @@ class KSyncUserSockVrfStatsContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_vrf_stats_req *req_; }; @@ -530,11 +530,11 @@ class KSyncUserSockVxLanContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_vxlan_req *req_; }; - + class KSyncUserSockDropStatsContext : public KSyncUserSockContext { public: KSyncUserSockDropStatsContext(uint32_t seq_num, vr_drop_stats_req *req) : KSyncUserSockContext(seq_num) { @@ -551,7 +551,7 @@ class KSyncUserSockDropStatsContext : public KSyncUserSockContext { } } - virtual void Process(); + virtual void Process(); private: vr_drop_stats_req *req_; }; diff --git a/src/ksync/ksync_tx_queue.h b/src/ksync/ksync_tx_queue.h index 2df4c5da55d..ad0070ddeba 100644 --- a/src/ksync/ksync_tx_queue.h +++ b/src/ksync/ksync_tx_queue.h @@ -4,7 +4,7 @@ // ksync_tx_queue.h // -// Implmentation of a shared transmit queue between agent and KSync. +// Implmentation of a shared transmit queue between agent and KSync. // // KSync i/o operations are done on KSync Netlink socket. Even if the socket is // set to non-blocking mode, the KSync socket i/o call will block till VRouter diff --git a/src/ksync/test/ksync_db_test.cc b/src/ksync/test/ksync_db_test.cc index d8f3a2c71d5..eac22e4a70b 100644 --- a/src/ksync/test/ksync_db_test.cc +++ b/src/ksync/test/ksync_db_test.cc @@ -118,11 +118,11 @@ class VlanTable : public DBTable { class VlanKSyncEntry : public KSyncDBEntry { public: - VlanKSyncEntry(const VlanKSyncEntry *entry) : + VlanKSyncEntry(const VlanKSyncEntry *entry) : KSyncDBEntry(), tag_(entry->tag_), no_ack_trigger_(true), sync_pending_(false) { }; - VlanKSyncEntry(const Vlan *vlan) : + VlanKSyncEntry(const Vlan *vlan) : KSyncDBEntry(), tag_(vlan->GetTag()), no_ack_trigger_(true), sync_pending_(false) { }; VlanKSyncEntry(const uint16_t tag) : @@ -357,7 +357,7 @@ TEST_F(DBKSyncTest, DuplicateDelete) { task_util::WaitForIdle(); VlanKSyncEntry v(10); KSyncEntry::KSyncEntryPtr ksync_vlan; - ksync_vlan = VlanKSyncObject::GetKSyncObject()->Find(&v); + ksync_vlan = VlanKSyncObject::GetKSyncObject()->Find(&v); req.oper = DBRequest::DB_ENTRY_DELETE; req.key.reset(new Vlan::VlanKey("vlan10", 10)); diff --git a/src/ksync/test/ksync_tcp_test.cc b/src/ksync/test/ksync_tcp_test.cc index 3bad9dc28b9..adb4da00f0c 100644 --- a/src/ksync/test/ksync_tcp_test.cc +++ b/src/ksync/test/ksync_tcp_test.cc @@ -42,10 +42,10 @@ class LocalVrouter { public: LocalVrouter(io_service &io_service) : io_service_(io_service), acceptor_(NULL), socket_(NULL) {} - + ~LocalVrouter() {} - void Cleanup() { + void Cleanup() { socket_->close(); delete socket_; socket_ = NULL; @@ -54,7 +54,7 @@ class LocalVrouter { delete acceptor_; acceptor_ = NULL; } - + void ProcessData() { char data[4096]; boost::system::error_code error; @@ -92,7 +92,7 @@ class LocalVrouter { void Join() { assert(pthread_join(thread_id_, NULL) == 0); } - + private: boost::asio::io_service &io_service_; tcp::acceptor *acceptor_; @@ -171,10 +171,10 @@ class VlanTable : public DBTable { class VlanKSyncEntry : public KSyncNetlinkDBEntry { public: - VlanKSyncEntry(const VlanKSyncEntry *entry) : + VlanKSyncEntry(const VlanKSyncEntry *entry) : KSyncNetlinkDBEntry(), tag_(entry->tag_) { }; - VlanKSyncEntry(const Vlan *vlan) : + VlanKSyncEntry(const Vlan *vlan) : KSyncNetlinkDBEntry(), tag_(vlan->GetTag()) { }; VlanKSyncEntry(const uint16_t tag) : KSyncNetlinkDBEntry(), tag_(tag) { }; diff --git a/src/ksync/test/ksync_test.cc b/src/ksync/test/ksync_test.cc index 1494a1636f5..ce911db73c5 100644 --- a/src/ksync/test/ksync_test.cc +++ b/src/ksync/test/ksync_test.cc @@ -39,16 +39,16 @@ class Vlan : public KSyncEntry { DEL }; - Vlan(uint16_t tag, uint16_t dep_tag, size_t index) : + Vlan(uint16_t tag, uint16_t dep_tag, size_t index) : KSyncEntry(index), tag_(tag), dep_tag_(dep_tag), dep_vlan_(NULL), op_(INIT), all_delete_state_comp_(true) { }; - Vlan(uint16_t tag) : + Vlan(uint16_t tag) : KSyncEntry(), tag_(tag), dep_tag_(0), dep_vlan_(NULL), op_(TEMP), all_delete_state_comp_(true) { }; - Vlan(uint16_t tag, uint16_t dep_tag) : - KSyncEntry(kInvalidIndex), tag_(tag), dep_tag_(dep_tag), + Vlan(uint16_t tag, uint16_t dep_tag) : + KSyncEntry(kInvalidIndex), tag_(tag), dep_tag_(dep_tag), dep_vlan_(NULL), op_(TEMP), all_delete_state_comp_(true) { }; @@ -56,7 +56,7 @@ class Vlan : public KSyncEntry { if (GetState() == KSyncEntry::FREE_WAIT) { free_wait_count_++; } - + if (op_ == TEMP) return; @@ -482,14 +482,14 @@ TEST_F(TestUT, add_defer_dep_reeval) { EXPECT_EQ(vlan3->GetRefCount(), 2); EXPECT_EQ(vlan1->GetDepTag(), 0xF03); //Temp Object corresponding to 0XF02 should be destroyed - //Verify this by using free_wait_count_ + //Verify this by using free_wait_count_ EXPECT_EQ(Vlan::delete_count_, 0); EXPECT_EQ(Vlan::free_wait_count_, 1); vlan_table_->Delete(vlan1); vlan_table_->Delete(vlan3); } - + // ADD_DEFER->del_req->DEL_DEFER TEST_F(TestUT, add_defer_to_del_defer) { Vlan *vlan1; @@ -508,7 +508,7 @@ TEST_F(TestUT, add_defer_to_del_defer) { EXPECT_EQ(Vlan::free_wait_count_, 3); } -//IN_SYNC->CHANGE_DEFER->IN_SYNC +//IN_SYNC->CHANGE_DEFER->IN_SYNC TEST_F(TestUT, change_defer1) { Vlan *vlan1; Vlan *vlan2; @@ -525,7 +525,7 @@ TEST_F(TestUT, change_defer1) { EXPECT_EQ(Vlan::delete_count_, 2); } -//IN_SYNC->CHANGE_DEFER->FREE_WAIT +//IN_SYNC->CHANGE_DEFER->FREE_WAIT TEST_F(TestUT, change_defer2) { Vlan *vlan1; @@ -580,7 +580,7 @@ TEST_F(TestUT, double_change_defer) { vlan_table_->NetlinkAck(vlan1, KSyncEntry::DEL_ACK); EXPECT_EQ(Vlan::delete_count_, 2); EXPECT_EQ(Vlan::free_wait_count_, 3); -} +} // ADD_DEFER->del_req->TEMP->IN_SYNC TEST_F(TestUT, add_defer_to_temp) { @@ -594,7 +594,7 @@ TEST_F(TestUT, add_defer_to_temp) { EXPECT_EQ(vlan1->GetRefCount(), 2); vlan_table_->Delete(vlan2); EXPECT_EQ(vlan2->GetState(), KSyncEntry::TEMP); - // The object pointed to by 0xF03 (in TEMP state) will not be + // The object pointed to by 0xF03 (in TEMP state) will not be // destroyed/removed even though delete is invoked on vlan2 // because vlan2 is just moved to TEMP state and it still holds // pointer to 0xF03 @@ -627,7 +627,7 @@ TEST_F(TestUT, refcount_verify_for_temp) { EXPECT_EQ(vlan2->GetState(), KSyncEntry::TEMP); EXPECT_EQ(vlan2->GetRefCount(), 3); EXPECT_EQ(Vlan::free_wait_count_, 0); - vlan3 = AddVlan(0xF03, 0, KSyncEntry::IN_SYNC, Vlan::ADD, 1); + vlan3 = AddVlan(0xF03, 0, KSyncEntry::IN_SYNC, Vlan::ADD, 1); EXPECT_EQ(vlan3->GetRefCount(), 2); vlan_table_->Delete(vlan1); EXPECT_EQ(vlan3->GetRefCount(), 1); @@ -706,7 +706,7 @@ TEST_F(TestUT, async_add_defer) { EXPECT_EQ(vlan1->GetState(), KSyncEntry::DEL_ACK_WAIT); vlan_table_->NetlinkAck(vlan1, KSyncEntry::DEL_ACK); vlan_table_->NetlinkAck(vlan2, KSyncEntry::DEL_ACK); - + EXPECT_EQ(Vlan::delete_count_, 2); EXPECT_EQ(Vlan::free_wait_count_, 2); } @@ -721,7 +721,7 @@ TEST_F(TestUT, temp_del_req) { EXPECT_EQ(vlan1->GetState(), KSyncEntry::DEL_ACK_WAIT); EXPECT_EQ(vlan1->GetOp(), Vlan::DEL); - //Add a reference + //Add a reference Vlan *vlan2 = AddVlan(0x2, 0x1, KSyncEntry::ADD_DEFER, Vlan::INIT, 1); vlan_table_->NetlinkAck(vlan1, KSyncEntry::DEL_ACK); @@ -762,7 +762,7 @@ TEST_F(TestUT, renew_dependency_reval) { EXPECT_EQ(vlan1->GetState(), KSyncEntry::IN_SYNC); EXPECT_EQ(vlan2->GetState(), KSyncEntry::IN_SYNC); - + vlan_table_->Delete(vlan2); vlan_table_->Delete(vlan1); vlan_table_->NetlinkAck(vlan2, KSyncEntry::DEL_ACK); diff --git a/src/net/mac_address.h b/src/net/mac_address.h index eb4784db60e..2169bcf18c3 100644 --- a/src/net/mac_address.h +++ b/src/net/mac_address.h @@ -27,7 +27,7 @@ class MacAddress { addr_ = *a; } - MacAddress(unsigned int a, unsigned int b, unsigned int c, + MacAddress(unsigned int a, unsigned int b, unsigned int c, unsigned int d, unsigned int e, unsigned int f); explicit MacAddress(const std::string &s, diff --git a/src/route/route.h b/src/route/route.h index ac22ad2d525..c660de76b1b 100644 --- a/src/route/route.h +++ b/src/route/route.h @@ -13,9 +13,9 @@ class Route : public DBEntry { public: - typedef boost::intrusive::member_hook, - &Path::node_> PathListMember; + typedef boost::intrusive::member_hook, + &Path::node_> PathListMember; typedef boost::intrusive::list PathList; typedef bool (*Compare)(const Path &path1, const Path &path2); diff --git a/src/routing-policy/policy_config_parser.cc b/src/routing-policy/policy_config_parser.cc index 69b9a2ae25f..af317716f34 100644 --- a/src/routing-policy/policy_config_parser.cc +++ b/src/routing-policy/policy_config_parser.cc @@ -31,13 +31,13 @@ static bool ParseTerm(const xml_node &xterm, PolicyTerm *term) { term->term_name = name.value(); xml_node xaction; - xml_node xmatch = xterm.child("from"); + xml_node xmatch = xterm.child("from"); if (xmatch) { term->match.XmlParse(xmatch); xaction = xmatch.next_sibling("then"); } else { - xaction = xterm.child("then"); + xaction = xterm.child("then"); } term->action.XmlParse(xaction); @@ -55,7 +55,7 @@ static bool ParsePolicy(const xml_node &node, PolicyMap *policy) { policy_terms.push_back(term_data); } - policy->insert(std::make_pair(name.value(), policy_terms)); + policy->insert(std::make_pair(name.value(), policy_terms)); return true; } diff --git a/src/routing-policy/policy_edge.h b/src/routing-policy/policy_edge.h index 38c74612f06..52353a71a34 100644 --- a/src/routing-policy/policy_edge.h +++ b/src/routing-policy/policy_edge.h @@ -54,7 +54,7 @@ class PolicyGraphEdge { private: Edge edge_id_; - + DISALLOW_COPY_AND_ASSIGN(PolicyGraphEdge); }; diff --git a/src/routing-policy/policy_graph.cc b/src/routing-policy/policy_graph.cc index 6988f5d3b3a..99850ff7205 100644 --- a/src/routing-policy/policy_graph.cc +++ b/src/routing-policy/policy_graph.cc @@ -30,7 +30,7 @@ void PolicyGraph::RemoveNode(PolicyGraphVertex *entry) { remove_vertex(entry->vertex(), root_); } -PolicyGraph::Edge +PolicyGraph::Edge PolicyGraph::Link(PolicyGraphVertex *lhs, PolicyGraphVertex *rhs) { PolicyGraph::Edge edge_id; bool added; @@ -94,11 +94,11 @@ PolicyGraphVertex *PolicyGraph::GetRoot() const { } void PolicyGraph::open_vertex_reverse_iterator::increment() { - PolicyGraphEdge *edge = open_->in_edge(graph_); + PolicyGraphEdge *edge = open_->in_edge(graph_); open_ = edge->source(graph_); } -bool +bool PolicyGraph::open_vertex_reverse_iterator::equal( const open_vertex_reverse_iterator &rhs) const { if (graph_ == NULL) { @@ -112,14 +112,14 @@ PolicyGraph::open_vertex_reverse_iterator::equal( return open_ == rhs.open_; } -PolicyGraph::OpenVertexPathPair +PolicyGraph::OpenVertexPathPair PolicyGraph::open_vertex_reverse_iterator::dereference() const { if (graph_ == NULL || open_ == NULL) { return make_pair((PolicyGraphVertex *)0, (PolicyGraphEdge *)0); } PolicyGraphVertex *vertex = NULL; PolicyGraphEdge *edge = NULL; - edge = open_->in_edge(graph_); + edge = open_->in_edge(graph_); vertex = edge->source(graph_); return std::make_pair(vertex, edge); } diff --git a/src/routing-policy/policy_graph.h b/src/routing-policy/policy_graph.h index 5cb41d62cbf..347cb75abec 100644 --- a/src/routing-policy/policy_graph.h +++ b/src/routing-policy/policy_graph.h @@ -18,10 +18,10 @@ class PolicyGraph : public PolicyGraphBase { public: typedef PolicyGraphBase::edge_descriptor Edge; typedef PolicyGraphBase::vertex_descriptor Vertex; - typedef boost::intrusive::member_hook, - &PolicyGraphVertex::open_vertex_> OpenVertexListMember; - typedef boost::intrusive::list, + &PolicyGraphVertex::open_vertex_> OpenVertexListMember; + typedef boost::intrusive::list OpenVertexList; typedef OpenVertexList::iterator OpenVertexIterator; @@ -34,8 +34,8 @@ class PolicyGraph : public PolicyGraphBase { void Unlink(PolicyGraphVertex *lhs, PolicyGraphVertex *rhs); void SetEdgeProperty(PolicyGraphEdge *edge); - - PolicyGraphEdge *GetEdge(const PolicyGraphVertex *src, + + PolicyGraphEdge *GetEdge(const PolicyGraphVertex *src, const PolicyGraphVertex *tgt); const graph_t *graph() const { return &root_; } @@ -63,18 +63,18 @@ class PolicyGraph : public PolicyGraphBase { void RemoveOpenVertex(PolicyGraphVertex *vertex); - typedef std::pair OpenVertexPathPair; class open_vertex_reverse_iterator : public boost::iterator_facade< - open_vertex_reverse_iterator, OpenVertexPathPair, + open_vertex_reverse_iterator, OpenVertexPathPair, boost::forward_traversal_tag, OpenVertexPathPair> { public: - open_vertex_reverse_iterator() + open_vertex_reverse_iterator() : graph_(NULL), open_(NULL) { } - open_vertex_reverse_iterator(PolicyGraph *graph, - PolicyGraphVertex *start) + open_vertex_reverse_iterator(PolicyGraph *graph, + PolicyGraphVertex *start) : graph_(graph), open_(start) { } diff --git a/src/routing-policy/policy_vertex.cc b/src/routing-policy/policy_vertex.cc index 6b85e0c2a7f..e7324cc6658 100644 --- a/src/routing-policy/policy_vertex.cc +++ b/src/routing-policy/policy_vertex.cc @@ -52,7 +52,7 @@ PolicyGraphVertex *PolicyGraphVertex::edge_iterator::target() const { PolicyGraphVertex *PolicyGraphVertex::parent_vertex(PolicyGraph *graph) { assert(boost::in_degree(vertex_id_, *graph->graph()) == 1); PolicyGraphBase::inv_adjacency_iterator parentIt, parentEnd; - boost::tie(parentIt, parentEnd) + boost::tie(parentIt, parentEnd) = boost::inv_adjacent_vertices(vertex_id_, *graph->graph()); return graph->vertex_data(*parentIt); } diff --git a/src/routing-policy/test/policy_parse_test.cc b/src/routing-policy/test/policy_parse_test.cc index a6c04e404e4..9391840b71d 100644 --- a/src/routing-policy/test/policy_parse_test.cc +++ b/src/routing-policy/test/policy_parse_test.cc @@ -18,8 +18,8 @@ class PolicyParserTest : public ::testing::Test { string content((istreambuf_iterator(file)), istreambuf_iterator()); return content; - } - + } + virtual void SetUp() { } diff --git a/src/vnsw/agent/cfg/cfg_init.cc b/src/vnsw/agent/cfg/cfg_init.cc index f8ec2e129e8..8202590bc96 100644 --- a/src/vnsw/agent/cfg/cfg_init.cc +++ b/src/vnsw/agent/cfg/cfg_init.cc @@ -55,7 +55,7 @@ AgentConfig::AgentConfig(Agent *agent) agent_->set_interface_mirror_cfg_table(cfg_intf_mirror_table_.get()); } -AgentConfig::~AgentConfig() { +AgentConfig::~AgentConfig() { cfg_filter_.reset(); cfg_parser_.reset(); cfg_graph_.reset(); @@ -72,7 +72,7 @@ void AgentConfig::CreateDBTables(DB *db) { bgp_schema_Agent_ParserInit(db, cfg_parser_.get()); IFMapAgentLinkTable_Init(db, cfg_graph_.get()); agent_->set_ifmap_parser(cfg_parser_.get()); - IFMapAgentStaleCleaner *cl = + IFMapAgentStaleCleaner *cl = new IFMapAgentStaleCleaner(db, cfg_graph_.get()); agent_->set_ifmap_stale_cleaner(cl); @@ -103,7 +103,7 @@ void AgentConfig::RegisterDBClients(DB *db) { cfg_sg_table_ = (static_cast (IFMapTable::FindTable(agent_->db(), "security-group"))); - assert(cfg_sg_table_); + assert(cfg_sg_table_); cfg_vrf_table_ = (static_cast (IFMapTable::FindTable(agent_->db(), "routing-instance"))); @@ -134,12 +134,12 @@ void AgentConfig::RegisterDBClients(DB *db) { assert(cfg_network_ipam_table_); cfg_vn_network_ipam_table_ = (static_cast - (IFMapTable::FindTable(agent_->db(), + (IFMapTable::FindTable(agent_->db(), "virtual-network-network-ipam"))); assert(cfg_vn_network_ipam_table_); cfg_vm_port_vrf_table_ = (static_cast - (IFMapTable::FindTable(agent_->db(), + (IFMapTable::FindTable(agent_->db(), "virtual-machine-interface-routing-instance"))); assert(cfg_vm_port_vrf_table_); diff --git a/src/vnsw/agent/cfg/cfg_init.h b/src/vnsw/agent/cfg/cfg_init.h index e2929d8254b..9338a46a737 100644 --- a/src/vnsw/agent/cfg/cfg_init.h +++ b/src/vnsw/agent/cfg/cfg_init.h @@ -180,7 +180,7 @@ class AgentConfig { private: Agent *agent_; std::auto_ptr cfg_filter_; - std::auto_ptr cfg_parser_; + std::auto_ptr cfg_parser_; std::auto_ptr cfg_graph_; std::auto_ptr cfg_interface_client_; std::auto_ptr cfg_mirror_table_; diff --git a/src/vnsw/agent/cfg/cfg_listener.h b/src/vnsw/agent/cfg/cfg_listener.h index e216b900f4f..da58e890e85 100644 --- a/src/vnsw/agent/cfg/cfg_listener.h +++ b/src/vnsw/agent/cfg/cfg_listener.h @@ -42,7 +42,7 @@ class CfgListener { typedef std::map CfgListenerMap; // Map of IFNode to listener callback info typedef std::map CfgListenerCbMap; - + void NodeListener(DBTablePartBase *partition, DBEntryBase *dbe); void LinkListener(DBTablePartBase *partition, DBEntryBase *dbe); void NodeCallback(DBTablePartBase *partition, DBEntryBase *dbe); diff --git a/src/vnsw/agent/cfg/cfg_mirror.cc b/src/vnsw/agent/cfg/cfg_mirror.cc index ee10506de56..51e2e03b6bd 100644 --- a/src/vnsw/agent/cfg/cfg_mirror.cc +++ b/src/vnsw/agent/cfg/cfg_mirror.cc @@ -163,7 +163,7 @@ const char *MirrorCfgTable::Add(const MirrorCreateReq &cfg) { ace_id = ++va_it->second.ace_id_latest; str = UpdateAclEntry(dyn_acl_uuid, false, entry, ace_id); } - + if (str != NULL) { delete entry; return str; @@ -259,7 +259,7 @@ const char *MirrorCfgTable::UpdateAclEntry (AclUuid &uuid, bool create, AclKey *key = new AclKey(uuid); AclData *data = new AclData(agent_cfg_->agent(), NULL, acl_spec); data->ace_add = true; - LOG(DEBUG, "Ace add: " << data->ace_add << ", Ace spec id:" + LOG(DEBUG, "Ace add: " << data->ace_add << ", Ace spec id:" << ace_spec.id.id_); req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; req.key.reset(key); @@ -292,7 +292,7 @@ void MirrorCfgTable::Delete(MirrorCfgKey &key) { areq.key.reset(akey); areq.data.reset(adata); agent_cfg_->agent()->acl_table()->Enqueue(&areq); - + // delete entry from mv map delete entry; mc_tree_.erase(it); @@ -335,8 +335,8 @@ const uuid MirrorCfgTable::GetMirrorUuid(const string &vn_name) const { return va_it->second.id; } -void MirrorCfgTable::SetMirrorCfgSandeshData(std::string &handle, - MirrorCfgDisplayResp &resp) { +void MirrorCfgTable::SetMirrorCfgSandeshData(std::string &handle, + MirrorCfgDisplayResp &resp) { MirrorCfgTree::iterator it; std::vector mc_l; @@ -369,7 +369,7 @@ void MirrorCfgTable::SetMirrorCfgSandeshData(std::string &handle, } void MirrorCfgTable::SetMirrorCfgVnSandeshData(std::string &vn_name, - MirrorCfgVnInfoResp &resp) { + MirrorCfgVnInfoResp &resp) { VnAclMap::iterator it; std::vector vn_l; for (it = vn_acl_map_.begin(); it != vn_acl_map_.end(); ++it) { @@ -391,7 +391,7 @@ void MirrorCreateReq::HandleRequest() const { resp->set_context(context()); if (str == NULL) { str = "Success"; - } + } resp->set_resp(str); resp->Response(); return; @@ -441,7 +441,7 @@ const char *IntfMirrorCfgTable::Add(const IntfMirrorCreateReq &intf_mirror) { if (key.handle.empty()) { return "Invalid Handle"; } - + IntfMirrorCfgTree::iterator it; it = intf_mc_tree_.find(key); if (it != intf_mc_tree_.end()) { @@ -543,7 +543,7 @@ void IntfMirrorCfgTable::Delete(MirrorCfgKey &key) { if (it == intf_mc_tree_.end()) { return; } - IntfMirrorCfgEntry *entry = it->second; + IntfMirrorCfgEntry *entry = it->second; MirrorTable::DelMirrorEntry(entry->key.handle); VmInterfaceKey *intf_key = new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, @@ -573,7 +573,7 @@ void IntfMirrorCreateReq::HandleRequest() const { resp->set_context(context()); if (str == NULL) { str = "Success"; - } + } resp->set_resp(str); resp->Response(); return; @@ -590,7 +590,7 @@ void IntfMirrorDeleteReq::HandleRequest() const { return; } -void IntfMirrorCfgTable::SetIntfMirrorCfgSandeshData(std::string &handle, +void IntfMirrorCfgTable::SetIntfMirrorCfgSandeshData(std::string &handle, IntfMirrorCfgDisplayResp &resp) { IntfMirrorCfgTree::iterator it; std::vector mc_l; diff --git a/src/vnsw/agent/cfg/cfg_mirror.h b/src/vnsw/agent/cfg/cfg_mirror.h index 3c54c51c3c6..2f5e1e51f8c 100644 --- a/src/vnsw/agent/cfg/cfg_mirror.h +++ b/src/vnsw/agent/cfg/cfg_mirror.h @@ -18,7 +18,7 @@ struct MirrorCfgKey { }; struct MirrorCfgData { - MirrorCfgData() : + MirrorCfgData() : apply_vn(), src_vn(), src_ip_prefix(), src_ip_prefix_len(0), dst_vn(), dst_ip_prefix(), dst_ip_prefix_len(0), start_src_port(0), end_src_port(0), start_dst_port(0), end_dst_port(0), protocol(0), @@ -49,7 +49,7 @@ struct MirrorCfgData { int protocol; // Mirror destination - std::string ip; + std::string ip; int udp_port; // Time period for mirroring in seconds int time_period; @@ -95,7 +95,7 @@ class MirrorCfgTable { void Shutdown(); void Init(); - void SetMirrorCfgSandeshData(std::string &handle, + void SetMirrorCfgSandeshData(std::string &handle, MirrorCfgDisplayResp &resp); void SetMirrorCfgVnSandeshData(std::string &vn_name, MirrorCfgVnInfoResp &resp); @@ -119,7 +119,7 @@ struct MirrorDestination { IpAddress sip; uint16_t sport; // Mirror destination - IpAddress dip; + IpAddress dip; uint16_t dport; // Time period for mirroring in seconds int time_period; @@ -148,7 +148,7 @@ class IntfMirrorCfgTable { IntfMirrorCfgTable *CreateIntfMirrorCfgTable(); void Init(); void Shutdown(); - void SetIntfMirrorCfgSandeshData(std::string &handle, + void SetIntfMirrorCfgSandeshData(std::string &handle, IntfMirrorCfgDisplayResp &resp); private: AgentConfig *agent_cfg_; diff --git a/src/vnsw/agent/cmn/agent.cc b/src/vnsw/agent/cmn/agent.cc index 459314eb80f..5c2f41dbbc0 100644 --- a/src/vnsw/agent/cmn/agent.cc +++ b/src/vnsw/agent/cmn/agent.cc @@ -559,28 +559,28 @@ void Agent::InitDone() { } static bool interface_exist(string &name) { - struct if_nameindex *ifs = NULL; - struct if_nameindex *head = NULL; - bool ret = false; - string tname = ""; - - ifs = if_nameindex(); - if (ifs == NULL) { - LOG(INFO, "No interface exists!"); - return ret; - } - head = ifs; - while (ifs->if_name && ifs->if_index) { - tname = ifs->if_name; - if (string::npos != tname.find(name)) { - ret = true; - name = tname; - break; - } - ifs++; - } - if_freenameindex(head); - return ret; + struct if_nameindex *ifs = NULL; + struct if_nameindex *head = NULL; + bool ret = false; + string tname = ""; + + ifs = if_nameindex(); + if (ifs == NULL) { + LOG(INFO, "No interface exists!"); + return ret; + } + head = ifs; + while (ifs->if_name && ifs->if_index) { + tname = ifs->if_name; + if (string::npos != tname.find(name)) { + ret = true; + name = tname; + break; + } + ifs++; + } + if_freenameindex(head); + return ret; } void Agent::InitXenLinkLocalIntf() { @@ -678,7 +678,7 @@ Agent::Agent() : xs_stime_(), xs_auth_enable_(false), xs_dns_idx_(0), dns_addr_(), dns_port_(), dns_auth_enable_(false), controller_chksum_(0), dns_chksum_(0), collector_chksum_(0), - ip_fabric_intf_name_(""), crypt_intf_name_(""), + ip_fabric_intf_name_(""), crypt_intf_name_(""), vhost_interface_name_(""), pkt_interface_name_("pkt0"), arp_proto_(NULL), dhcp_proto_(NULL), dns_proto_(NULL), icmp_proto_(NULL), diff --git a/src/vnsw/agent/cmn/agent_cmn.h b/src/vnsw/agent/cmn/agent_cmn.h index 287c651ed59..3f506008674 100644 --- a/src/vnsw/agent/cmn/agent_cmn.h +++ b/src/vnsw/agent/cmn/agent_cmn.h @@ -44,7 +44,7 @@ #include #include -static inline bool UnregisterDBTable(DBTable *table, +static inline bool UnregisterDBTable(DBTable *table, DBTableBase::ListenerId id) { table->Unregister(id); return true; @@ -52,7 +52,7 @@ static inline bool UnregisterDBTable(DBTable *table, static inline TaskTrigger *SafeDBUnregister(DBTable *table, DBTableBase::ListenerId id) { - TaskTrigger *trigger = + TaskTrigger *trigger = new TaskTrigger(boost::bind(&UnregisterDBTable, table, id), TaskScheduler::GetInstance()->GetTaskId("db::DBTable"), 0); trigger->Set(); diff --git a/src/vnsw/agent/cmn/agent_db.cc b/src/vnsw/agent/cmn/agent_db.cc index 819c79c62f2..d766f2357e8 100644 --- a/src/vnsw/agent/cmn/agent_db.cc +++ b/src/vnsw/agent/cmn/agent_db.cc @@ -8,7 +8,7 @@ void AgentDBEntry::SetRefState() const { AgentDBTable *table = static_cast(get_table()); - // Force calling SetState on a const object. + // Force calling SetState on a const object. // Ideally, SetState should be 'const method' and StateMap mutable AgentDBEntry *entry = (AgentDBEntry *)this; entry->SetState(table, table->GetRefListenerId(), new AgentDBState(this)); @@ -16,7 +16,7 @@ void AgentDBEntry::SetRefState() const { void AgentDBEntry::ClearRefState() const { AgentDBTable *table = static_cast(get_table()); - // Force calling SetState on a const object. + // Force calling SetState on a const object. // Ideally, ClearState should be 'const method' and StateMap mutable AgentDBEntry *entry = (AgentDBEntry *)this; table->OnZeroRefcount(entry); diff --git a/src/vnsw/agent/cmn/agent_db.h b/src/vnsw/agent/cmn/agent_db.h index 6f409103ab2..24618db99dd 100644 --- a/src/vnsw/agent/cmn/agent_db.h +++ b/src/vnsw/agent/cmn/agent_db.h @@ -79,7 +79,7 @@ struct AgentDBState : DBState { ///////////////////////////////////////////////////////////////////////////// class AgentDBTablePartition: public DBTablePartition { public: - AgentDBTablePartition(DBTable *parent, int index) : + AgentDBTablePartition(DBTable *parent, int index) : DBTablePartition(parent, index) { }; virtual ~AgentDBTablePartition() {}; virtual void Add(DBEntry *entry); diff --git a/src/vnsw/agent/cmn/agent_stats.h b/src/vnsw/agent/cmn/agent_stats.h index 936cac7b198..fedd3fce71b 100644 --- a/src/vnsw/agent/cmn/agent_stats.h +++ b/src/vnsw/agent/cmn/agent_stats.h @@ -31,7 +31,7 @@ class AgentStats { xmpp_config_in_msgs_(), sandesh_reconnects_(0U), sandesh_in_msgs_(0U), sandesh_out_msgs_(0U), sandesh_http_sessions_(0U), nh_count_(0U), pkt_exceptions_(0U), - pkt_invalid_agent_hdr_(0U), pkt_invalid_interface_(0U), + pkt_invalid_agent_hdr_(0U), pkt_invalid_interface_(0U), pkt_no_handler_(0U), pkt_fragments_dropped_(0U), pkt_dropped_(0U), max_flow_count_(0), flow_drop_due_to_max_limit_(0), flow_drop_due_to_linklocal_limit_(0), diff --git a/src/vnsw/agent/cmn/index_vector.h b/src/vnsw/agent/cmn/index_vector.h index 2b1f9baa97f..b1a65450877 100644 --- a/src/vnsw/agent/cmn/index_vector.h +++ b/src/vnsw/agent/cmn/index_vector.h @@ -11,7 +11,7 @@ #include // Index management + Vector holding a pointer at allocated index -template +template class IndexVector { public: static const size_t kGrowSize = 32; @@ -22,7 +22,7 @@ class IndexVector { ~IndexVector() { // Make sure the bitmap is empty if (bitmap_.count() != bitmap_.size()) { - LOG(ERROR, "IndexVector has " << bitmap_.size() - bitmap_.count() + LOG(ERROR, "IndexVector has " << bitmap_.size() - bitmap_.count() << " entries in destructor"); } bitmap_.clear(); diff --git a/src/vnsw/agent/cmn/test/test.cc b/src/vnsw/agent/cmn/test/test.cc index c3c3de6e260..603e9c6bded 100644 --- a/src/vnsw/agent/cmn/test/test.cc +++ b/src/vnsw/agent/cmn/test/test.cc @@ -26,7 +26,7 @@ DBEntryBase::KeyPtr EntryA::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void EntryA::SetKey(const DBRequestKey *k) { +void EntryA::SetKey(const DBRequestKey *k) { const EntryKey *key = static_cast(k); id_ = key->id_; } @@ -40,7 +40,7 @@ DBEntryBase::KeyPtr EntryB::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void EntryB::SetKey(const DBRequestKey *k) { +void EntryB::SetKey(const DBRequestKey *k) { const EntryKey *key = static_cast(k); id_ = key->id_; } @@ -169,7 +169,7 @@ class ClientA { void Init(DB *db) { table_ = static_cast(db->FindTable("db.tablea.0")); assert(table_); - listener_id_ = table_->Register(boost::bind(&ClientA::DBTestListener, + listener_id_ = table_->Register(boost::bind(&ClientA::DBTestListener, this, _1, _2)); }; @@ -196,7 +196,7 @@ class ClientB { void Init(DB *db) { table_ = static_cast(db->FindTable("db.tableb.0")); assert(table_); - listener_id_ = table_->Register(boost::bind(&ClientB::DBTestListener, + listener_id_ = table_->Register(boost::bind(&ClientB::DBTestListener, this, _1, _2)); }; @@ -341,7 +341,7 @@ bool ValidateA(int id, int refcount, int del_count, int free_count, return ret; } -bool ValidateB(int id, int refcount, int del_count, int free_count, +bool ValidateB(int id, int refcount, int del_count, int free_count, int adc_notify_count, int del_notify_count) { EntryB *entryb; bool ret = true; @@ -513,7 +513,7 @@ TEST_F(DBTest, TestRef_RemoveQ_2) { WaitForIdle(); EXPECT_TRUE(FindA(1, true) != NULL); - // Enqueue request to table-b. It will remove + // Enqueue request to table-b. It will remove AddEnqueueTableC(table_c_, 1, 0); for (int i = 0; i < 40; i++) { DelEnqueue(table_a_, 1, 1, 1); diff --git a/src/vnsw/agent/cmn/test/test.h b/src/vnsw/agent/cmn/test/test.h index 14bad45e7af..d7926d483fc 100644 --- a/src/vnsw/agent/cmn/test/test.h +++ b/src/vnsw/agent/cmn/test/test.h @@ -37,9 +37,9 @@ class EntryA : AgentRefCount, public AgentDBEntry { public: EntryA(int id) : id_(id), data_(-1), ref_() { }; - virtual ~EntryA() { + virtual ~EntryA() { if (data_ >= 0) { - LOG(DEBUG, __PRETTY_FUNCTION__ << ": <" << id_ << " : " + LOG(DEBUG, __PRETTY_FUNCTION__ << ": <" << id_ << " : " << data_ << ">"); free_count_++; } @@ -110,9 +110,9 @@ class EntryB : AgentRefCount, public AgentDBEntry { public: EntryB(int id) : id_(id), data_(-1) { }; - virtual ~EntryB() { + virtual ~EntryB() { if (data_ >= 0) { - LOG(DEBUG, __PRETTY_FUNCTION__ << ": <" << id_ << " : " + LOG(DEBUG, __PRETTY_FUNCTION__ << ": <" << id_ << " : " << data_ << ">"); free_count_++; } diff --git a/src/vnsw/agent/cmn/test/test_subop.cc b/src/vnsw/agent/cmn/test/test_subop.cc index 7c6825ca0e1..1a044fbbfb4 100644 --- a/src/vnsw/agent/cmn/test/test_subop.cc +++ b/src/vnsw/agent/cmn/test/test_subop.cc @@ -24,7 +24,7 @@ DBEntryBase::KeyPtr EntryC::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void EntryC::SetKey(const DBRequestKey *k) { +void EntryC::SetKey(const DBRequestKey *k) { const EntryKey *key = static_cast(k); id_ = key->id_; } @@ -101,7 +101,7 @@ class ClientC { void Init(DB *db) { table_ = static_cast(db->FindTable("db.tablea.0")); assert(table_); - listener_id_ = table_->Register(boost::bind(&ClientC::DBTestListener, + listener_id_ = table_->Register(boost::bind(&ClientC::DBTestListener, this, _1, _2)); }; diff --git a/src/vnsw/agent/cmn/test/test_subop.h b/src/vnsw/agent/cmn/test/test_subop.h index 58d8a29de0d..940b49284da 100644 --- a/src/vnsw/agent/cmn/test/test_subop.h +++ b/src/vnsw/agent/cmn/test/test_subop.h @@ -32,7 +32,7 @@ class EntryC : AgentRefCount, public AgentDBEntry { public: EntryC(int id) : id_(id), data_(-1) { }; - virtual ~EntryC() { + virtual ~EntryC() { free_count_++; }; @@ -48,7 +48,7 @@ class EntryC : AgentRefCount, public AgentDBEntry { AgentDBTable *DBToTable() const; uint32_t GetRefCount() const { - return AgentRefCount::GetRefCount(); + return AgentRefCount::GetRefCount(); }; static void ClearCount() {free_count_ = 0;}; diff --git a/src/vnsw/agent/contrail/contrail_agent_init.h b/src/vnsw/agent/contrail/contrail_agent_init.h index 303f39c329c..edf32238b77 100644 --- a/src/vnsw/agent/contrail/contrail_agent_init.h +++ b/src/vnsw/agent/contrail/contrail_agent_init.h @@ -15,7 +15,7 @@ class DiagTable; class ServicesModule; class PktModule; -// The class to drive agent initialization. +// The class to drive agent initialization. // Defines control parameters used to enable/disable agent features class ContrailAgentInit : public ContrailInitCommon { public: diff --git a/src/vnsw/agent/contrail/freebsd/pkt0_interface.cc b/src/vnsw/agent/contrail/freebsd/pkt0_interface.cc index 03162bd7b9d..86b2129c394 100644 --- a/src/vnsw/agent/contrail/freebsd/pkt0_interface.cc +++ b/src/vnsw/agent/contrail/freebsd/pkt0_interface.cc @@ -48,7 +48,7 @@ static bool InterfaceExists(std::string if_name) { void Pkt0Interface::InitControlInterface() { unsigned int flags; pkt_handler()->agent()->set_pkt_interface_name(name_); - + // Create a socket for the TAP device int socket_fd = socket(AF_LOCAL, SOCK_DGRAM, 0); if (socket_fd < 0) { @@ -145,12 +145,12 @@ void Pkt0Interface::InitControlInterface() { strerror(errno) << "> setting fcntl on " << name_ ); assert(0); } - + boost::system::error_code ec; input_.assign(tap_fd_, ec); assert(ec == 0); - - VrouterControlInterface::InitControlInterface(); + + VrouterControlInterface::InitControlInterface(); AsyncRead(); } diff --git a/src/vnsw/agent/contrail/linux/pkt0_interface.cc b/src/vnsw/agent/contrail/linux/pkt0_interface.cc index b61100ccce4..c399e58008a 100644 --- a/src/vnsw/agent/contrail/linux/pkt0_interface.cc +++ b/src/vnsw/agent/contrail/linux/pkt0_interface.cc @@ -1,7 +1,7 @@ /* * Copyright (c) 2014 Juniper Networks, Inc. All rights reserved. */ - + #include #include #include @@ -109,7 +109,7 @@ void Pkt0Interface::InitControlInterface() { "> getting tx-buffer size"); assert(0); } - + uint32_t qlen = pkt_handler()->agent()->params()->pkt0_tx_buffer_count(); if (ifr.ifr_qlen < (int)qlen) { ifr.ifr_qlen = qlen; @@ -119,7 +119,7 @@ void Pkt0Interface::InitControlInterface() { assert(0); } } - + memset(&ifr, 0, sizeof(ifr)); strncpy(ifr.ifr_name, name_.data(), IF_NAMESIZE); if (ioctl(raw, SIOCGIFFLAGS, (void *)&ifr) < 0) { diff --git a/src/vnsw/agent/contrail/pkt0_interface.h b/src/vnsw/agent/contrail/pkt0_interface.h index 8bd7e2b34be..4056661af58 100644 --- a/src/vnsw/agent/contrail/pkt0_interface.h +++ b/src/vnsw/agent/contrail/pkt0_interface.h @@ -19,11 +19,11 @@ class Pkt0Interface: public VrouterControlInterface { Pkt0Interface(const std::string &name, boost::asio::io_service *io); virtual ~Pkt0Interface(); - + virtual void InitControlInterface(); virtual void IoShutdownControlInterface(); virtual void ShutdownControlInterface(); - + const std::string &Name() const { return name_; } int Send(uint8_t *buff, uint16_t buff_len, const PacketBufferPtr &pkt); const unsigned char *mac_address() const { return mac_address_; } diff --git a/src/vnsw/agent/contrail/pkt0_interface_base.cc b/src/vnsw/agent/contrail/pkt0_interface_base.cc index ff681830b24..52ee2f33547 100644 --- a/src/vnsw/agent/contrail/pkt0_interface_base.cc +++ b/src/vnsw/agent/contrail/pkt0_interface_base.cc @@ -170,7 +170,7 @@ void Pkt0Socket::ShutdownControlInterface() { void Pkt0Socket::AsyncRead() { read_buff_ = new uint8_t[kMaxPacketSize]; socket_.async_receive( - boost::asio::buffer(read_buff_, kMaxPacketSize), + boost::asio::buffer(read_buff_, kMaxPacketSize), boost::bind(&Pkt0Socket::ReadHandler, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); diff --git a/src/vnsw/agent/controller/controller_dns.cc b/src/vnsw/agent/controller/controller_dns.cc index 17853f8ed6d..b80de735f28 100644 --- a/src/vnsw/agent/controller/controller_dns.cc +++ b/src/vnsw/agent/controller/controller_dns.cc @@ -43,10 +43,10 @@ void AgentDnsXmppChannel::RegisterXmppChannel(XmppChannel *channel) { } bool AgentDnsXmppChannel::SendMsg(uint8_t *msg, std::size_t len) { - if (!channel_ || channel_->GetPeerState() != xmps::READY) + if (!channel_ || channel_->GetPeerState() != xmps::READY) return false; - return channel_->Send((const uint8_t *)msg, len, xmps::DNS, + return channel_->Send((const uint8_t *)msg, len, xmps::DNS, boost::bind(&AgentDnsXmppChannel::WriteReadyCb, this, _1)); } @@ -55,7 +55,7 @@ void AgentDnsXmppChannel::ReceiveMsg(const XmppStanza::XmppMessage *msg) { std::auto_ptr impl(XmppXmlImplFactory::Instance()->GetXmlImpl()); XmlPugi *pugi = reinterpret_cast(impl.get()); XmlPugi *msg_pugi = reinterpret_cast(msg->dom.get()); - pugi->LoadXmlDoc(msg_pugi->doc()); //Verify Xmpp message format + pugi->LoadXmlDoc(msg_pugi->doc()); //Verify Xmpp message format boost::shared_ptr data(new ControllerXmppData(xmps::DNS, xmps::UNKNOWN, xs_idx_, diff --git a/src/vnsw/agent/controller/controller_export.cc b/src/vnsw/agent/controller/controller_export.cc index 472ab0fb9dc..59bbf3e0d43 100644 --- a/src/vnsw/agent/controller/controller_export.cc +++ b/src/vnsw/agent/controller/controller_export.cc @@ -15,11 +15,11 @@ #include #include -#include +#include #include #include -RouteExport::State::State() : +RouteExport::State::State() : DBState(), exported_(false), ingress_replication_exported_(false), fabric_multicast_exported_(false), force_chg_(false), label_(MplsTable::kInvalidLabel), vn_(), sg_list_(), @@ -83,7 +83,7 @@ void RouteExport::State::Update(const AgentRoute *route, const AgentPath *path) } RouteExport::RouteExport(AgentRouteTable *rt_table): - rt_table_(rt_table), marked_delete_(false), + rt_table_(rt_table), marked_delete_(false), table_delete_ref_(this, rt_table->deleter()) { walk_ref_ = rt_table->AllocWalker( boost::bind(&RouteExport::DeleteState, this, _1, _2), @@ -106,14 +106,14 @@ void RouteExport::ManagedDelete() { void RouteExport::Notify(const Agent *agent, AgentXmppChannel *bgp_xmpp_peer, bool associate, - Agent::RouteTableType type, + Agent::RouteTableType type, DBTablePartBase *partition, DBEntryBase *e) { AgentRoute *route = static_cast(e); // Primitive checks for non-delete notification if (!route->IsDeleted()) { - // If there is no active BGP peer attached to channel, ignore + // If there is no active BGP peer attached to channel, ignore // non-delete notification for this channel if (!AgentXmppChannel::IsBgpPeerActive(agent, bgp_xmpp_peer)) return; @@ -126,12 +126,12 @@ void RouteExport::Notify(const Agent *agent, // bgp peers as well as decommisioned BGP peers(if they exist). Active // and decommisoned BGP peer can co-exist till cleanup timer is fired. // During this interval ignore notification for decommisioned bgp peer - // listener id + // listener id VrfEntry *vrf = route->vrf(); BgpPeer *bgp_peer = static_cast(bgp_xmpp_peer-> bgp_peer_id()); DBTableBase::ListenerId vrf_id = bgp_peer->GetVrfExportListenerId(); - VrfExport::State *vs = + VrfExport::State *vs = static_cast(vrf->GetState(vrf->get_table(), vrf_id)); // If VRF state is not present then listener has not been added. @@ -167,7 +167,7 @@ void RouteExport::Notify(const Agent *agent, } } -void RouteExport::UnicastNotify(AgentXmppChannel *bgp_xmpp_peer, +void RouteExport::UnicastNotify(AgentXmppChannel *bgp_xmpp_peer, DBTablePartBase *partition, DBEntryBase *e, Agent::RouteTableType type) { AgentRoute *route = static_cast(e); @@ -311,7 +311,7 @@ void RouteExport::SubscribeFabricMulticast(const Agent *agent, //Agent running as tor(simulate_evpn_tor) - dont subscribe //Route has path with peer OVS_PEER i.e. TOR agent mode - dont subscribe //Subscribe condition: - //first time subscription or force change + //first time subscription or force change if (!(agent->simulate_evpn_tor()) && (active_path->peer()->GetType() != Peer::OVS_PEER) && ((state->fabric_multicast_exported_ == false) || @@ -340,9 +340,9 @@ void RouteExport::SubscribeFabricMulticast(const Agent *agent, // TSN). // // For Tor-agent its a route with tunnel NH and there is no subscription. -void RouteExport::MulticastNotify(AgentXmppChannel *bgp_xmpp_peer, +void RouteExport::MulticastNotify(AgentXmppChannel *bgp_xmpp_peer, bool associate, - DBTablePartBase *partition, + DBTablePartBase *partition, DBEntryBase *e) { Agent *agent = bgp_xmpp_peer->agent(); AgentRoute *route = static_cast(e); @@ -358,7 +358,7 @@ void RouteExport::MulticastNotify(AgentXmppChannel *bgp_xmpp_peer, //Handle withdraw for following cases: //- Route is not having any active multicast exportable path or is deleted. - //- associate(false): Bgp Peer has gone down and state needs to be removed. + //- associate(false): Bgp Peer has gone down and state needs to be removed. if (route_can_be_dissociated || !associate) { if (state == NULL) { return; @@ -422,7 +422,7 @@ void RouteExport::SubscribeIngressReplication(Agent *agent, bool bridging = false; if (route->vrf() && route->vrf()->vn() && route->vrf()->vn()->bridging()) bridging = true; - + const AgentPath *active_path = GetMulticastExportablePath(agent, route); //Sending ff:ff:ff:ff:ff:ff for evpn replication TunnelType::Type old_tunnel_type = state->tunnel_type_; @@ -441,7 +441,7 @@ void RouteExport::SubscribeIngressReplication(Agent *agent, if (old_tunnel_type == TunnelType::VXLAN) { if ((new_tunnel_type != TunnelType::VXLAN) || (old_label != new_label)) { - withdraw_label = old_label; + withdraw_label = old_label; withdraw = true; } } else if (new_tunnel_type == TunnelType::VXLAN) { @@ -540,7 +540,7 @@ void RouteExport::Unregister() { rt_table_->WalkTable(walk_ref_); } -RouteExport* RouteExport::Init(AgentRouteTable *table, +RouteExport* RouteExport::Init(AgentRouteTable *table, AgentXmppChannel *bgp_xmpp_peer) { RouteExport *rt_export = new RouteExport(table); bool associate = true; diff --git a/src/vnsw/agent/controller/controller_export.h b/src/vnsw/agent/controller/controller_export.h index f3455ea640a..ed5b8821a5f 100644 --- a/src/vnsw/agent/controller/controller_export.h +++ b/src/vnsw/agent/controller/controller_export.h @@ -59,16 +59,16 @@ class RouteExport { bool MulticastRouteCanDissociate(const AgentRoute *route); static void Walkdone(DBTable::DBTableWalkRef walk_ref, DBTableBase *table, RouteExport *rt); - static RouteExport* Init(AgentRouteTable *table, + static RouteExport* Init(AgentRouteTable *table, AgentXmppChannel *bgp_xmpp_peer); -private: +private: DBTableBase::ListenerId id_; AgentRouteTable *rt_table_; bool marked_delete_; uint32_t state_added_; void MulticastNotify(AgentXmppChannel *bgp_xmpp_peer, bool associate, DBTablePartBase *partition, DBEntryBase *e); - void UnicastNotify(AgentXmppChannel *bgp_xmpp_peer, + void UnicastNotify(AgentXmppChannel *bgp_xmpp_peer, DBTablePartBase *partition, DBEntryBase *e, Agent::RouteTableType type); void SubscribeFabricMulticast(const Agent *agent, diff --git a/src/vnsw/agent/controller/controller_ifmap.cc b/src/vnsw/agent/controller/controller_ifmap.cc index 59e764f82e1..c9ae046f6ce 100644 --- a/src/vnsw/agent/controller/controller_ifmap.cc +++ b/src/vnsw/agent/controller/controller_ifmap.cc @@ -25,10 +25,10 @@ uint64_t AgentIfMapXmppChannel::seq_number_; AgentIfMapXmppChannel::AgentIfMapXmppChannel(Agent *agent, XmppChannel *channel, - uint8_t cnt) : channel_(channel), + uint8_t cnt) : channel_(channel), xs_idx_(cnt), agent_(agent) { - channel_->RegisterReceive(xmps::CONFIG, + channel_->RegisterReceive(xmps::CONFIG, boost::bind(&AgentIfMapXmppChannel::ReceiveInternal, this, _1)); config_cleanup_timer_.reset(new ConfigCleanupTimer(agent)); @@ -164,7 +164,7 @@ static AgentXmppChannel *GetActivePeer(Agent *agent) { return peer; } - + static AgentIfMapXmppChannel *GetActiveChannel (Agent *agent, struct AgentIfMapVmExport::VmExportInfo *info) { int active_index = agent->ifmap_active_xmpp_server_index(); @@ -298,7 +298,7 @@ void AgentIfMapVmExport::NotifyAll(AgentXmppChannel *peer) { if (!AgentXmppChannel::IsBgpPeerActive(agent, peer)) { return; } - + ifmap = agent->ifmap_xmpp_channel(agent->ifmap_active_xmpp_server_index()); if (!ifmap) { return; @@ -318,7 +318,7 @@ void AgentIfMapVmExport::NotifyAll(AgentXmppChannel *peer) { vmid << vm_it->first; CONTROLLER_TRACE(IFMapVmExportTrace, vmid.str(), "", "Subscribe"); - AgentXmppChannel::ControllerSendVmCfgSubscribe(peer, + AgentXmppChannel::ControllerSendVmCfgSubscribe(peer, vm_it->first, true); //Update the sequence number so that we dont send duplicate diff --git a/src/vnsw/agent/controller/controller_ifmap.h b/src/vnsw/agent/controller/controller_ifmap.h index e30260d9634..61deb58d8bb 100644 --- a/src/vnsw/agent/controller/controller_ifmap.h +++ b/src/vnsw/agent/controller/controller_ifmap.h @@ -50,7 +50,7 @@ class AgentIfMapXmppChannel { virtual void ReceiveUpdate(const XmppStanza::XmppMessage *msg); uint8_t GetXmppServerIdx() { return xs_idx_; } static uint64_t GetSeqNumber() { return seq_number_; } - static uint64_t NewSeqNumber(); + static uint64_t NewSeqNumber(); //config cleanup timer related routines ConfigCleanupTimer *config_cleanup_timer(); @@ -95,7 +95,7 @@ class AgentIfMapVmExport { void VmiDelete(const ControllerVmiSubscribeData *entry); void VmiEvent(const ControllerVmiSubscribeData *entry); void NotifyAll(AgentXmppChannel *peer); - typedef std::map VmMap; + typedef std::map VmMap; Agent *agent() const {return agent_;} private: diff --git a/src/vnsw/agent/controller/controller_init.h b/src/vnsw/agent/controller/controller_init.h index a7e4b506d1f..7904c9776ba 100644 --- a/src/vnsw/agent/controller/controller_init.h +++ b/src/vnsw/agent/controller/controller_init.h @@ -136,7 +136,7 @@ class VNController { void increment_multicast_sequence_number() {multicast_sequence_number_++;} uint64_t multicast_sequence_number() {return multicast_sequence_number_;} - //Peer maintenace routines + //Peer maintenace routines uint8_t ActiveXmppConnectionCount(); AgentXmppChannel *GetActiveXmppChannel(); diff --git a/src/vnsw/agent/controller/controller_peer.h b/src/vnsw/agent/controller/controller_peer.h index 49bf514da9f..9f837ebc021 100644 --- a/src/vnsw/agent/controller/controller_peer.h +++ b/src/vnsw/agent/controller/controller_peer.h @@ -35,7 +35,7 @@ class ControllerEcmpRoute; class AgentXmppChannel { public: AgentXmppChannel(Agent *agent, - const std::string &xmpp_server, + const std::string &xmpp_server, const std::string &label_range, uint8_t xs_idx); virtual ~AgentXmppChannel(); @@ -52,7 +52,7 @@ class AgentXmppChannel { static bool IsXmppChannelActive(const Agent *agent, AgentXmppChannel *peer); static bool IsBgpPeerActive(const Agent *agent, AgentXmppChannel *peer); static bool SetConfigPeer(AgentXmppChannel *peer); - static void SetMulticastPeer(AgentXmppChannel *old_peer, + static void SetMulticastPeer(AgentXmppChannel *old_peer, AgentXmppChannel *new_peer); static void CleanConfigStale(AgentXmppChannel *agent_xmpp_channel); static void XmppClientChannelEvent(AgentXmppChannel *peer, diff --git a/src/vnsw/agent/controller/controller_route_path.cc b/src/vnsw/agent/controller/controller_route_path.cc index 7a1370762ca..744d5a5615e 100644 --- a/src/vnsw/agent/controller/controller_route_path.cc +++ b/src/vnsw/agent/controller/controller_route_path.cc @@ -294,7 +294,7 @@ bool ControllerVmRoute::AddChangePathExtended(Agent *agent, AgentPath *path, } TunnelType::Type new_tunnel_type = TunnelType::ComputeType(tunnel_bmap_); - if ((tunnel_bmap_ == (1 << TunnelType::VXLAN) && + if ((tunnel_bmap_ == (1 << TunnelType::VXLAN) && (new_tunnel_type != TunnelType::VXLAN)) || (tunnel_bmap_ != (1 << TunnelType::VXLAN) && (new_tunnel_type == TunnelType::VXLAN))) { diff --git a/src/vnsw/agent/controller/controller_route_path.h b/src/vnsw/agent/controller/controller_route_path.h index f153b71804f..e29219df0a6 100644 --- a/src/vnsw/agent/controller/controller_route_path.h +++ b/src/vnsw/agent/controller/controller_route_path.h @@ -71,7 +71,7 @@ class ControllerVmRoute : public ControllerPeerPath { ecmp_suppressed_(ecmp_suppressed), ecmp_load_balance_(ecmp_load_balance), etree_leaf_(etree_leaf), rewrite_dmac_(rewrite_dmac) {nh_req_.Swap(&req);} - // Data passed in case of delete from BGP peer, to validate + // Data passed in case of delete from BGP peer, to validate // the request at time of processing. ControllerVmRoute(const BgpPeer *peer) : ControllerPeerPath(peer) { } virtual ~ControllerVmRoute() { } diff --git a/src/vnsw/agent/controller/controller_route_walker.cc b/src/vnsw/agent/controller/controller_route_walker.cc index f300e124cfb..f31ccb26b07 100644 --- a/src/vnsw/agent/controller/controller_route_walker.cc +++ b/src/vnsw/agent/controller/controller_route_walker.cc @@ -28,7 +28,7 @@ ControllerRouteWalker::ControllerRouteWalker(const std::string &name, } // Takes action based on context of walk. These walks are not parallel. -// At a time peer can be only in one state. +// At a time peer can be only in one state. bool ControllerRouteWalker::VrfWalkNotify(DBTablePartBase *partition, DBEntryBase *entry) { VrfEntry *vrf = static_cast(entry); @@ -60,23 +60,23 @@ bool ControllerRouteWalker::VrfWalkNotify(DBTablePartBase *partition, } /* - * Notification for vrf entry - Creates states (VRF and route) and + * Notification for vrf entry - Creates states (VRF and route) and * send subscription to control node * This will be called for active bgp peer only. - */ -bool ControllerRouteWalker::VrfNotifyAll(DBTablePartBase *partition, + */ +bool ControllerRouteWalker::VrfNotifyAll(DBTablePartBase *partition, DBEntryBase *entry) { VrfEntry *vrf = static_cast(entry); if (peer_->GetType() == Peer::BGP_PEER) { BgpPeer *bgp_peer = static_cast(peer_); DBTableBase::ListenerId id = bgp_peer->GetVrfExportListenerId(); - VrfExport::State *state = - static_cast(vrf->GetState(partition->parent(), - id)); + VrfExport::State *state = + static_cast(vrf->GetState(partition->parent(), + id)); if (state) { - /* state for __default__ instance will not be created if the - * xmpp channel is up the first time as export code registers to + /* state for __default__ instance will not be created if the + * xmpp channel is up the first time as export code registers to * vrf-table after entry for __default__ instance is created */ state->force_chg_ = true; } @@ -114,7 +114,7 @@ bool ControllerRouteWalker::VrfDelPeer(DBTablePartBase *partition, // VRF which can cause Bug - 1495824 if (vrf->AllRouteTableDeleted()) return true; // Register Callback for deletion of VRF state on completion of route - // walks + // walks if (type_ == ControllerRouteWalker::DELPEER) { RouteWalkDoneForVrfCallback(boost::bind( &ControllerRouteWalker::RouteWalkDoneForVrf, @@ -152,7 +152,7 @@ bool ControllerRouteWalker::VrfDelStale(DBTablePartBase *partition, return false; } -bool ControllerRouteWalker::VrfNotifyMulticast(DBTablePartBase *partition, +bool ControllerRouteWalker::VrfNotifyMulticast(DBTablePartBase *partition, DBEntryBase *entry) { VrfEntry *vrf = static_cast(entry); CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Vrf Multicast", vrf->GetName(), @@ -161,7 +161,7 @@ bool ControllerRouteWalker::VrfNotifyMulticast(DBTablePartBase *partition, } //Common routeine if basic vrf and peer check is required for the walk -bool ControllerRouteWalker::VrfNotifyInternal(DBTablePartBase *partition, +bool ControllerRouteWalker::VrfNotifyInternal(DBTablePartBase *partition, DBEntryBase *entry) { VrfEntry *vrf = static_cast(entry); if (peer_->GetType() == Peer::BGP_PEER) { @@ -171,9 +171,9 @@ bool ControllerRouteWalker::VrfNotifyInternal(DBTablePartBase *partition, } DBTableBase::ListenerId id = bgp_peer->GetVrfExportListenerId(); - VrfExport::State *state = - static_cast(vrf->GetState(partition->parent(), - id)); + VrfExport::State *state = + static_cast(vrf->GetState(partition->parent(), + id)); if (state) { StartRouteWalk(vrf, associate_, type_); } @@ -184,7 +184,7 @@ bool ControllerRouteWalker::VrfNotifyInternal(DBTablePartBase *partition, } // Takes action based on context of walk. These walks are not parallel. -// At a time peer can be only in one state. +// At a time peer can be only in one state. bool ControllerRouteWalker::RouteWalkNotify(DBTablePartBase *partition, DBEntryBase *entry) { switch (type_) { @@ -202,7 +202,7 @@ bool ControllerRouteWalker::RouteWalkNotify(DBTablePartBase *partition, return false; } -bool ControllerRouteWalker::RouteNotifyInternal(DBTablePartBase *partition, +bool ControllerRouteWalker::RouteNotifyInternal(DBTablePartBase *partition, DBEntryBase *entry) { AgentRoute *route = static_cast(entry); @@ -238,18 +238,18 @@ bool ControllerRouteWalker::RouteNotifyInternal(DBTablePartBase *partition, return true; } -bool ControllerRouteWalker::RouteNotifyAll(DBTablePartBase *partition, +bool ControllerRouteWalker::RouteNotifyAll(DBTablePartBase *partition, DBEntryBase *entry) { AgentRoute *route = static_cast(entry); - CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route NotifyAll", route->ToString(), + CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route NotifyAll", route->ToString(), peer_->GetName()); return RouteNotifyInternal(partition, entry); } -bool ControllerRouteWalker::RouteNotifyMulticast(DBTablePartBase *partition, +bool ControllerRouteWalker::RouteNotifyMulticast(DBTablePartBase *partition, DBEntryBase *entry) { AgentRoute *route = static_cast(entry); - CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Multicast Notify", route->ToString(), + CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Multicast Notify", route->ToString(), peer_->GetName()); return RouteNotifyInternal(partition, entry); } @@ -281,7 +281,7 @@ bool ControllerRouteWalker::RouteDelPeer(DBTablePartBase *partition, if (!route) return true; - CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Delpeer", route->ToString(), + CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Delpeer", route->ToString(), peer_->GetName()); VrfEntry *vrf = route->vrf(); @@ -295,7 +295,7 @@ bool ControllerRouteWalker::RouteDelPeer(DBTablePartBase *partition, route->ClearState(partition->parent(), vrf_state->rt_export_[route-> GetTableType()]->GetListenerId()); delete state; - CONTROLLER_ROUTE_WALKER_TRACE(Walker, "DelPeer route walk, delete state", + CONTROLLER_ROUTE_WALKER_TRACE(Walker, "DelPeer route walk, delete state", route->ToString(), peer_->GetName()); } @@ -319,7 +319,7 @@ void ControllerRouteWalker::RouteWalkDoneForVrf(VrfEntry *vrf) { if (type_ != DELPEER) return; - CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Walk done", vrf->GetName(), + CONTROLLER_ROUTE_WALKER_TRACE(Walker, "Route Walk done", vrf->GetName(), peer_->GetName()); BgpPeer *bgp_peer = static_cast(peer_); DBEntryBase *entry = static_cast(vrf); @@ -328,7 +328,7 @@ void ControllerRouteWalker::RouteWalkDoneForVrf(VrfEntry *vrf) { } // walk_done_cb - Called back when all walk i.e. VRF and route are done. -void ControllerRouteWalker::Start(Type type, bool associate, +void ControllerRouteWalker::Start(Type type, bool associate, AgentRouteWalker::WalkDone walk_done_cb) { associate_ = associate; type_ = type; diff --git a/src/vnsw/agent/controller/controller_route_walker.h b/src/vnsw/agent/controller/controller_route_walker.h index 45e14fc9eca..693fbdf8c3c 100644 --- a/src/vnsw/agent/controller/controller_route_walker.h +++ b/src/vnsw/agent/controller/controller_route_walker.h @@ -32,7 +32,7 @@ class ControllerRouteWalker : public AgentRouteWalker { //Starts the walk- walk_done_cb is used to get callback when walk is over //i.e. all VRF and all corresponding route walks are over. - void Start(Type type, bool associate, + void Start(Type type, bool associate, AgentRouteWalker::WalkDone walk_done_cb); void StartRouteWalk(VrfEntry *vrf, bool associate, Type type); //Callback for identifying walk complete of all route tables for given vrf diff --git a/src/vnsw/agent/controller/controller_vrf_export.cc b/src/vnsw/agent/controller/controller_vrf_export.cc index 846b93220bd..e5e6f8e6eb0 100644 --- a/src/vnsw/agent/controller/controller_vrf_export.cc +++ b/src/vnsw/agent/controller/controller_vrf_export.cc @@ -17,7 +17,7 @@ #include #include -VrfExport::State::State() : DBState(), exported_(false), +VrfExport::State::State() : DBState(), exported_(false), force_chg_(false), rt_export_(), last_sequence_number_(0) { }; @@ -26,7 +26,7 @@ VrfExport::State::~State() { bool VrfExport::State::IsExportable(uint64_t sequence_number) { // Sequence number passed in argument is of channel to which this state - // belongs. Once channel sends the vrf subscription after flap/fresh + // belongs. Once channel sends the vrf subscription after flap/fresh // connection, state's sequence number will be updated to that of channel. // After this all routes in this VRF become eligible for export. // This is needed as control-node mandates that VRF is subscribed before any @@ -64,8 +64,8 @@ void VrfExport::Notify(const Agent *agent, AgentXmppChannel *bgp_xmpp_peer, if (!AgentXmppChannel::IsXmppChannelActive(agent, bgp_xmpp_peer)) { return; } - if (bgp_peer) { - CONTROLLER_TRACE(Trace, bgp_peer->GetName(), vrf->GetName(), + if (bgp_peer) { + CONTROLLER_TRACE(Trace, bgp_peer->GetName(), vrf->GetName(), "VRF deleted, remove state"); bgp_peer->DeleteVrfState(partition, e); } @@ -107,12 +107,12 @@ void VrfExport::Notify(const Agent *agent, AgentXmppChannel *bgp_xmpp_peer, if (send_subscribe && ((state->exported_ == false) || (state->force_chg_ == true))) { - if (AgentXmppChannel::ControllerSendSubscribe(bgp_xmpp_peer, vrf, + if (AgentXmppChannel::ControllerSendSubscribe(bgp_xmpp_peer, vrf, true)) { CONTROLLER_TRACE(Trace, bgp_peer->GetName(), vrf->GetName(), "Subscribe"); - state->exported_ = true; + state->exported_ = true; if (state->force_chg_ == true) { bgp_peer->route_walker()->StartRouteWalk(vrf, true, ControllerRouteWalker::NOTIFYALL); diff --git a/src/vnsw/agent/diag/diag.cc b/src/vnsw/agent/diag/diag.cc index 05f6fc827fd..2db2b2b8d05 100644 --- a/src/vnsw/agent/diag/diag.cc +++ b/src/vnsw/agent/diag/diag.cc @@ -19,7 +19,7 @@ const std::string KDiagName("DiagTimeoutHandler"); const std::string DiagTable::kDiagData = "diagshc"; -using namespace boost::posix_time; +using namespace boost::posix_time; //////////////////////////////////////////////////////////////////////////////// DiagEntry::DiagEntry(const std::string &sip, const std::string &dip, @@ -30,7 +30,7 @@ DiagEntry::DiagEntry(const std::string &sip, const std::string &dip, dip_(IpAddress::from_string(dip, ec_)), proto_(proto), sport_(sport), dport_(dport), vrf_name_(vrf_name), diag_table_(diag_table), timeout_(timeout), - timer_(TimerManager::CreateTimer(*(diag_table->agent()->event_manager())->io_service(), + timer_(TimerManager::CreateTimer(*(diag_table->agent()->event_manager())->io_service(), "DiagTimeoutHandler", TaskScheduler::GetInstance()->GetTaskId("Agent::Diag"), PktHandler::DIAG)), diff --git a/src/vnsw/agent/diag/diag.h b/src/vnsw/agent/diag/diag.h index f62887a76b9..c7c9be90dba 100644 --- a/src/vnsw/agent/diag/diag.h +++ b/src/vnsw/agent/diag/diag.h @@ -186,14 +186,14 @@ struct OverlayOamPktData { MALFORMED_ECHO_REQUEST = 1, OVERLAY_SEGMENT_NOT_PRESENT = 2, OVERLAY_SEGMENT_NOT_OPERATIONAL = 3, - RETURN_CODE_OK = 4, + RETURN_CODE_OK = 4, }; enum Replymode { DONT_REPLY = 1, REPLY_IPV4ORV6_UDP = 2, REPLY_OVERLAY_SEGMENT = 3, - }; + }; uint8_t msg_type_; uint8_t reply_mode_; diff --git a/src/vnsw/agent/diag/diag_pkt_handler.cc b/src/vnsw/agent/diag/diag_pkt_handler.cc index 1a715134ef1..d9aabf94c20 100644 --- a/src/vnsw/agent/diag/diag_pkt_handler.cc +++ b/src/vnsw/agent/diag/diag_pkt_handler.cc @@ -22,7 +22,7 @@ #include #include "services/icmpv6_handler.h" -using namespace boost::posix_time; +using namespace boost::posix_time; void DiagPktHandler::SetReply() { AgentDiagPktData *ad = (AgentDiagPktData *)pkt_info_->data; ad->op_ = htonl(AgentDiagPktData::DIAG_REPLY); @@ -111,7 +111,7 @@ bool DiagPktHandler::HandleTraceRoutePacket() { } if (rabit) { - SendOverlayResponse(); + SendOverlayResponse(); } else { if (pkt_info_->ether_type == ETHERTYPE_IP) { SendTimeExceededPacket(); @@ -253,7 +253,7 @@ bool DiagPktHandler::HandleTraceRouteResponse() { // if it is Overlay packet get the key from Oam data if (IsOverlayPingPacket()) { OverlayOamPktData *oamdata = (OverlayOamPktData *) pkt_info_->data; - key = ntohs(oamdata->org_handle_); + key = ntohs(oamdata->org_handle_); } else { if (!ParseIcmpData(data, len, (uint16_t *)&key, is_v4)) return true; @@ -287,7 +287,7 @@ bool DiagPktHandler::ParseIcmpData(const uint8_t *data, uint16_t data_len, struct ip *ip_hdr = (struct ip *)(data); *key = ntohs(ip_hdr->ip_id); uint16_t len = sizeof(struct ip); - uint8_t protocol; + uint8_t protocol; if (ip_hdr->ip_src.s_addr == htonl(agent()->router_id().to_ulong()) || ip_hdr->ip_dst.s_addr == htonl(agent()->router_id().to_ulong())) { @@ -362,7 +362,7 @@ bool DiagPktHandler::Run() { bool isoverlay_packet = IsOverlayPingPacket(); AgentDiagPktData *ad = NULL; AgentDiagPktData tempdata; - + if (IsTraceRoutePacket()) { return HandleTraceRoutePacket(); } @@ -378,7 +378,7 @@ bool DiagPktHandler::Run() { } else if (oamdata->msg_type_ == OverlayOamPktData::OVERLAY_ECHO_REPLY) { ad->op_ = htonl(AgentDiagPktData::DIAG_REPLY); } - + ad->key_ = oamdata->org_handle_; } else { ad = (AgentDiagPktData *)pkt_info_->data; @@ -402,7 +402,7 @@ bool DiagPktHandler::Run() { // Reply packet with after setting the TLV content. SendOverlayResponse(); return true; - } + } if (segment_hc_pkt) { SegmentHealthCheckReply(); } else { @@ -432,7 +432,7 @@ bool DiagPktHandler::Run() { } else { entry->Retry(); } - + return true; } @@ -625,11 +625,11 @@ void DiagPktHandler::SetReturnCode(OverlayOamPktData *oamdata) { void DiagPktHandler::TunnelHdrSwap() { struct ether_header *eth = pkt_info_->tunnel.eth; - EthHdr((char *)eth, sizeof(struct ether_header), MacAddress(eth->ether_dhost), - MacAddress(eth->ether_shost), ntohs(eth->ether_type), + EthHdr((char *)eth, sizeof(struct ether_header), MacAddress(eth->ether_dhost), + MacAddress(eth->ether_shost), ntohs(eth->ether_type), VmInterface::kInvalidVlanId); struct ip *ip = pkt_info_->tunnel.ip; - IpHdr((char *)ip, sizeof(struct ip), ntohs(ip->ip_len),ip->ip_dst.s_addr, + IpHdr((char *)ip, sizeof(struct ip), ntohs(ip->ip_len),ip->ip_dst.s_addr, ip->ip_src.s_addr, ip->ip_p, DEFAULT_IP_ID, DEFAULT_IP_TTL); } diff --git a/src/vnsw/agent/diag/diag_pkt_handler.h b/src/vnsw/agent/diag/diag_pkt_handler.h index 03b8e5b8635..9b1c6f46637 100644 --- a/src/vnsw/agent/diag/diag_pkt_handler.h +++ b/src/vnsw/agent/diag/diag_pkt_handler.h @@ -23,7 +23,7 @@ struct PseudoTcpHdr { uint8_t res; uint8_t prot; uint16_t len; - PseudoTcpHdr(in_addr_t s, in_addr_t d, uint16_t l) : + PseudoTcpHdr(in_addr_t s, in_addr_t d, uint16_t l) : src(s), dest(d), res(0), prot(6), len(l) { } }; diff --git a/src/vnsw/agent/diag/diag_proto.cc b/src/vnsw/agent/diag/diag_proto.cc index 0e0188ea134..7b2d1ae87a2 100644 --- a/src/vnsw/agent/diag/diag_proto.cc +++ b/src/vnsw/agent/diag/diag_proto.cc @@ -30,7 +30,7 @@ bool DiagProto::SegmentHealthCheckProcess( HealthCheckTable::HealthCheckServiceAction action, HealthCheckInstanceService *service) { - uint32_t intf_id = service->interface()->id(); + uint32_t intf_id = service->interface()->id(); SessionMap::iterator it = session_map_.find(intf_id); switch (action) { diff --git a/src/vnsw/agent/diag/overlay_ping.cc b/src/vnsw/agent/diag/overlay_ping.cc index d65a679372c..21a7a91a33c 100644 --- a/src/vnsw/agent/diag/overlay_ping.cc +++ b/src/vnsw/agent/diag/overlay_ping.cc @@ -7,7 +7,7 @@ #include "diag/diag.h" #include "diag/overlay_ping.h" #include -#include +#include #include using namespace boost::posix_time; @@ -20,9 +20,9 @@ OverlayPing::OverlayPing(const OverlayPingReq *ping_req, DiagTable *diag_table): ping_req->get_protocol(), ping_req->get_source_port(), ping_req->get_dest_port(), Agent::GetInstance()->fabric_vrf_name(), ping_req->get_interval() * 100, ping_req->get_count(), diag_table), - vn_uuid_(StringToUuid(ping_req->get_vn_uuid())), + vn_uuid_(StringToUuid(ping_req->get_vn_uuid())), remote_vm_mac_(ping_req->get_vm_remote_mac()), - data_len_(ping_req->get_packet_size()), + data_len_(ping_req->get_packet_size()), context_(ping_req->context()), pkt_lost_count_(0) { @@ -30,7 +30,7 @@ OverlayPing::OverlayPing(const OverlayPingReq *ping_req, DiagTable *diag_table): /* * Get the L2 Route entry to find the Tunnel NH */ -BridgeRouteEntry * +BridgeRouteEntry * OverlayPing::L2RouteGet(VxLanId* vxlan, string remotemac, Agent *agent) { string vrf_name; @@ -40,7 +40,7 @@ OverlayPing::L2RouteGet(VxLanId* vxlan, string remotemac, Agent *agent) vrf = const_cast (vrf_nh->GetVrf()); if (!vrf || vrf->IsDeleted()) { return NULL; - } else { + } else { vrf_name = vrf->GetName(); } } else { @@ -97,7 +97,7 @@ void OverlayPingReq::HandleRequest() const { int vxlan_id = vn->GetVxLanId(); VxLanId* vxlan = agent->vxlan_table()->Find(vxlan_id); - + if (!vxlan) { err_str = "Invalid vxlan segment"; goto error; @@ -130,7 +130,7 @@ OverlayPing::~OverlayPing() { * Set the Route alert bit to indicate Overlay OAM packet */ void OverlayPing::SendRequest() { - // Create VxLan packet + // Create VxLan packet Agent *agent = diag_table_->agent(); Ip4Address tunneldst; Ip4Address tunnelsrc; @@ -179,7 +179,7 @@ void OverlayPing::SendRequest() { pkt_handler->IpHdr(len + sizeof(struct ip), ntohl(tunnelsrc.to_ulong()), ntohl(tunneldst.to_ulong()), IPPROTO_UDP, DEFAULT_IP_ID, DEFAULT_IP_TTL ); - // Fill VxLan Header + // Fill VxLan Header VxlanHdr *vxlanhdr = (VxlanHdr *)(buf + sizeof(udphdr)+ sizeof(struct ip) + sizeof(struct ether_header)); vxlanhdr->vxlan_id = ntohl(vxlan_id << 8); @@ -198,7 +198,7 @@ void OverlayPing::SendRequest() { pkt_handler->UdpHdr(len, sip_.to_v4().to_ulong(), sport_, dip.to_ulong(), VXLAN_UDP_DEST_PORT); pkt_handler->IpHdr(len + sizeof(struct ip), ntohl(sip_.to_v4().to_ulong()), - ntohl(dip.to_ulong()), proto_, + ntohl(dip.to_ulong()), proto_, DEFAULT_IP_ID, DEFAULT_IP_TTL); //pkt_handler->SetDiagChkSum(); pkt_handler->pkt_info()->set_len(len_); @@ -217,12 +217,12 @@ void OverlayPing::HandleReply(DiagPktHandler *handler) { PingResp *resp = new PingResp(); OverlayOamPktData *pktdata = (OverlayOamPktData*) handler->GetData(); resp->set_seq_no(ntohl(pktdata->seq_no_)); - boost::posix_time::ptime time = microsec_clock::universal_time(); + boost::posix_time::ptime time = microsec_clock::universal_time(); boost::posix_time::time_duration rtt = time - senttime_; avg_rtt_ += rtt; std::string rtt_str; time_duration_to_string(rtt, rtt_str); - resp->set_rtt(rtt_str); + resp->set_rtt(rtt_str); resp->set_resp("Success"); resp->set_context(context_); resp->set_more(true); diff --git a/src/vnsw/agent/diag/overlay_ping.h b/src/vnsw/agent/diag/overlay_ping.h index 42173e8f90c..403cad2045c 100644 --- a/src/vnsw/agent/diag/overlay_ping.h +++ b/src/vnsw/agent/diag/overlay_ping.h @@ -8,8 +8,8 @@ #include "diag/diag.h" #include "diag/diag_types.h" #include "pkt/control_interface.h" -#include -#include +#include +#include class DiagTable; @@ -22,14 +22,14 @@ class OverlayPing : public DiagEntry { static const uint32_t kVxlanIBit = 0x08000000; static const MacAddress in_dst_mac_; static const MacAddress in_source_mac_; - + OverlayPing(const OverlayPingReq *req, DiagTable *diag_table); virtual ~OverlayPing(); virtual void SendRequest(); virtual void HandleReply(DiagPktHandler *handler); virtual void RequestTimedOut(uint32_t seq_no); virtual void SendSummary(); - static BridgeRouteEntry *L2RouteGet(VxLanId* vxlan, string remotemac, + static BridgeRouteEntry *L2RouteGet(VxLanId* vxlan, string remotemac, Agent *agent); private: uuid vn_uuid_; diff --git a/src/vnsw/agent/diag/overlay_traceroute.cc b/src/vnsw/agent/diag/overlay_traceroute.cc index 120fb3c16a6..35f06c0d65c 100644 --- a/src/vnsw/agent/diag/overlay_traceroute.cc +++ b/src/vnsw/agent/diag/overlay_traceroute.cc @@ -33,7 +33,7 @@ OverlayTraceRoute::~OverlayTraceRoute() { } -void OverlayTraceRoute::SendRequest() +void OverlayTraceRoute::SendRequest() { Agent *agent = diag_table_->agent(); Ip4Address tunneldst; @@ -47,7 +47,7 @@ void OverlayTraceRoute::SendRequest() if (!vxlan) return; - BridgeRouteEntry *rt = OverlayPing::L2RouteGet(vxlan, + BridgeRouteEntry *rt = OverlayPing::L2RouteGet(vxlan, remote_vm_mac_.ToString(), agent); if (!rt) return; @@ -83,7 +83,7 @@ void OverlayTraceRoute::SendRequest() pkt_handler->IpHdr(len + sizeof(struct ip), ntohl(tunnelsrc.to_ulong()), ntohl(tunneldst.to_ulong()), IPPROTO_UDP, DEFAULT_IP_ID, ttl_); - // Fill VxLan Header + // Fill VxLan Header VxlanHdr *vxlanhdr = (VxlanHdr *)(buf + sizeof(udphdr)+ sizeof(struct ip) + sizeof(struct ether_header)); vxlanhdr->vxlan_id = ntohl(vxlan_id << 8); @@ -99,10 +99,10 @@ void OverlayTraceRoute::SendRequest() Ip4Address dip = Ip4Address::from_string("127.0.0.1", ec); pkt_info->transp.udp = (struct udphdr *)(pkt_info->ip + 1); len = data_len+sizeof(struct udphdr); - pkt_handler->UdpHdr(len, sip_.to_v4().to_ulong(), sport_, + pkt_handler->UdpHdr(len, sip_.to_v4().to_ulong(), sport_, dip.to_ulong(), VXLAN_UDP_DEST_PORT); pkt_handler->IpHdr(len + sizeof(struct ip), ntohl(sip_.to_v4().to_ulong()), - ntohl(dip.to_ulong()), proto_, + ntohl(dip.to_ulong()), proto_, DEFAULT_IP_ID, DEFAULT_IP_TTL); //pkt_handler->SetDiagChkSum(); pkt_handler->pkt_info()->set_len(len_); @@ -110,7 +110,7 @@ void OverlayTraceRoute::SendRequest() Interface *intf = static_cast (agent->interface_table()->Find(&key1, true)); pkt_handler->Send(intf->id(), agent->fabric_vrf()->vrf_id(), - AgentHdr::TX_SWITCH, CMD_PARAM_PACKET_CTRL, + AgentHdr::TX_SWITCH, CMD_PARAM_PACKET_CTRL, CMD_PARAM_1_DIAG, PktHandler::DIAG); delete pkt_handler; @@ -161,20 +161,20 @@ void OverlayTraceReq::HandleRequest() const { int vxlan_id = vn->GetVxLanId(); VxLanId* vxlan = agent->vxlan_table()->Find(vxlan_id); - + if (!vxlan) { err_str = "Invalid vxlan segment"; goto error; } - BridgeRouteEntry *rt = OverlayPing::L2RouteGet(vxlan, + BridgeRouteEntry *rt = OverlayPing::L2RouteGet(vxlan, get_vm_remote_mac(), agent); if (!rt) { err_str = "Invalid remote mac"; goto error; } } - overlaytraceroute = new OverlayTraceRoute(this, + overlaytraceroute = new OverlayTraceRoute(this, Agent::GetInstance()->diag_table()); overlaytraceroute->Init(); overlaytraceroute->ReplyLocalHop(); @@ -208,7 +208,7 @@ void OverlayTraceRoute::HandleReply(DiagPktHandler *handler) { } struct ip *ip = handler->pkt_info()->tunnel.ip; IpAddress saddr = IpAddress(Ip4Address(ntohl(ip->ip_src.s_addr))); - TraceRoute::SendSandeshReply(saddr.to_v4().to_string(), context_, + TraceRoute::SendSandeshReply(saddr.to_v4().to_string(), context_, !handler->IsDone()); IncrementTtl(); } diff --git a/src/vnsw/agent/diag/ping.cc b/src/vnsw/agent/diag/ping.cc index 20549a1b84e..c5f80335b98 100644 --- a/src/vnsw/agent/diag/ping.cc +++ b/src/vnsw/agent/diag/ping.cc @@ -127,7 +127,7 @@ Ping::CreateUdpPkt(Agent *agent) { pkt_handler->UdpHdr(data_len_+ sizeof(udphdr), sip_.to_v4().to_ulong(), sport_, dip_.to_v4().to_ulong(), dport_); pkt_handler->IpHdr(data_len_ + sizeof(udphdr) + sizeof(struct ip), - ntohl(sip_.to_v4().to_ulong()), + ntohl(sip_.to_v4().to_ulong()), ntohl(dip_.to_v4().to_ulong()), IPPROTO_UDP, DEFAULT_IP_ID, DEFAULT_IP_TTL); pkt_handler->EthHdr(agent->vhost_interface()->mac(), diff --git a/src/vnsw/agent/diag/traceroute.cc b/src/vnsw/agent/diag/traceroute.cc index 2e7da42f9c2..a4620032472 100644 --- a/src/vnsw/agent/diag/traceroute.cc +++ b/src/vnsw/agent/diag/traceroute.cc @@ -18,7 +18,7 @@ #include "diag/diag.h" #include "diag/traceroute.h" -void +void TraceRoute::SendSandeshReply(const std::string &address, const std::string &context, bool more) { @@ -269,7 +269,7 @@ void TraceRouteReq::HandleRequest() const { nh = rt->GetActiveNextHop(); if (nh && nh->GetType() == NextHop::INTERFACE) { // Dest VM is also local - TraceRoute::SendSandeshReply(agent->router_id().to_string(), + TraceRoute::SendSandeshReply(agent->router_id().to_string(), context(), false); return; } diff --git a/src/vnsw/agent/filter/acl.cc b/src/vnsw/agent/filter/acl.cc index 4b5f8b3c249..9944ab29027 100644 --- a/src/vnsw/agent/filter/acl.cc +++ b/src/vnsw/agent/filter/acl.cc @@ -681,10 +681,10 @@ AclEntry *AclDBEntry::AddAclEntry(const AclEntrySpec &acl_entry_spec, AclEntries break; } } - + AclEntry *entry = new AclEntry(); entry->PopulateAclEntry(acl_entry_spec); - + std::vector::const_iterator it; for (it = acl_entry_spec.action_l.begin(); it != acl_entry_spec.action_l.end(); ++it) { @@ -739,31 +739,31 @@ void AclDBEntry::DeleteAllAclEntries() } bool AclDBEntry::PacketMatch(const PacketHeader &packet_header, - MatchAclParams &m_acl, FlowPolicyInfo *info) const + MatchAclParams &m_acl, FlowPolicyInfo *info) const { AclEntries::const_iterator iter; bool ret_val = false; m_acl.terminal_rule = false; - m_acl.action_info.action = 0; + m_acl.action_info.action = 0; for (iter = acl_entries_.begin(); iter != acl_entries_.end(); ++iter) { const AclEntry::ActionList &al = iter->PacketMatch(packet_header, info); - AclEntry::ActionList::const_iterator al_it; - for (al_it = al.begin(); al_it != al.end(); ++al_it) { - TrafficAction *ta = static_cast(*al_it.operator->()); - m_acl.action_info.action |= 1 << ta->action(); - if (ta->action_type() == TrafficAction::MIRROR_ACTION) { - MirrorAction *a = static_cast(*al_it.operator->()); + AclEntry::ActionList::const_iterator al_it; + for (al_it = al.begin(); al_it != al.end(); ++al_it) { + TrafficAction *ta = static_cast(*al_it.operator->()); + m_acl.action_info.action |= 1 << ta->action(); + if (ta->action_type() == TrafficAction::MIRROR_ACTION) { + MirrorAction *a = static_cast(*al_it.operator->()); MirrorActionSpec as; - as.ip = a->GetIp(); - as.port = a->GetPort(); + as.ip = a->GetIp(); + as.port = a->GetPort(); as.vrf_name = a->vrf_name(); as.analyzer_name = a->GetAnalyzerName(); as.encap = a->GetEncap(); m_acl.action_info.mirror_l.push_back(as); - } + } if (ta->action_type() == TrafficAction::VRF_TRANSLATE_ACTION) { const VrfTranslateAction *a = static_cast(*al_it.operator->()); @@ -793,7 +793,7 @@ bool AclDBEntry::PacketMatch(const PacketHeader &packet_header, info->acl_name = GetName(); } } - } + } if (!(al.empty())) { ret_val = true; m_acl.ace_id_list.push_back(iter->id()); diff --git a/src/vnsw/agent/filter/acl.h b/src/vnsw/agent/filter/acl.h index 46d5657c589..84a643280a1 100644 --- a/src/vnsw/agent/filter/acl.h +++ b/src/vnsw/agent/filter/acl.h @@ -35,7 +35,7 @@ struct FlowPolicyInfo { }; struct FlowAction { - FlowAction(): + FlowAction(): action(0), mirror_l() {}; ~FlowAction() { }; @@ -65,7 +65,7 @@ struct AclKey : public AgentOperDBKey { AclKey(const uuid &id) : AgentOperDBKey(), uuid_(id) {} ; virtual ~AclKey() {}; - uuid uuid_; + uuid uuid_; }; struct AclData: public AgentOperDBData { @@ -94,10 +94,10 @@ struct AclResyncQosConfigData : public AgentOperDBData { class AclDBEntry : AgentRefCount, public AgentOperDBEntry { public: typedef boost::intrusive::member_hook, + boost::intrusive::list_member_hook<>, &AclEntry::acl_list_node> AclEntryNode; typedef boost::intrusive::list AclEntries; - + AclDBEntry(const uuid &id) : AgentOperDBEntry(), uuid_(id), dynamic_acl_(false) { } @@ -186,9 +186,9 @@ class AclTable : public AgentOperDBTable { static DBTableBase *CreateTable(DB *db, const std::string &name); TrafficAction::Action ConvertActionString(std::string action) const; - static void AclFlowResponse(const std::string acl_uuid_str, + static void AclFlowResponse(const std::string acl_uuid_str, const std::string ctx, const int last_count); - static void AclFlowCountResponse(const std::string acl_uuid_str, + static void AclFlowCountResponse(const std::string acl_uuid_str, const std::string ctx, const std::string &ace_id); void set_ace_flow_sandesh_data_cb(FlowAceSandeshDataFn fn); @@ -198,7 +198,7 @@ class AclTable : public AgentOperDBTable { void AddUnresolvedEntry(AclDBEntry *entry); void DeleteUnresolvedEntry(AclDBEntry *entry); private: - static const AclDBEntry* GetAclDBEntry(const std::string uuid_str, + static const AclDBEntry* GetAclDBEntry(const std::string uuid_str, const std::string ctx, SandeshResponse *resp); void AddImplicitRule(AclSpec &acl_spec, AclEntrySpec &ace_spec, diff --git a/src/vnsw/agent/filter/acl_entry.cc b/src/vnsw/agent/filter/acl_entry.cc index 6935acef4c2..b181268803f 100644 --- a/src/vnsw/agent/filter/acl_entry.cc +++ b/src/vnsw/agent/filter/acl_entry.cc @@ -34,7 +34,7 @@ AclEntry::~AclEntry() { delete(*it); } matches_.clear(); - + // Clean up Actions ActionList::iterator ial; for (ial = actions_.begin(); ial != actions_.end(); ial++) { @@ -112,7 +112,7 @@ void AclEntry::PopulateAclEntry(const AclEntrySpec &acl_entry_spec) if (acl_entry_spec.protocol.size() > 0) { ProtocolMatch *proto = new ProtocolMatch(); std::vector::const_iterator it; - for (it = acl_entry_spec.protocol.begin(); + for (it = acl_entry_spec.protocol.begin(); it != acl_entry_spec.protocol.end(); it++) { proto->SetProtocolRange((*it).min, (*it).max); } @@ -122,7 +122,7 @@ void AclEntry::PopulateAclEntry(const AclEntrySpec &acl_entry_spec) if (acl_entry_spec.dst_port.size() > 0) { DstPortMatch *port = new DstPortMatch(); std::vector::const_iterator it; - for (it = acl_entry_spec.dst_port.begin(); + for (it = acl_entry_spec.dst_port.begin(); it != acl_entry_spec.dst_port.end(); it++) { port->SetPortRange((*it).min, (*it).max); } @@ -132,7 +132,7 @@ void AclEntry::PopulateAclEntry(const AclEntrySpec &acl_entry_spec) if (acl_entry_spec.src_port.size() > 0) { SrcPortMatch *port = new SrcPortMatch(); std::vector::const_iterator it; - for (it = acl_entry_spec.src_port.begin(); + for (it = acl_entry_spec.src_port.begin(); it != acl_entry_spec.src_port.end(); it++) { port->SetPortRange((*it).min, (*it).max); } @@ -221,7 +221,7 @@ bool AclEntry::ResyncQosConfigEntries() { return ret; } -void AclEntry::set_mirror_entry(MirrorEntryRef me) { +void AclEntry::set_mirror_entry(MirrorEntryRef me) { mirror_entry_ = me; } @@ -369,7 +369,7 @@ void AddressMatch::SetSource(const bool src) bool AddressMatch::SGMatch(const SecurityGroupList *sg_l, int id) const { - if (!sg_l) { + if (!sg_l) { return false; } @@ -514,7 +514,7 @@ bool AddressMatch::Match(const PacketHeader *pheader, } else if (addr_type_ == ADDRESS_GROUP) { return AddressGroupMatch(pheader->src_ip, pheader->src_tags_); } - } else { + } else { if (addr_type_ == IP_ADDR) { return SubnetMatch(ip_list_, pheader->dst_ip); } else if (addr_type_ == NETWORK_ID) { @@ -665,7 +665,7 @@ void AddressMatch::SetAclEntryMatchSandeshData(AclEntrySandeshData &data) } -void ProtocolMatch::SetProtocolRange(const uint16_t min_protocol, +void ProtocolMatch::SetProtocolRange(const uint16_t min_protocol, const uint16_t max_protocol) { Range *protocol_range = new Range(min_protocol, max_protocol); @@ -697,7 +697,7 @@ bool ProtocolMatch::Compare(const AclEntryMatch &rhs) const { bool ProtocolMatch::Match(const PacketHeader *packet_header, FlowPolicyInfo *info) const { - for (RangeSList::const_iterator it = protocol_ranges_.begin(); + for (RangeSList::const_iterator it = protocol_ranges_.begin(); it != protocol_ranges_.end(); it++) { if(packet_header->protocol < (*it).min || packet_header->protocol > (*it).max) { @@ -711,7 +711,7 @@ bool ProtocolMatch::Match(const PacketHeader *packet_header, void ProtocolMatch::SetAclEntryMatchSandeshData(AclEntrySandeshData &data) { - for (RangeSList::const_iterator it = protocol_ranges_.begin(); + for (RangeSList::const_iterator it = protocol_ranges_.begin(); it != protocol_ranges_.end(); it++) { class SandeshRange proto; proto.min = (*it).min; @@ -904,7 +904,7 @@ bool SrcPortMatch::Match(const PacketHeader *packet_header, return true; } - for (RangeSList::const_iterator it = port_ranges_.begin(); + for (RangeSList::const_iterator it = port_ranges_.begin(); it != port_ranges_.end(); it++) { if(packet_header->src_port < (*it).min || packet_header->src_port > (*it).max) { @@ -918,7 +918,7 @@ bool SrcPortMatch::Match(const PacketHeader *packet_header, void SrcPortMatch::SetAclEntryMatchSandeshData(AclEntrySandeshData &data) { - for (RangeSList::const_iterator it = port_ranges_.begin(); + for (RangeSList::const_iterator it = port_ranges_.begin(); it != port_ranges_.end(); it++) { class SandeshRange port; port.min = (*it).min; @@ -936,7 +936,7 @@ bool DstPortMatch::Match(const PacketHeader *packet_header, return true; } - for (RangeSList::const_iterator it = port_ranges_.begin(); + for (RangeSList::const_iterator it = port_ranges_.begin(); it != port_ranges_.end(); it++) { if(packet_header->dst_port < (*it).min || packet_header->dst_port > (*it).max) { @@ -950,7 +950,7 @@ bool DstPortMatch::Match(const PacketHeader *packet_header, void DstPortMatch::SetAclEntryMatchSandeshData(AclEntrySandeshData &data) { - for (RangeSList::const_iterator it = port_ranges_.begin(); + for (RangeSList::const_iterator it = port_ranges_.begin(); it != port_ranges_.end(); it++) { class SandeshRange port; port.min = (*it).min; diff --git a/src/vnsw/agent/filter/acl_entry.h b/src/vnsw/agent/filter/acl_entry.h index 780fab21b58..da8e7cc9b31 100644 --- a/src/vnsw/agent/filter/acl_entry.h +++ b/src/vnsw/agent/filter/acl_entry.h @@ -93,7 +93,7 @@ class AclEntry { typedef std::list ActionList; static ActionList kEmptyActionList; - AclEntry() : + AclEntry() : id_(0), type_(TERMINAL), matches_(), actions_(), mirror_entry_(NULL), uuid_() {} @@ -102,7 +102,7 @@ class AclEntry { uuid_() {} ~AclEntry(); - + // Create the entry void PopulateAclEntry(const AclEntrySpec &acl_entry_spec); // Set Mirror ref diff --git a/src/vnsw/agent/filter/acl_entry_match.h b/src/vnsw/agent/filter/acl_entry_match.h index 5473d079f6b..d13a5bb80ac 100644 --- a/src/vnsw/agent/filter/acl_entry_match.h +++ b/src/vnsw/agent/filter/acl_entry_match.h @@ -73,11 +73,11 @@ struct Range { } }; -typedef boost::intrusive::member_hook, +typedef boost::intrusive::member_hook, &Range::node > RangeNode; -typedef boost::intrusive::slist > RangeSList; diff --git a/src/vnsw/agent/filter/policy.cc b/src/vnsw/agent/filter/policy.cc index f0ec56de60b..d8e47c8064d 100644 --- a/src/vnsw/agent/filter/policy.cc +++ b/src/vnsw/agent/filter/policy.cc @@ -16,7 +16,7 @@ void PolicyData::Init(const PolicyConfigSpec &policy_cfg) { acl_id_ = policy_cfg.acl_id; } -Policy::Policy(const uuid id) : policy_id_(id) +Policy::Policy(const uuid id) : policy_id_(id) { std::stringstream ss; ss << policy_id_; @@ -141,7 +141,7 @@ DBEntryBase::KeyPtr Policy::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void Policy::SetKey(const DBRequestKey *key) { +void Policy::SetKey(const DBRequestKey *key) { const PolicyKey *k = static_cast(key); LOG(DEBUG, "Policy::SetKey"); policy_id_ = k->id_; diff --git a/src/vnsw/agent/filter/policy.h b/src/vnsw/agent/filter/policy.h index 8212521fd85..009ab1e2545 100644 --- a/src/vnsw/agent/filter/policy.h +++ b/src/vnsw/agent/filter/policy.h @@ -60,7 +60,7 @@ class PolicyTable : public DBTable { public: PolicyTable(DB *db, const std::string &name) : DBTable(db, name) { }; ~PolicyTable() { }; - + virtual std::auto_ptr AllocEntry(const DBRequestKey *key) const; int Hash(const DBEntry *entry) const {return 0;}; diff --git a/src/vnsw/agent/filter/test/acl_change_test.cc b/src/vnsw/agent/filter/test/acl_change_test.cc index c09b8fc5715..be99f6a74f1 100644 --- a/src/vnsw/agent/filter/test/acl_change_test.cc +++ b/src/vnsw/agent/filter/test/acl_change_test.cc @@ -285,7 +285,7 @@ class AclTest : public ::testing::Test { sport_end, dest_ip.c_str(), dest_plen, dport_start, dport_end); return std::string(buff); } - void AddIpAcl(std::string name, uint32_t id, std::string source_ip, + void AddIpAcl(std::string name, uint32_t id, std::string source_ip, uint32_t source_plen, std::string dest_ip, uint32_t dest_plen, std::string proto, uint32_t sport_start, uint32_t sport_end, uint32_t dport_start, uint32_t dport_end, std::string action) { @@ -303,10 +303,10 @@ class AclTest : public ::testing::Test { AddAcl(name, id, buff); } - void AddIpAcl(std::string name, uint32_t id, std::string source_ip, + void AddIpAcl(std::string name, uint32_t id, std::string source_ip, uint32_t source_plen, std::string dest_ip, uint32_t dest_plen, std::string action) { - AddIpAcl(name, id, source_ip, source_plen, dest_ip, dest_plen, "all", + AddIpAcl(name, id, source_ip, source_plen, dest_ip, dest_plen, "all", 0, 65535, 0, 65535, "pass"); } diff --git a/src/vnsw/agent/filter/test/acl_entry_test.cc b/src/vnsw/agent/filter/test/acl_entry_test.cc index c9194a52029..503acf2187a 100644 --- a/src/vnsw/agent/filter/test/acl_entry_test.cc +++ b/src/vnsw/agent/filter/test/acl_entry_test.cc @@ -26,7 +26,7 @@ TEST_F(AclEntryTest, Basic) { AclEntrySpec ae_spec1; ae_spec1.id = 1; ae_spec1.BuildAddressInfo("1.1.1.1", 32, &ae_spec1.src_ip_list); - ae_spec1.src_addr_type = AddressMatch::IP_ADDR; + ae_spec1.src_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; protocol.max = 10; @@ -155,7 +155,7 @@ TEST_F(AclEntryTest, SubnetAddress) { AclEntrySpec ae_spec1; ae_spec1.id = 1; ae_spec1.BuildAddressInfo("1.1.1.0", 24, &ae_spec1.src_ip_list); - ae_spec1.src_addr_type = AddressMatch::IP_ADDR; + ae_spec1.src_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; protocol.max = 10; @@ -199,7 +199,7 @@ TEST_F(AclEntryTest, SubnetAddress) { packet1->dst_port = 99; al = entry1->PacketMatch(*packet1, &info); EXPECT_EQ(1U, al.size()); - EXPECT_EQ(SimpleAction::PASS, static_cast(*ial.operator->())->action()); + EXPECT_EQ(SimpleAction::PASS, static_cast(*ial.operator->())->action()); //EXPECT_TRUE(entry1->Match(packet1)); packet1->src_ip = Ip4Address(0x01010101); @@ -241,7 +241,7 @@ TEST_F(AclEntryTest, BasicAccept) { ae_spec1.id = 1; ae_spec1.BuildAddressInfo("1.1.1.0", 24, &ae_spec1.src_ip_list); - ae_spec1.src_addr_type = AddressMatch::IP_ADDR; + ae_spec1.src_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; protocol.max = 10; @@ -339,7 +339,7 @@ TEST_F(AclEntryTest, BasicDeny) { ae_spec1.id = 1; ae_spec1.BuildAddressInfo("1.1.1.0", 24, &ae_spec1.src_ip_list); - ae_spec1.src_addr_type = AddressMatch::IP_ADDR; + ae_spec1.src_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; protocol.max = 10; @@ -436,7 +436,7 @@ TEST_F(AclEntryTest, BasicIntrospecIpAclEntry) { AclEntrySpec ae_spec1; ae_spec1.id = 1; ae_spec1.BuildAddressInfo("2.2.2.0", 24, &ae_spec1.src_ip_list); - ae_spec1.src_addr_type = AddressMatch::IP_ADDR; + ae_spec1.src_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; protocol.max = 10; @@ -545,7 +545,7 @@ TEST_F(AclEntryTest, BasicIntrospecSgAclEntry) { ae_spec1.src_addr_type = AddressMatch::SG; ae_spec1.BuildAddressInfo("2.2.2.0", 24, &ae_spec1.dst_ip_list); - ae_spec1.dst_addr_type = AddressMatch::IP_ADDR; + ae_spec1.dst_addr_type = AddressMatch::IP_ADDR; RangeSpec protocol; protocol.min = 10; diff --git a/src/vnsw/agent/filter/test/acl_test.cc b/src/vnsw/agent/filter/test/acl_test.cc index 473a874d720..5847ae2a0a4 100644 --- a/src/vnsw/agent/filter/test/acl_test.cc +++ b/src/vnsw/agent/filter/test/acl_test.cc @@ -81,7 +81,7 @@ static string AddAclXmlString(const char *node_name, const char *name, int id) { static string AddNodeXmlString(const char *node_name, const char *name, int id) { char buff[1024]; - sprintf(buff, + sprintf(buff, "\n" "\n" " \n" @@ -121,7 +121,7 @@ void AddAclFromFile() { pugi::xml_parse_result result = xdoc_.load_file("controller/src/vnsw/agent/filter/test/acl_cfg_test.xml"); EXPECT_TRUE(result); - Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0); + Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0); } // Create and delete ACEs @@ -138,7 +138,7 @@ TEST_F(AclTest, Basic) { AclEntrySpec ae_spec; ae_spec.id = 10; acl_spec.acl_entry_specs_.push_back(ae_spec); - + DBRequest req; AclKey *key = new AclKey(acl_id); AclData *pd = new AclData(Agent::GetInstance(), NULL, acl_spec); @@ -160,7 +160,7 @@ TEST_F(AclTest, Basic) { action.simple_action = TrafficAction::PASS; ae_spec1.action_l.push_back(action); acl_spec1.acl_entry_specs_.push_back(ae_spec1); - + DBRequest req1; AclKey *key1 = new AclKey(acl_id); AclData *pd1 = new AclData(Agent::GetInstance(), NULL, acl_spec1); @@ -170,7 +170,7 @@ TEST_F(AclTest, Basic) { req1.oper = DBRequest::DB_ENTRY_ADD_CHANGE; table->Enqueue(&req1); client->WaitForIdle(); - + AclKey key_1 = AclKey(acl_id); EXPECT_TRUE(NULL != table->FindActiveEntry(&key_1)); @@ -201,7 +201,7 @@ TEST_F(AclTest, Basic1) { action.simple_action = TrafficAction::DENY; ae_spec.action_l.push_back(action); acl_spec.acl_entry_specs_.push_back(ae_spec); - + AclEntrySpec ae_spec1; ae_spec1.id = 10; @@ -287,7 +287,7 @@ TEST_F(AclTest, PacketMatching) { TEST_F(AclTest, Config) { pugi::xml_document xdoc_; xdoc_.load_file("controller/src/vnsw/agent/filter/test/acl_cfg_test.xml"); - Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0); + Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc_.first_child(), 0); client->WaitForIdle(); AclTable *table = Agent::GetInstance()->acl_table(); diff --git a/src/vnsw/agent/filter/traffic_action.cc b/src/vnsw/agent/filter/traffic_action.cc index f7c66206e85..e8edc8906f5 100644 --- a/src/vnsw/agent/filter/traffic_action.cc +++ b/src/vnsw/agent/filter/traffic_action.cc @@ -32,7 +32,7 @@ bool TrafficAction::IsDrop() const { std::string TrafficAction::ActionToString(enum Action at) { switch(at) { - case ALERT: + case ALERT: return kActionAlertStr; case DENY: return("deny"); diff --git a/src/vnsw/agent/filter/traffic_action.h b/src/vnsw/agent/filter/traffic_action.h index a81027cd8ac..a82bcaff761 100644 --- a/src/vnsw/agent/filter/traffic_action.h +++ b/src/vnsw/agent/filter/traffic_action.h @@ -57,7 +57,7 @@ class TrafficAction { Action action() const {return action_;} TrafficActionType action_type() const {return action_type_;} static std::string ActionToString(enum Action at); - virtual void SetActionSandeshData(std::vector &actions); + virtual void SetActionSandeshData(std::vector &actions); virtual bool Compare(const TrafficAction &rhs) const = 0; bool operator==(const TrafficAction &rhs) const { if (action_type_ != rhs.action_type_) { @@ -89,7 +89,7 @@ class SimpleAction : public TrafficAction { class MirrorAction : public TrafficAction { public: - MirrorAction(std::string analyzer_name, std::string vrf_name, + MirrorAction(std::string analyzer_name, std::string vrf_name, IpAddress ip, uint16_t port, std::string encap) : TrafficAction(MIRROR, MIRROR_ACTION), analyzer_name_(analyzer_name), vrf_name_(vrf_name), m_ip_(ip), port_(port), encap_(encap) {} @@ -99,7 +99,7 @@ class MirrorAction : public TrafficAction { std::string vrf_name() {return vrf_name_;} std::string GetAnalyzerName() {return analyzer_name_;} std::string GetEncap() {return encap_;} - virtual void SetActionSandeshData(std::vector &actions); + virtual void SetActionSandeshData(std::vector &actions); virtual bool Compare(const TrafficAction &rhs) const; private: std::string analyzer_name_; diff --git a/src/vnsw/agent/init/agent_param.cc b/src/vnsw/agent/init/agent_param.cc index c0c24eb36c0..56a2087bedc 100644 --- a/src/vnsw/agent/init/agent_param.cc +++ b/src/vnsw/agent/init/agent_param.cc @@ -221,13 +221,13 @@ std::map > AgentParam::ParseDerivedStats(const std::vector &dsvec) { std::map > dsmap; std::map >::iterator dsiter; - + for (size_t idx=0; idx!=dsvec.size(); idx++) { size_t pos = dsvec[idx].find(':'); assert(pos != string::npos); string dsfull = dsvec[idx].substr(0,pos); string dsarg = dsvec[idx].substr(pos+1, string::npos); - + size_t dpos = dsfull.find('.'); assert(dpos != string::npos); string dsstruct = dsfull.substr(0,dpos); @@ -237,7 +237,7 @@ AgentParam::ParseDerivedStats(const std::vector &dsvec) { std::map dselem; if (dsiter!=dsmap.end()) dselem = dsiter->second; dselem[dsattr] = dsarg; - + dsmap[dsstruct] = dselem; } return dsmap; @@ -502,7 +502,7 @@ void AgentParam::ParseDefaultSectionArguments GetOptValue(var_map, xmpp_dns_auth_enable_, "DEFAULT.xmpp_dns_auth_enable"); GetOptValue(var_map, xmpp_server_cert_, "DEFAULT.xmpp_server_cert"); - GetOptValue(var_map, xmpp_server_key_, + GetOptValue(var_map, xmpp_server_key_, "DEFAULT.xmpp_server_key"); GetOptValue(var_map, xmpp_ca_cert_, "DEFAULT.xmpp_ca_cert"); @@ -830,7 +830,7 @@ void AgentParam::ReInitFromConfig() { } config_file_in.close(); LOG(DEBUG, "Config file re-parsing completed. \n"); - + return; } @@ -1104,7 +1104,7 @@ void AgentParam::LogFilteredConfig() const { } LOG(DEBUG, "COLLECTOR Servers : " << concat_servers); } - + void AgentParam::LogConfig() const { LOG(DEBUG, "vhost interface name : " << vhost_.name_); LOG(DEBUG, "vhost IP Address : " << vhost_.addr_.to_string() @@ -1117,7 +1117,7 @@ void AgentParam::LogConfig() const { std::vector::iterator iter; for (iter = list.begin(); iter != list.end(); iter++) { - concat_servers += *iter + " "; + concat_servers += *iter + " "; } LOG(DEBUG, "Xmpp Servers : " << concat_servers); LOG(DEBUG, "Xmpp Authentication : " << xmpp_auth_enable_); @@ -1131,7 +1131,7 @@ void AgentParam::LogConfig() const { concat_servers.clear(); list = dns_server_list(); for (iter = list.begin(); - iter != list.end(); iter++) { + iter != list.end(); iter++) { concat_servers += *iter + " "; } LOG(DEBUG, "DNS Servers : " << concat_servers); @@ -1148,7 +1148,7 @@ void AgentParam::LogConfig() const { concat_servers.clear(); list = tsn_server_list(); for (iter = list.begin(); - iter != list.end(); iter++) { + iter != list.end(); iter++) { concat_servers += *iter + " "; } LOG(DEBUG, "TSN Servers : " << concat_servers); @@ -1156,7 +1156,7 @@ void AgentParam::LogConfig() const { list = collector_server_list(); for (iter = list.begin(); - iter != list.end(); iter++) { + iter != list.end(); iter++) { concat_servers += *iter + " "; } LOG(DEBUG, "COLLECTOR Servers : " << concat_servers); @@ -1309,7 +1309,7 @@ AgentParam::AgentParam(bool enable_flow_options, subcluster_name_(), dns_client_port_(0), dns_timeout_(3000), dns_max_retries_(2), mirror_client_port_(0), - mgmt_ip_(), hypervisor_mode_(MODE_KVM), + mgmt_ip_(), hypervisor_mode_(MODE_KVM), xen_ll_(), tunnel_type_(), metadata_shared_secret_(), metadata_proxy_port_(0), metadata_use_ssl_(false), metadata_client_cert_(""), metadata_client_cert_type_("PEM"), diff --git a/src/vnsw/agent/init/agent_param.h b/src/vnsw/agent/init/agent_param.h index 7c271d05b39..49f63675791 100644 --- a/src/vnsw/agent/init/agent_param.h +++ b/src/vnsw/agent/init/agent_param.h @@ -13,7 +13,7 @@ class Agent; class VirtualGatewayConfigTable; struct LlgrParams { -public: +public: //In seconds static const int kStaleConfigCleanupTime = 100; static const int kConfigPollTime = 5; @@ -43,14 +43,14 @@ struct LlgrParams { */ uint16_t config_inactivity_time() const { return config_inactivity_time_; - } + } /* * config_fallback_time_ - Maximum time to wait for silence. In case * silence is never seen use this time to conclude end of config. */ uint16_t config_fallback_time() const { return config_fallback_time_; - } + } /* * end_of_rib_tx_poll_time_ - End of rib timer poll time. @@ -89,7 +89,7 @@ struct LlgrParams { return llgr_stale_time_; } -private: +private: friend class AgentParam; /** stale config cleanup time */ @@ -107,7 +107,7 @@ struct LlgrParams { uint32_t llgr_stale_time_; }; -// Class handling agent configuration parameters from config file and +// Class handling agent configuration parameters from config file and // arguments class AgentParam { public: @@ -153,7 +153,7 @@ class AgentParam { }; struct PortInfo { - PortInfo() : + PortInfo() : name_(""), vrf_(""), addr_(0), prefix_(0), plen_(0), gw_(0) {} ~PortInfo() { }; @@ -188,7 +188,7 @@ class AgentParam { const Ip4Address &vhost_gw() const { return vhost_.gw_; } const std::string &xen_ll_name() const { return xen_ll_.name_; } - const void set_xen_ll_name(const std::string &name) { + const void set_xen_ll_name(const std::string &name) { xen_ll_.name_ = name; } const Ip4Address &xen_ll_addr() const { return xen_ll_.addr_; } @@ -310,7 +310,7 @@ class AgentParam { void set_subnet_hosts_resolvable(bool val) { subnet_hosts_resolvable_ = val; } - VirtualGatewayConfigTable *vgw_config_table() const { + VirtualGatewayConfigTable *vgw_config_table() const { return vgw_config_table_.get(); } const std::string &vmware_physical_port() const { @@ -567,7 +567,7 @@ class AgentParam { Ip4Address *server, uint16_t *port); bool ParseServerList(const std::string &key, Ip4Address *server1, uint16_t *port1, Ip4Address *server2, uint16_t *port2); - void ParseIpArgument(const boost::program_options::variables_map &var_map, + void ParseIpArgument(const boost::program_options::variables_map &var_map, Ip4Address &server, const std::string &key); bool ParseServerListArguments (const boost::program_options::variables_map &var_map, Ip4Address &server1, diff --git a/src/vnsw/agent/init/contrail_init_common.cc b/src/vnsw/agent/init/contrail_init_common.cc index 1983989daec..ef8f7a23707 100644 --- a/src/vnsw/agent/init/contrail_init_common.cc +++ b/src/vnsw/agent/init/contrail_init_common.cc @@ -159,7 +159,7 @@ void ContrailInitCommon::ProcessComputeAddress(AgentParam *param) { // If compute_node_address are specified, it will mean user wants // to run services such as metadata on an IP different than vhost. - // Set compute_node_ip_ to vhost_addr if no compute_node_address are + // Set compute_node_ip_ to vhost_addr if no compute_node_address are // specified. Else, pick first address to run in compute_node_address_list // // The compute_node_ip is used only in adding Flow NAT rules. diff --git a/src/vnsw/agent/init/contrail_init_common.h b/src/vnsw/agent/init/contrail_init_common.h index 7fb1b366830..eddc5c1d9fe 100644 --- a/src/vnsw/agent/init/contrail_init_common.h +++ b/src/vnsw/agent/init/contrail_init_common.h @@ -11,7 +11,7 @@ class Agent; class AgentParam; -// The class to drive agent initialization. +// The class to drive agent initialization. // Defines control parameters used to enable/disable agent features class ContrailInitCommon : public AgentInit { public: diff --git a/src/vnsw/agent/init/test/test_agent_init.cc b/src/vnsw/agent/init/test/test_agent_init.cc index b0108c98c8b..a24c7e02f46 100644 --- a/src/vnsw/agent/init/test/test_agent_init.cc +++ b/src/vnsw/agent/init/test/test_agent_init.cc @@ -39,14 +39,14 @@ TEST_F(AgentParamTest, Agent_Conf_file_1) { Ip4Address::from_string("10.1.1.254").to_ulong()); EXPECT_STREQ(param.eth_port().c_str(), "vnet0"); - EXPECT_EQ(param.controller_server_list().size(), 1); + EXPECT_EQ(param.controller_server_list().size(), 1); std::vectorservers; - boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("127.0.0.1", servers[0].c_str()); + boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("127.0.0.1", servers[0].c_str()); EXPECT_EQ(param.dns_server_list().size(), 1); - boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("127.0.0.1", servers[0].c_str()); + boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("127.0.0.1", servers[0].c_str()); EXPECT_EQ(param.mgmt_ip().to_ulong(), 0); EXPECT_STREQ(param.tunnel_type().c_str(), "MPLSoGRE"); @@ -60,7 +60,7 @@ TEST_F(AgentParamTest, Agent_Conf_file_1) { EXPECT_EQ(param.linklocal_vm_flows(), 512); EXPECT_EQ(param.flow_cache_timeout(), 30); EXPECT_EQ(param.stale_interface_cleanup_timeout(), 120); - EXPECT_STREQ(param.config_file().c_str(), + EXPECT_STREQ(param.config_file().c_str(), "controller/src/vnsw/agent/init/test/cfg.ini"); EXPECT_STREQ(param.program_name().c_str(), "test-param"); EXPECT_EQ(param.agent_mode(), AgentParam::VROUTER_AGENT); @@ -108,19 +108,19 @@ TEST_F(AgentParamTest, Agent_Conf_file_2) { EXPECT_EQ(param.max_vm_flows(), 100); EXPECT_EQ(param.linklocal_system_flows(), 2048); EXPECT_EQ(param.linklocal_vm_flows(), 2048); - + std::vectorservers; EXPECT_EQ(param.controller_server_list().size(), 2); - boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("11.1.1.1", servers[0].c_str()); - boost::split(servers, param.controller_server_list()[1], boost::is_any_of(":")); - EXPECT_STREQ("12.1.1.1", servers[0].c_str()); - + boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("11.1.1.1", servers[0].c_str()); + boost::split(servers, param.controller_server_list()[1], boost::is_any_of(":")); + EXPECT_STREQ("12.1.1.1", servers[0].c_str()); + EXPECT_EQ(param.dns_server_list().size(), 2); - boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("13.1.1.1", servers[0].c_str()); - boost::split(servers, param.dns_server_list()[1], boost::is_any_of(":")); - EXPECT_STREQ("14.1.1.1", servers[0].c_str()); + boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("13.1.1.1", servers[0].c_str()); + boost::split(servers, param.dns_server_list()[1], boost::is_any_of(":")); + EXPECT_STREQ("14.1.1.1", servers[0].c_str()); EXPECT_EQ(param.agent_mode(), AgentParam::VROUTER_AGENT); EXPECT_EQ(param.dhcp_relay_mode(), false); @@ -284,7 +284,7 @@ TEST_F(AgentParamTest, Agent_Param_1) { int argc = 24; char *argv[] = { (char *) "", - (char *) "--config_file", + (char *) "--config_file", (char *)"controller/src/vnsw/agent/init/test/cfg.ini", (char *) "--DEFAULT.collectors", (char *)"1.1.1.1:1000", (char *) "--DEFAULT.derived_stats", (char *)"DSStruct.dsattr:dsparam", @@ -332,7 +332,7 @@ TEST_F(AgentParamTest, Agent_Arg_Override_Config_1) { (char *) "", (char *) "--config_file", (char *)"controller/src/vnsw/agent/init/test/cfg.ini", - (char *) "--HYPERVISOR.type", (char *)"xen", + (char *) "--HYPERVISOR.type", (char *)"xen", (char *) "--HYPERVISOR.xen_ll_interface", (char *)"xenport", (char *) "--HYPERVISOR.xen_ll_ip", (char *)"1.1.1.2/16", }; @@ -341,7 +341,7 @@ TEST_F(AgentParamTest, Agent_Arg_Override_Config_1) { param.ParseArguments(argc, argv); param.Init("controller/src/vnsw/agent/init/test/cfg.ini", "test-param"); - EXPECT_STREQ(param.config_file().c_str(), + EXPECT_STREQ(param.config_file().c_str(), "controller/src/vnsw/agent/init/test/cfg.ini"); EXPECT_EQ(param.mode(), AgentParam::MODE_XEN); EXPECT_STREQ(param.xen_ll_name().c_str(), "xenport"); @@ -356,7 +356,7 @@ TEST_F(AgentParamTest, Agent_Arg_Override_Config_2) { int argc = 7; char *argv[] = { (char *) "", - (char *) "--CONTROL-NODE.servers", (char *)"20.1.1.1:500", (char *)"21.1.1.1:15001", + (char *) "--CONTROL-NODE.servers", (char *)"20.1.1.1:500", (char *)"21.1.1.1:15001", (char *) "--DNS.servers", (char *)"22.1.1.1:53", (char *)"23.1.1.1:53", }; @@ -366,16 +366,16 @@ TEST_F(AgentParamTest, Agent_Arg_Override_Config_2) { std::vectorservers; EXPECT_EQ(param.controller_server_list().size(), 2); - boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("20.1.1.1", servers[0].c_str()); - boost::split(servers, param.controller_server_list()[1], boost::is_any_of(":")); - EXPECT_STREQ("21.1.1.1", servers[0].c_str()); - + boost::split(servers, param.controller_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("20.1.1.1", servers[0].c_str()); + boost::split(servers, param.controller_server_list()[1], boost::is_any_of(":")); + EXPECT_STREQ("21.1.1.1", servers[0].c_str()); + EXPECT_EQ(param.dns_server_list().size(), 2); - boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); - EXPECT_STREQ("22.1.1.1", servers[0].c_str()); - boost::split(servers, param.dns_server_list()[1], boost::is_any_of(":")); - EXPECT_STREQ("23.1.1.1", servers[0].c_str()); + boost::split(servers, param.dns_server_list()[0], boost::is_any_of(":")); + EXPECT_STREQ("22.1.1.1", servers[0].c_str()); + boost::split(servers, param.dns_server_list()[1], boost::is_any_of(":")); + EXPECT_STREQ("23.1.1.1", servers[0].c_str()); } /* Some command line args have default values. If user has not passed these @@ -431,8 +431,8 @@ TEST_F(AgentParamTest, Default_Cmdline_arg2) { EXPECT_TRUE(param.log_local()); } -/* Some command line args have default values. If user has explicitly passed - * values for these command line args and has also specified values in config +/* Some command line args have default values. If user has explicitly passed + * values for these command line args and has also specified values in config * file, then values specified on command line should be taken */ TEST_F(AgentParamTest, Default_Cmdline_arg3) { int argc = 11; diff --git a/src/vnsw/agent/kstate/drop_stats_kstate.cc b/src/vnsw/agent/kstate/drop_stats_kstate.cc index d326094bf37..8b4db7ce012 100644 --- a/src/vnsw/agent/kstate/drop_stats_kstate.cc +++ b/src/vnsw/agent/kstate/drop_stats_kstate.cc @@ -10,12 +10,12 @@ using namespace std; -DropStatsKState::DropStatsKState(KDropStatsResp *obj, +DropStatsKState::DropStatsKState(KDropStatsResp *obj, const std::string &resp_ctx, - vr_drop_stats_req &req) + vr_drop_stats_req &req) : KState(resp_ctx, obj) { req.set_h_op(sandesh_op::GET); - req.set_vds_rid(0); + req.set_vds_rid(0); } void DropStatsKState::Handler() { diff --git a/src/vnsw/agent/kstate/flow_kstate.cc b/src/vnsw/agent/kstate/flow_kstate.cc index 0c63c42849e..256ff3894ab 100644 --- a/src/vnsw/agent/kstate/flow_kstate.cc +++ b/src/vnsw/agent/kstate/flow_kstate.cc @@ -25,7 +25,7 @@ FlowKState::FlowKState(Agent *agent, const string &resp_ctx, int idx) : flow_iteration_key_(0), agent_(agent) { } -FlowKState::FlowKState(Agent *agent, const string &resp_ctx, +FlowKState::FlowKState(Agent *agent, const string &resp_ctx, const string &iter_idx) : Task((TaskScheduler::GetInstance()->GetTaskId("Agent::FlowResponder")), 0), response_context_(resp_ctx), flow_idx_(-1), evicted_(0), @@ -177,8 +177,8 @@ void FlowKState::SetFlowHandle(KFlowResp *resp, const uint32_t idx) const { } } -void FlowKState::SetFlowData(vector &list, - const vr_flow_entry *k_flow, +void FlowKState::SetFlowData(vector &list, + const vr_flow_entry *k_flow, const int index) const { KFlowInfo data; bool action_drop = false; @@ -313,7 +313,7 @@ bool FlowKState::Run() { } uint32_t idx = flow_iteration_key_; uint32_t max_flows = ksync_obj->table_entries_count(); - + resp = new KFlowResp(); vector &list = const_cast&> (resp->get_flow_list()); diff --git a/src/vnsw/agent/kstate/flow_kstate.h b/src/vnsw/agent/kstate/flow_kstate.h index 2bea07b05dd..8c4d2124c94 100644 --- a/src/vnsw/agent/kstate/flow_kstate.h +++ b/src/vnsw/agent/kstate/flow_kstate.h @@ -8,10 +8,10 @@ class FlowKState : public Task { public: FlowKState(Agent *agent, const std::string &resp_ctx, int idx); - FlowKState(Agent *agent, const std::string &resp_ctx, + FlowKState(Agent *agent, const std::string &resp_ctx, const std::string &iter_idx); virtual void SendResponse(KFlowResp *resp) const; - + virtual bool Run(); std::string Description() const { return "FlowKState"; } void SetFlowData(std::vector &list, const vr_flow_entry *k_flow, diff --git a/src/vnsw/agent/kstate/interface_kstate.cc b/src/vnsw/agent/kstate/interface_kstate.cc index 10a411c3f16..eb9c829aaa1 100644 --- a/src/vnsw/agent/kstate/interface_kstate.cc +++ b/src/vnsw/agent/kstate/interface_kstate.cc @@ -11,11 +11,11 @@ using namespace std; InterfaceKState::InterfaceKState(KInterfaceResp *obj, const std::string &ctx, - vr_interface_req &req, int id) : + vr_interface_req &req, int id) : KState(ctx, obj) { if (id >= 0) { req.set_h_op(sandesh_op::GET); - req.set_vifr_idx(id); + req.set_vifr_idx(id); } else { InitDumpRequest(req); req.set_vifr_marker(-1); @@ -31,7 +31,7 @@ void InterfaceKState::Handler() { KInterfaceResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more interfaces in Kernel. We need to query them from + /* There are more interfaces in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/kstate/interface_kstate.h b/src/vnsw/agent/kstate/interface_kstate.h index 5d0a5ba512e..07a83e5bc5b 100644 --- a/src/vnsw/agent/kstate/interface_kstate.h +++ b/src/vnsw/agent/kstate/interface_kstate.h @@ -7,7 +7,7 @@ class InterfaceKState: public KState { public: - InterfaceKState(KInterfaceResp *obj, const std::string &resp_ctx, + InterfaceKState(KInterfaceResp *obj, const std::string &resp_ctx, vr_interface_req &encoder, int id); virtual void SendResponse(); virtual void Handler(); diff --git a/src/vnsw/agent/kstate/kstate.cc b/src/vnsw/agent/kstate/kstate.cc index a0920d0a3fe..b2b0ba2cddc 100644 --- a/src/vnsw/agent/kstate/kstate.cc +++ b/src/vnsw/agent/kstate/kstate.cc @@ -43,7 +43,7 @@ int KState::VrResponseMsgHandler(vr_response *r) { st->Release(); return 0; } - + if (code < 0) { InternalErrResp *resp = new InternalErrResp(); resp->set_context(st->response_context()); @@ -216,7 +216,7 @@ void KState::NHMsgHandler(vr_nexthop_req *r) { data.set_ref_cnt(r->get_nhr_ref_cnt()); data.set_flags(nhst->FlagsToString(r->get_nhr_flags())); const vector &encap = r->get_nhr_encap(); - /* Kernel does not return encap len via r->get_nhr_encap_len() + /* Kernel does not return encap len via r->get_nhr_encap_len() * We need to fill it via the encap vector's size. */ if (encap.size()) { data.set_encap_len(encap.size()); @@ -344,7 +344,7 @@ void KState::MirrorMsgHandler(vr_mirror_req *r) { data.set_mirr_vni(r->get_mirr_vni()); list.push_back(data); - + int mirror_id = r->get_mirr_index(); UpdateContext(reinterpret_cast(mirror_id)); } @@ -354,7 +354,7 @@ void KState::VrfAssignMsgHandler(vr_vrf_assign_req *r) { VrfAssignKState *state; state = static_cast(this); - KVrfAssignResp *resp = + KVrfAssignResp *resp = static_cast(state->response_object()); vector &list = @@ -366,9 +366,9 @@ void KState::VrfAssignMsgHandler(vr_vrf_assign_req *r) { data.set_nh_id(r->get_var_nh_id()); list.push_back(data); - // Update the last interface and tag seen. + // Update the last interface and tag seen. // Will be used to send next request to kernel - VrfAssignContext *ctx = + VrfAssignContext *ctx = static_cast(state->more_context()); if (!ctx) { ctx = new VrfAssignContext; @@ -383,7 +383,7 @@ void KState::VrfStatsMsgHandler(vr_vrf_stats_req *r) { VrfStatsKState *state; state = static_cast(this); - KVrfStatsResp *resp = + KVrfStatsResp *resp = static_cast(state->response_object()); vector &list = @@ -445,7 +445,7 @@ void KState::DropStatsMsgHandler(vr_drop_stats_req *req) { DropStatsKState *state; state = static_cast(this); - KDropStatsResp *resp = + KDropStatsResp *resp = static_cast(state->response_object()); resp->set_ds_rid(req->get_vds_rid()); resp->set_ds_discard(req->get_vds_discard()); diff --git a/src/vnsw/agent/kstate/kstate.h b/src/vnsw/agent/kstate/kstate.h index ac404500b13..492d5b300eb 100644 --- a/src/vnsw/agent/kstate/kstate.h +++ b/src/vnsw/agent/kstate/kstate.h @@ -22,7 +22,7 @@ class KState : public AgentSandeshContext { public: static const int kMaxEntriesPerResponse = 100; - KState(const std::string &s, Sandesh *obj) : response_context_(s), + KState(const std::string &s, Sandesh *obj) : response_context_(s), response_object_(obj), vr_response_code_(0), more_context_(NULL) {} void EncodeAndSend(Sandesh &encoder); diff --git a/src/vnsw/agent/kstate/kstate_handler.cc b/src/vnsw/agent/kstate/kstate_handler.cc index bbcd45a57b4..2a10dbbc1ba 100644 --- a/src/vnsw/agent/kstate/kstate_handler.cc +++ b/src/vnsw/agent/kstate/kstate_handler.cc @@ -122,7 +122,7 @@ void KMplsReq::HandleRequest() const { } void NextKFlowReq::HandleRequest() const { - FlowKState *task = new FlowKState(Agent::GetInstance(), context(), + FlowKState *task = new FlowKState(Agent::GetInstance(), context(), get_flow_handle()); vector tokens; boost::split(tokens, get_flow_handle(), boost::is_any_of(" ")); @@ -134,7 +134,7 @@ void NextKFlowReq::HandleRequest() const { } void KFlowReq::HandleRequest() const { - FlowKState *task = new FlowKState(Agent::GetInstance(), context(), + FlowKState *task = new FlowKState(Agent::GetInstance(), context(), get_flow_idx()); task->set_evicted_flag(get_show_evicted()); TaskScheduler *scheduler = TaskScheduler::GetInstance(); @@ -146,7 +146,7 @@ void KMirrorReq::HandleRequest() const { KMirrorResp *resp = new KMirrorResp(); resp->set_context(context()); - MirrorKState *kstate = new MirrorKState(resp, context(), req, + MirrorKState *kstate = new MirrorKState(resp, context(), req, get_mirror_id()); kstate->EncodeAndSend(req); } @@ -156,7 +156,7 @@ void KVrfAssignReq::HandleRequest() const { KVrfAssignResp *resp = new KVrfAssignResp(); resp->set_context(context()); - VrfAssignKState *kstate = new VrfAssignKState(resp, context(), req, + VrfAssignKState *kstate = new VrfAssignKState(resp, context(), req, get_vif_index()); kstate->EncodeAndSend(req); } @@ -166,7 +166,7 @@ void KVrfStatsReq::HandleRequest() const { KVrfStatsResp *resp = new KVrfStatsResp(); resp->set_context(context()); - VrfStatsKState *kstate = new VrfStatsKState(resp, context(), req, + VrfStatsKState *kstate = new VrfStatsKState(resp, context(), req, get_vrf_index()); kstate->EncodeAndSend(req); } @@ -185,7 +185,7 @@ void KVxLanReq::HandleRequest() const { KVxLanResp *resp = new KVxLanResp(); resp->set_context(context()); - VxLanKState *kstate = new VxLanKState(resp, context(), req, + VxLanKState *kstate = new VxLanKState(resp, context(), req, get_vxlan_label()); kstate->EncodeAndSend(req); } diff --git a/src/vnsw/agent/kstate/kstate_io_context.cc b/src/vnsw/agent/kstate/kstate_io_context.cc index 3c7db2a7658..c9d884837ea 100644 --- a/src/vnsw/agent/kstate/kstate_io_context.cc +++ b/src/vnsw/agent/kstate/kstate_io_context.cc @@ -21,7 +21,7 @@ void KStateIoContext::ErrorHandler(int err) { KSYNC_ERROR(VRouterError, "VRouter query operation failed. Error <", err, ":", strerror(err), ">. Object <", "N/A", ">. State <", "N/A", ">. Message number :", GetSeqno()); - LOG(ERROR, "Error reading kstate. Error <" << err << ": " + LOG(ERROR, "Error reading kstate. Error <" << err << ": " << strerror(err) << ": Sequence No : " << GetSeqno()); } diff --git a/src/vnsw/agent/kstate/kstate_io_context.h b/src/vnsw/agent/kstate/kstate_io_context.h index 5fc27f779dc..a8668024454 100644 --- a/src/vnsw/agent/kstate/kstate_io_context.h +++ b/src/vnsw/agent/kstate/kstate_io_context.h @@ -7,7 +7,7 @@ class KStateIoContext: public IoContext { public: - KStateIoContext(int msg_len, char *msg, uint32_t seqno, + KStateIoContext(int msg_len, char *msg, uint32_t seqno, AgentSandeshContext *obj) : IoContext(msg, msg_len, seqno, obj, IoContext::IOC_KSYNC) {} void Handler(); diff --git a/src/vnsw/agent/kstate/mirror_kstate.cc b/src/vnsw/agent/kstate/mirror_kstate.cc index 06175b456cc..97d866486e0 100644 --- a/src/vnsw/agent/kstate/mirror_kstate.cc +++ b/src/vnsw/agent/kstate/mirror_kstate.cc @@ -34,7 +34,7 @@ void MirrorKState::Handler() { KMirrorResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more nexthops in Kernel. We need to query them from + /* There are more nexthops in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/kstate/mirror_kstate.h b/src/vnsw/agent/kstate/mirror_kstate.h index 699c842e4ea..e2d5ed25898 100644 --- a/src/vnsw/agent/kstate/mirror_kstate.h +++ b/src/vnsw/agent/kstate/mirror_kstate.h @@ -7,7 +7,7 @@ class MirrorKState: public KState { public: - MirrorKState(KMirrorResp *obj, const std::string &resp_ctx, + MirrorKState(KMirrorResp *obj, const std::string &resp_ctx, vr_mirror_req &req, int id); virtual void SendResponse(); virtual void Handler(); diff --git a/src/vnsw/agent/kstate/mpls_kstate.cc b/src/vnsw/agent/kstate/mpls_kstate.cc index 95e5e93ce40..5455048f4c9 100644 --- a/src/vnsw/agent/kstate/mpls_kstate.cc +++ b/src/vnsw/agent/kstate/mpls_kstate.cc @@ -5,7 +5,7 @@ #include "kstate.h" #include "mpls_kstate.h" -MplsKState::MplsKState(KMplsResp *obj, const std::string &resp_ctx, +MplsKState::MplsKState(KMplsResp *obj, const std::string &resp_ctx, vr_mpls_req &req, int id) : KState(resp_ctx, obj) { req.set_mr_label(id); if (id >= 0) { @@ -29,7 +29,7 @@ void MplsKState::Handler() { KMplsResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more labels in Kernel. We need to query them from + /* There are more labels in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/kstate/mpls_kstate.h b/src/vnsw/agent/kstate/mpls_kstate.h index 16e706af500..5c167f5ddf6 100644 --- a/src/vnsw/agent/kstate/mpls_kstate.h +++ b/src/vnsw/agent/kstate/mpls_kstate.h @@ -7,7 +7,7 @@ class MplsKState: public KState { public: - MplsKState(KMplsResp *obj, const std::string &resp_ctx, vr_mpls_req &req, + MplsKState(KMplsResp *obj, const std::string &resp_ctx, vr_mpls_req &req, int id); virtual void SendResponse(); virtual void Handler(); diff --git a/src/vnsw/agent/kstate/nh_kstate.cc b/src/vnsw/agent/kstate/nh_kstate.cc index f6fffc79590..4b590853a57 100644 --- a/src/vnsw/agent/kstate/nh_kstate.cc +++ b/src/vnsw/agent/kstate/nh_kstate.cc @@ -38,7 +38,7 @@ void NHKState::Handler() { KNHResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more nexthops in Kernel. We need to query them from + /* There are more nexthops in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); @@ -112,7 +112,7 @@ const string NHKState::EncapToString(const vector &encap) const { ostringstream strm; uint8_t ubyte; vector::const_iterator it = encap.begin(); - strm << hex << setfill('0'); + strm << hex << setfill('0'); while(it != encap.end()) { ubyte = (uint8_t) *it; strm << setw(2) << (int)ubyte; diff --git a/src/vnsw/agent/kstate/nh_kstate.h b/src/vnsw/agent/kstate/nh_kstate.h index 6590cb6c359..b41d556e255 100644 --- a/src/vnsw/agent/kstate/nh_kstate.h +++ b/src/vnsw/agent/kstate/nh_kstate.h @@ -7,7 +7,7 @@ class NHKState: public KState { public: - NHKState(KNHResp *obj, const std::string &resp_ctx, + NHKState(KNHResp *obj, const std::string &resp_ctx, vr_nexthop_req &encoder, int id); virtual void SendResponse(); virtual void Handler(); diff --git a/src/vnsw/agent/kstate/test/test_kstate.cc b/src/vnsw/agent/kstate/test/test_kstate.cc index d0169d0a563..5ab5712e725 100644 --- a/src/vnsw/agent/kstate/test/test_kstate.cc +++ b/src/vnsw/agent/kstate/test/test_kstate.cc @@ -114,7 +114,7 @@ class KStateTest : public ::testing::Test { WAIT_FOR(1000, 1000, (1 == Agent::GetInstance()->vn_table()->Size())); WaitForVrf(input, 0, true); if (if_count) { - unsigned int oper_if_count = num_ports + if_count; + unsigned int oper_if_count = num_ports + if_count; WAIT_FOR(1000, 1000, ((oper_if_count) == Agent::GetInstance()->interface_table()->Size())); } @@ -137,12 +137,12 @@ class KStateTest : public ::testing::Test { // without policy, one multicast NH without policy) //plus 4 Nexthops for each VRF (1 VRF NH and 3 Composite NHs //i.e. TOR CNH, EVPN CNH, Fabric CNH) - WAIT_FOR(1000, 1000, ((nh_count + + WAIT_FOR(1000, 1000, ((nh_count + (num_ports * NH_PER_VM) + 4) == (uint32_t)KSyncSockTypeMap::NHCount())); } if (rt_count) { - WAIT_FOR(1000, 1000, ((rt_count + + WAIT_FOR(1000, 1000, ((rt_count + (port_with_vhost_count * 2) + 1) == (uint32_t)KSyncSockTypeMap::RouteCount())); } @@ -506,7 +506,7 @@ TEST_F(KStateTest, DISABLED_FlowDumpTest) { //cleanup client->EnqueueFlowFlush(); client->WaitForIdle(2); - WAIT_FOR(1000, 1000, + WAIT_FOR(1000, 1000, (0 == Agent::GetInstance()->pkt()->get_flow_proto()->FlowCount())); DeletePortsWithPolicy(); } diff --git a/src/vnsw/agent/kstate/test/test_kstate.h b/src/vnsw/agent/kstate/test/test_kstate.h index 68483d5e2bb..f0aac77cddf 100644 --- a/src/vnsw/agent/kstate/test/test_kstate.h +++ b/src/vnsw/agent/kstate/test/test_kstate.h @@ -22,7 +22,7 @@ class TestKStateBase { int expected_count_; int verify_idx_; - TestKStateBase(bool verify, int ct, int id) : verify_(verify), + TestKStateBase(bool verify, int ct, int id) : verify_(verify), expected_count_(ct), verify_idx_(id) { fetched_count_ = 0; handler_count_ = 0; @@ -40,9 +40,9 @@ class TestKStateBase { class TestIfKState: public InterfaceKState, public TestKStateBase { public: - TestIfKState(bool verify, int if_count, KInterfaceResp *obj, - std::string resp_ctx, vr_interface_req &encoder, int id): - InterfaceKState(obj, resp_ctx, encoder, id), + TestIfKState(bool verify, int if_count, KInterfaceResp *obj, + std::string resp_ctx, vr_interface_req &encoder, int id): + InterfaceKState(obj, resp_ctx, encoder, id), TestKStateBase(verify, if_count, id) {} virtual void SendResponse() { } @@ -52,7 +52,7 @@ class TestIfKState: public InterfaceKState, public TestKStateBase { KInterfaceResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_if_list()); EXPECT_EQ(1U, list.size()); vector::iterator it = list.begin(); @@ -67,7 +67,7 @@ class TestIfKState: public InterfaceKState, public TestKStateBase { } void PrintIfResp(KInterfaceResp *r) { - vector &list = + vector &list = const_cast&>(r->get_if_list()); vector::iterator it = list.begin(); KInterfaceInfo intf; @@ -82,7 +82,7 @@ class TestIfKState: public InterfaceKState, public TestKStateBase { vr_interface_req req; KInterfaceResp *resp = new KInterfaceResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. singleton_ = new TestIfKState(verify, if_count, resp, "dummy", req, verify_idx); singleton_->EncodeAndSend(req); @@ -97,7 +97,7 @@ class TestIfKState: public InterfaceKState, public TestKStateBase { virtual void UpdateFetchCount() { KInterfaceResp *resp = static_cast(response_object_); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_if_list()); fetched_count_ += list.size(); //PrintIfResp(resp); @@ -111,7 +111,7 @@ class TestIfKState: public InterfaceKState, public TestKStateBase { class TestNHKState: public NHKState, public TestKStateBase { public: TestNHKState(bool verify, int nh_count, KNHResp *obj, std::string resp_ctx, - vr_nexthop_req &encoder, int id): NHKState(obj, resp_ctx, + vr_nexthop_req &encoder, int id): NHKState(obj, resp_ctx, encoder, id), TestKStateBase(verify, nh_count, id) {} virtual void SendResponse() { //Update the response_object_ with empty list @@ -139,7 +139,7 @@ class TestNHKState: public NHKState, public TestKStateBase { KNHResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_nh_list()); EXPECT_EQ(1U, list.size()); vector::iterator it = list.begin(); @@ -154,14 +154,14 @@ class TestNHKState: public NHKState, public TestKStateBase { } void PrintNHResp(KNHResp *r) { - vector &list = + vector &list = const_cast&>(r->get_nh_list()); vector::iterator it = list.begin(); KNHInfo nh; while(it != list.end()) { nh = *it; LOG(DEBUG, "NH ID " << nh.get_id() << " Type " << nh.get_type()); - LOG(DEBUG, " Encap Len " << nh.get_encap_len() << " Encap fam " + LOG(DEBUG, " Encap Len " << nh.get_encap_len() << " Encap fam " << nh.get_encap_family() << " vrf " << nh.get_vrf()); it++; } @@ -171,7 +171,7 @@ class TestNHKState: public NHKState, public TestKStateBase { vr_nexthop_req req; KNHResp *resp = new KNHResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. singleton_ = new TestNHKState(verify, nh_count, resp, "dummy", req, verify_idx); singleton_->EncodeAndSend(req); @@ -184,7 +184,7 @@ class TestNHKState: public NHKState, public TestKStateBase { virtual void UpdateFetchCount() { KNHResp *resp = static_cast(response_object_); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_nh_list()); fetched_count_ += list.size(); //PrintNHResp(resp); @@ -197,7 +197,7 @@ class TestNHKState: public NHKState, public TestKStateBase { class TestMplsKState: public MplsKState, public TestKStateBase { public: TestMplsKState(bool ve, int lbl_count, KMplsResp *obj, std::string resp_ctx, - vr_mpls_req &encoder, int id): MplsKState(obj, resp_ctx, + vr_mpls_req &encoder, int id): MplsKState(obj, resp_ctx, encoder, id), TestKStateBase(ve, lbl_count, id) {} virtual void SendResponse() { } @@ -207,7 +207,7 @@ class TestMplsKState: public MplsKState, public TestKStateBase { KMplsResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_mpls_list()); EXPECT_EQ(1U, list.size()); vector::iterator it = list.begin(); @@ -223,7 +223,7 @@ class TestMplsKState: public MplsKState, public TestKStateBase { } void PrintMplsResp(KMplsResp *r) { - vector &list = + vector &list = const_cast&>(r->get_mpls_list()); vector::iterator it = list.begin(); KMplsInfo mpls; @@ -238,9 +238,9 @@ class TestMplsKState: public MplsKState, public TestKStateBase { vr_mpls_req req; KMplsResp *resp = new KMplsResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. - singleton_ = new TestMplsKState(verify, lbl_count, resp, "dummy", req, + singleton_ = new TestMplsKState(verify, lbl_count, resp, "dummy", req, verify_idx); singleton_->EncodeAndSend(req); } @@ -252,7 +252,7 @@ class TestMplsKState: public MplsKState, public TestKStateBase { virtual void UpdateFetchCount() { KMplsResp *resp = static_cast(response_object_); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_mpls_list()); fetched_count_ += list.size(); //PrintMplsResp(resp); @@ -265,7 +265,7 @@ class TestMplsKState: public MplsKState, public TestKStateBase { class TestMirrorKState: public MirrorKState, public TestKStateBase { public: TestMirrorKState(bool ve, int count, KMirrorResp *obj, std::string resp_ctx, - vr_mirror_req &encoder, int id): MirrorKState(obj, resp_ctx, + vr_mirror_req &encoder, int id): MirrorKState(obj, resp_ctx, encoder, id), TestKStateBase(ve, count, id) {} virtual void SendResponse() {} @@ -275,7 +275,7 @@ class TestMirrorKState: public MirrorKState, public TestKStateBase { KMirrorResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_mirror_list()); EXPECT_EQ(1U, list.size()); vector::iterator it = list.begin(); @@ -291,7 +291,7 @@ class TestMirrorKState: public MirrorKState, public TestKStateBase { } void PrintMirrorResp(KMirrorResp *r) { - vector &list = + vector &list = const_cast&>(r->get_mirror_list()); vector::iterator it = list.begin(); KMirrorInfo mr; @@ -306,9 +306,9 @@ class TestMirrorKState: public MirrorKState, public TestKStateBase { vr_mirror_req req; KMirrorResp *resp = new KMirrorResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. - singleton_ = new TestMirrorKState(verify, count, resp, "dummy", req, + singleton_ = new TestMirrorKState(verify, count, resp, "dummy", req, verify_idx); singleton_->EncodeAndSend(req); } @@ -320,7 +320,7 @@ class TestMirrorKState: public MirrorKState, public TestKStateBase { virtual void UpdateFetchCount() { KMirrorResp *resp = static_cast(response_object_); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_mirror_list()); fetched_count_ += list.size(); //PrintMirrorResp(resp); @@ -350,9 +350,9 @@ class TestRouteKState: public RouteKState, public TestKStateBase { if (resp) { if (more_context_) { rctx = static_cast(more_context_); - } + } if (vr_response_code_ > 0) { - /* There are more routes in Kernel. We need to query them from + /* There are more routes in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); @@ -404,7 +404,7 @@ class TestRouteKState: public RouteKState, public TestKStateBase { virtual void UpdateFetchCount() { KRouteResp *resp = static_cast(response_object_); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_rt_list()); fetched_count_ += list.size(); //PrintRouteResp(resp); @@ -412,13 +412,13 @@ class TestRouteKState: public RouteKState, public TestKStateBase { } private: void PrintRouteResp(KRouteResp *r) { - vector &list = + vector &list = const_cast&>(r->get_rt_list()); vector::iterator it = list.begin(); KRouteInfo rt; while(it != list.end()) { rt = *it; - LOG(DEBUG, "vrf " << rt.get_vrf_id() << " prefix_len " + LOG(DEBUG, "vrf " << rt.get_vrf_id() << " prefix_len " << rt.get_prefix_len() << " prefix " << std::hex << rt.get_prefix()); it++; } @@ -430,7 +430,7 @@ class TestRouteKState: public RouteKState, public TestKStateBase { class TestFlowKState: public FlowKState, public TestKStateBase { public: TestFlowKState(bool ve, int count, std::string resp_ctx, int idx) : - FlowKState(Agent::GetInstance(), resp_ctx, idx), + FlowKState(Agent::GetInstance(), resp_ctx, idx), TestKStateBase(ve, count, -1) {} void SendResponse(KFlowResp *resp) const { vector &list = @@ -443,9 +443,9 @@ class TestFlowKState: public FlowKState, public TestKStateBase { } void SendPartialResponse() { } static void Init(bool verify, int idx, int count = 0) { - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. - singleton_ = new TestFlowKState(verify, count, "dummy", idx); + singleton_ = new TestFlowKState(verify, count, "dummy", idx); TaskScheduler *scheduler = TaskScheduler::GetInstance(); scheduler->Enqueue(singleton_); } diff --git a/src/vnsw/agent/kstate/test/test_kstate_util.h b/src/vnsw/agent/kstate/test/test_kstate_util.h index 20e9e377ef3..c1efc3dfbb3 100644 --- a/src/vnsw/agent/kstate/test/test_kstate_util.h +++ b/src/vnsw/agent/kstate/test/test_kstate_util.h @@ -53,7 +53,7 @@ class TestIntfTable: public Patricia::Tree(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_if_list()); for (vector::iterator it = list.begin(); it != list.end(); ++it) { @@ -89,7 +89,7 @@ class DumpIntfKState: public InterfaceKState { vr_interface_req req; KInterfaceResp *resp = new KInterfaceResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. DumpIntfKState *kstate = new DumpIntfKState(resp, "dummy", req, -1); kstate->table_ = table; @@ -170,7 +170,7 @@ class DumpRouteKState: public RouteKState { KRouteResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_rt_list()); for (vector::iterator it = list.begin(); it != list.end(); ++it) { @@ -239,7 +239,7 @@ class TestNhTable: public std::map { class DumpNhKState: public NHKState { public: - DumpNhKState(KNHResp *obj, std::string resp_ctx, vr_nexthop_req &encoder, int id): + DumpNhKState(KNHResp *obj, std::string resp_ctx, vr_nexthop_req &encoder, int id): NHKState(obj, resp_ctx, encoder, id) {} virtual void SendResponse() { //Update the response_object_ with empty list @@ -252,7 +252,7 @@ class DumpNhKState: public NHKState { KNHResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_nh_list()); for (vector::iterator it = list.begin(); it != list.end(); ++it) { @@ -277,7 +277,7 @@ class DumpNhKState: public NHKState { vr_nexthop_req req; KNHResp *resp = new KNHResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. DumpNhKState *kstate = new DumpNhKState(resp, "dummy", req, -1); kstate->table_ = table; @@ -319,7 +319,7 @@ class TestMplsTable: public std::map { class DumpMplsKState: public MplsKState { public: - DumpMplsKState(KMplsResp *obj, std::string resp_ctx, vr_mpls_req &encoder, int id): + DumpMplsKState(KMplsResp *obj, std::string resp_ctx, vr_mpls_req &encoder, int id): MplsKState(obj, resp_ctx, encoder, id) {} virtual void SendResponse() { //Update the response_object_ with empty list @@ -332,7 +332,7 @@ class DumpMplsKState: public MplsKState { KMplsResp *resp = static_cast(response_object_); EXPECT_TRUE(resp != NULL); if (resp) { - vector &list = + vector &list = const_cast&>(resp->get_mpls_list()); for (vector::iterator it = list.begin(); it != list.end(); ++it) { @@ -357,7 +357,7 @@ class DumpMplsKState: public MplsKState { vr_mpls_req req; KMplsResp *resp = new KMplsResp(); - // The following object is deleted in KStateIoContext::Handler() + // The following object is deleted in KStateIoContext::Handler() // after the Handler is invoked. DumpMplsKState *kstate = new DumpMplsKState(resp, "dummy", req, -1); kstate->table_ = table; diff --git a/src/vnsw/agent/kstate/test/test_sandesh_kstate.cc b/src/vnsw/agent/kstate/test/test_sandesh_kstate.cc index f9af2ce6899..7a3fa291636 100644 --- a/src/vnsw/agent/kstate/test/test_sandesh_kstate.cc +++ b/src/vnsw/agent/kstate/test/test_sandesh_kstate.cc @@ -31,8 +31,8 @@ void RouterIdDepInit(Agent *agent) { class KStateSandeshTest : public ::testing::Test { public: - KStateSandeshTest() : response_count_(0), type_specific_response_count_(0), - num_entries_(0), error_response_count_(0), internal_error_response_count_(0), + KStateSandeshTest() : response_count_(0), type_specific_response_count_(0), + num_entries_(0), error_response_count_(0), internal_error_response_count_(0), peer_(NULL), next_flow_handle_() { } @@ -71,7 +71,7 @@ class KStateSandeshTest : public ::testing::Test { DeleteBgpPeer(peer_); } - void CreateRemoteRoute(const char *vrf, const char *remote_vm, + void CreateRemoteRoute(const char *vrf, const char *remote_vm, const char *serv, int label, const char *vn) { boost::system::error_code ec; Ip4Address addr = Ip4Address::from_string(remote_vm, ec); @@ -482,7 +482,7 @@ TEST_F(KStateSandeshTest, InterfaceTest_MultiResponse) { for(int i = 30; i < 80; i++) { KSyncSockTypeMap::InterfaceAdd(i); } - + //Send Interface DUMP request ClearCount(); InterfaceGet(-1); @@ -507,7 +507,7 @@ TEST_F(KStateSandeshTest, NhTest) { client->WaitForIdle(); WAIT_FOR(1000, 1000, (response_count_ != 0)); unsigned int num_nexthops = num_entries_; - + //Create 2 vrfs in mock Kernel KSyncSockTypeMap::NHAdd(18); KSyncSockTypeMap::NHAdd(19); @@ -555,7 +555,7 @@ TEST_F(KStateSandeshTest, NhTest_flags) { client->WaitForIdle(); WAIT_FOR(1000, 1000, (response_count_ != 0)); unsigned int num_nexthops = num_entries_; - + //Create 18 nexthops in mock Kernel with different flags int flags = NH_FLAG_VALID|NH_FLAG_POLICY_ENABLED; KSyncSockTypeMap::NHAdd(201, flags); @@ -650,7 +650,7 @@ TEST_F(KStateSandeshTest, MplsTest) { KSyncSockTypeMap::MplsAdd(9); KSyncSockTypeMap::MplsAdd(10); - //Send Mpls GET request for label 9 + //Send Mpls GET request for label 9 ClearCount(); MplsGet(9); client->WaitForIdle(); @@ -712,7 +712,7 @@ TEST_F(KStateSandeshTest, MirrorTest) { KSyncSockTypeMap::MirrorAdd(9); KSyncSockTypeMap::MirrorAdd(10); - //Send Mpls GET request for label 9 + //Send Mpls GET request for label 9 ClearCount(); MirrorGet(9); client->WaitForIdle(); @@ -1034,7 +1034,7 @@ TEST_F(KStateSandeshTest, VrfStatsTest_MultiResponse) { } TEST_F(KStateSandeshTest, DropStatsTest) { - //Send Drop Stats request + //Send Drop Stats request ClearCount(); DropStatsGet(); client->WaitForIdle(); @@ -1118,7 +1118,7 @@ TEST_F(KStateSandeshTest, DISABLED_FlowTest_2) { for (int i = 0; i < total_flows; i++) { Ip4Address dip(0x1010101 + i); //Add route for all of them - CreateRemoteRoute("vrf5", dip.to_string().c_str(), remote_router_ip, + CreateRemoteRoute("vrf5", dip.to_string().c_str(), remote_router_ip, 10, "vn5"); TestFlow flow[]= { { @@ -1135,7 +1135,7 @@ TEST_F(KStateSandeshTest, DISABLED_FlowTest_2) { client->WaitForIdle(2); CreateFlow(flow, 2); } - EXPECT_EQ((total_flows * 2), + EXPECT_EQ((total_flows * 2), Agent::GetInstance()->pkt()->get_flow_proto()->FlowCount()); //Fetch all the flows using index as -1 @@ -1148,7 +1148,7 @@ TEST_F(KStateSandeshTest, DISABLED_FlowTest_2) { EXPECT_EQ(100U, num_entries_); EXPECT_EQ(0U, error_response_count_); - //Fetch the next set of flows + //Fetch the next set of flows ClearCount(); FlowGetNext(); client->WaitForIdle(); @@ -1165,7 +1165,7 @@ TEST_F(KStateSandeshTest, DISABLED_FlowTest_2) { int main(int argc, char *argv[]) { int ret; GETUSERARGS(); - + /* Supported only with non-ksync mode for now */ ksync_init = false; diff --git a/src/vnsw/agent/kstate/vrf_assign_kstate.cc b/src/vnsw/agent/kstate/vrf_assign_kstate.cc index 5eda0eb8824..1769c9e673f 100644 --- a/src/vnsw/agent/kstate/vrf_assign_kstate.cc +++ b/src/vnsw/agent/kstate/vrf_assign_kstate.cc @@ -5,9 +5,9 @@ #include "kstate.h" #include "vrf_assign_kstate.h" -VrfAssignKState::VrfAssignKState(KVrfAssignResp *obj, +VrfAssignKState::VrfAssignKState(KVrfAssignResp *obj, const std::string &resp_ctx, - vr_vrf_assign_req &req, int id) : + vr_vrf_assign_req &req, int id) : KState(resp_ctx, obj) { req.set_h_op(sandesh_op::DUMP); @@ -30,7 +30,7 @@ void VrfAssignKState::Handler() { KVrfAssignResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more labels in Kernel. We need to query them from + /* There are more labels in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/kstate/vrf_stats_kstate.cc b/src/vnsw/agent/kstate/vrf_stats_kstate.cc index f4f50ad473e..56495b550aa 100644 --- a/src/vnsw/agent/kstate/vrf_stats_kstate.cc +++ b/src/vnsw/agent/kstate/vrf_stats_kstate.cc @@ -11,11 +11,11 @@ using namespace std; VrfStatsKState::VrfStatsKState(KVrfStatsResp *obj, const std::string &resp_ctx, - vr_vrf_stats_req &req, int id) : + vr_vrf_stats_req &req, int id) : KState(resp_ctx, obj) { if (id >= 0) { req.set_h_op(sandesh_op::GET); - req.set_vsr_vrf(id); + req.set_vsr_vrf(id); req.set_vsr_family(AF_INET); } else { InitDumpRequest(req); @@ -33,7 +33,7 @@ void VrfStatsKState::Handler() { KVrfStatsResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more interfaces in Kernel. We need to query them from + /* There are more interfaces in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/kstate/vrf_stats_kstate.h b/src/vnsw/agent/kstate/vrf_stats_kstate.h index 8cdbc171c4e..b3969f06490 100644 --- a/src/vnsw/agent/kstate/vrf_stats_kstate.h +++ b/src/vnsw/agent/kstate/vrf_stats_kstate.h @@ -7,7 +7,7 @@ class VrfStatsKState: public KState { public: - VrfStatsKState(KVrfStatsResp *obj, const std::string &resp_ctx, + VrfStatsKState(KVrfStatsResp *obj, const std::string &resp_ctx, vr_vrf_stats_req &encoder, int id); virtual void SendResponse(); virtual void Handler(); diff --git a/src/vnsw/agent/kstate/vxlan_kstate.cc b/src/vnsw/agent/kstate/vxlan_kstate.cc index 87e9d4172d6..caab9d9a965 100644 --- a/src/vnsw/agent/kstate/vxlan_kstate.cc +++ b/src/vnsw/agent/kstate/vxlan_kstate.cc @@ -5,7 +5,7 @@ #include "kstate.h" #include "vxlan_kstate.h" -VxLanKState::VxLanKState(KVxLanResp *obj, const std::string &resp_ctx, +VxLanKState::VxLanKState(KVxLanResp *obj, const std::string &resp_ctx, vr_vxlan_req &req, int id) : KState(resp_ctx, obj) { req.set_vxlanr_vnid(id); if (id >= 0) { @@ -29,7 +29,7 @@ void VxLanKState::Handler() { KVxLanResp *resp = static_cast(response_object_); if (resp) { if (MoreData()) { - /* There are more labels in Kernel. We need to query them from + /* There are more labels in Kernel. We need to query them from * Kernel and send it to Sandesh. */ SendResponse(); diff --git a/src/vnsw/agent/oper/agent_path.cc b/src/vnsw/agent/oper/agent_path.cc index 82134d7a9b0..2da596a9318 100644 --- a/src/vnsw/agent/oper/agent_path.cc +++ b/src/vnsw/agent/oper/agent_path.cc @@ -9,7 +9,7 @@ #include #include -#include +#include #include #include @@ -205,7 +205,7 @@ bool AgentPath::UpdateNHPolicy(Agent *agent) { (agent->nexthop_table()->FindActiveEntry(&key)); // If NH is not found, point route to discard NH if (nh == NULL) { - LOG(DEBUG, "Interface NH for <" + LOG(DEBUG, "Interface NH for <" << boost::lexical_cast(vm_port->GetUuid()) << " : policy = " << policy); nh = agent->nexthop_table()->discard_nh(); @@ -558,13 +558,13 @@ bool HostRoute::AddChangePathExtended(Agent *agent, AgentPath *path, ret = true; return ret; -} +} bool HostRoute::UpdateRoute(AgentRoute *rt) { InetUnicastRouteEntry *uc_rt = static_cast(rt); AgentRouteTable *table = static_cast(rt->get_table()); - if ((table->GetTableType() != Agent::INET4_UNICAST) && + if ((table->GetTableType() != Agent::INET4_UNICAST) && (table->GetTableType() != Agent::INET6_UNICAST)) return false; @@ -617,7 +617,7 @@ bool L2ReceiveRoute::AddChangePathExtended(Agent *agent, AgentPath *path, bool InetInterfaceRoute::UpdateRoute(AgentRoute *rt) { AgentRouteTable *table = static_cast(rt->get_table()); - if ((table->GetTableType() != Agent::INET4_UNICAST) && + if ((table->GetTableType() != Agent::INET4_UNICAST) && (table->GetTableType() != Agent::INET6_UNICAST)) return false; @@ -1058,7 +1058,7 @@ bool ReceiveRoute::AddChangePathExtended(Agent *agent, AgentPath *path, bool ReceiveRoute::UpdateRoute(AgentRoute *rt) { AgentRouteTable *table = static_cast(rt->get_table()); - if ((table->GetTableType() != Agent::INET4_UNICAST) && + if ((table->GetTableType() != Agent::INET4_UNICAST) && (table->GetTableType() != Agent::INET6_UNICAST)) return false; @@ -1261,7 +1261,7 @@ bool IpamSubnetRoute::AddChangePathExtended(Agent *agent, AgentPath *path, NextHop *nh = static_cast(agent->nexthop_table()-> FindActiveEntry(nh_req_.key.get())); assert(nh); - + bool ret = false; if (path->ChangeNH(agent, nh) == true) { @@ -1278,7 +1278,7 @@ bool IpamSubnetRoute::AddChangePathExtended(Agent *agent, AgentPath *path, //Resync of subnet route is needed for identifying if arp flood flag //needs to be enabled for all the smaller subnets present w.r.t. this subnet - //route. + //route. AgentRouteTable *table = static_cast(rt->get_table()); assert((table->GetTableType() == Agent::INET4_UNICAST) || (table->GetTableType() == Agent::INET6_UNICAST)); @@ -1298,9 +1298,9 @@ bool IpamSubnetRoute::UpdateRoute(AgentRoute *rt) { } /////////////////////////////////////////////// -// Sandesh routines below (route_sandesh.cc) +// Sandesh routines below (route_sandesh.cc) ////////////////////////////////////////////// -//TODO make it generic +//TODO make it generic void UnresolvedNH::HandleRequest() const { VrfEntry *vrf = Agent::GetInstance()->vrf_table()->FindVrfFromId(0); @@ -1310,9 +1310,9 @@ void UnresolvedNH::HandleRequest() const { resp->Response(); return; } - + int count = 0; - std::string empty(""); + std::string empty(""); AgentRouteTable *rt_table = static_cast (vrf->GetInet4UnicastRouteTable()); NhListResp *resp = new NhListResp(); @@ -1338,7 +1338,7 @@ void UnresolvedNH::HandleRequest() const { } //TODO IMplement filltrace in path class -void AgentRoute::FillTrace(RouteInfo &rt_info, Trace event, +void AgentRoute::FillTrace(RouteInfo &rt_info, Trace event, const AgentPath *path) const { Agent *agent = static_cast(get_table())->agent(); rt_info.set_ip(ToString()); @@ -1431,7 +1431,7 @@ void AgentRoute::FillTrace(RouteInfo &rt_info, Trace event, rt_info.set_nh_type("COMPOSITE"); break; } - + case NextHop::L2_RECEIVE: { rt_info.set_nh_type("L2_RECEIVE"); break; diff --git a/src/vnsw/agent/oper/agent_profile.cc b/src/vnsw/agent/oper/agent_profile.cc index 93187eccefa..1928d00dd49 100644 --- a/src/vnsw/agent/oper/agent_profile.cc +++ b/src/vnsw/agent/oper/agent_profile.cc @@ -208,7 +208,7 @@ void ProfileData::Get(Agent *agent) { agent->db()->const_begin(); DB::TableMap::const_iterator itrend = agent->db()->const_end(); - + profile_stats_table_.clear(); for ( ;itr != itrend; ++itr) { if(itr->first.rfind(kV4UnicastRouteDbTableSuffix) != @@ -316,7 +316,7 @@ void SandeshDBTableStatsRequest::HandleRequest() const { for (uint16_t i = start; i < end; i++) { uint16_t index = i % AgentProfile::kSecondsHistoryCount; ProfileData *data = profile->GetProfileData(index); - SandeshDBTableStatsInfo stats; + SandeshDBTableStatsInfo stats; GetDBTableStats(&stats, index, data); stats_list.push_back(stats); } @@ -354,7 +354,7 @@ void SandeshFlowStatsRequest::HandleRequest() const { for (uint16_t i = start; i < end; i++) { uint16_t index = i % AgentProfile::kSecondsHistoryCount; ProfileData *data = profile->GetProfileData(index); - SandeshFlowStats stats; + SandeshFlowStats stats; GetFlowStats(&stats, index, data); stats_list.push_back(stats); } @@ -428,7 +428,7 @@ void SandeshTaskStatsRequest::HandleRequest() const { for (uint16_t i = start; i < end; i++) { uint16_t index = i % AgentProfile::kSecondsHistoryCount; ProfileData *data = profile->GetProfileData(index); - TaskProfileStats stats; + TaskProfileStats stats; GetTaskStats(&stats, index, data); stats_list.push_back(stats); } diff --git a/src/vnsw/agent/oper/agent_route.cc b/src/vnsw/agent/oper/agent_route.cc index 2f3d138be19..51bd76c27e1 100644 --- a/src/vnsw/agent/oper/agent_route.cc +++ b/src/vnsw/agent/oper/agent_route.cc @@ -486,7 +486,7 @@ bool AgentRoute::SubOpAddChangeInput(VrfEntry *vrf, AgentRouteTable *table, FillTrace(rt_info, event, path); OPER_TRACE_ROUTE_ENTRY(Route, table, rt_info); - if (path->RouteNeedsSync()) + if (path->RouteNeedsSync()) ret |= Sync(); if (route_added) { @@ -550,7 +550,7 @@ void AgentRoute::DeleteInput(DBTablePartition *part, AgentRouteTable *table, } void AgentRoute::InsertPath(const AgentPath *path) { - const Path *prev_front = front(); + const Path *prev_front = front(); insert(path); Sort(&AgentRouteTable::PathSelection, prev_front); } @@ -647,7 +647,7 @@ void AgentRoute::DeletePathFromPeer(DBTablePartBase *part, } AgentPath *AgentRoute::FindLocalPath() const { - for(Route::PathList::const_iterator it = GetPathList().begin(); + for(Route::PathList::const_iterator it = GetPathList().begin(); it != GetPathList().end(); it++) { const AgentPath *path = static_cast(it.operator->()); if (path->peer() == NULL) { diff --git a/src/vnsw/agent/oper/agent_route.h b/src/vnsw/agent/oper/agent_route.h index 47cd291070b..76d31f1e8e6 100644 --- a/src/vnsw/agent/oper/agent_route.h +++ b/src/vnsw/agent/oper/agent_route.h @@ -33,7 +33,7 @@ class Peer; class EcmpData; struct AgentRouteKey : public AgentKey { - AgentRouteKey(const Peer *peer, const std::string &vrf_name) : + AgentRouteKey(const Peer *peer, const std::string &vrf_name) : AgentKey(), peer_(peer), vrf_name_(vrf_name) { } virtual ~AgentRouteKey() { } @@ -103,7 +103,7 @@ struct RouteTableWalkerState { LifetimeRef rt_delete_ref_; }; -// Agent implements multiple route tables - inet4-unicast, inet4-multicast, +// Agent implements multiple route tables - inet4-unicast, inet4-multicast, // bridge. This base class contains common code for all route tables class AgentRouteTable : public RouteTable { public: @@ -203,7 +203,7 @@ class AgentRouteTable : public RouteTable { UnresolvedRouteTree unresolved_rt_tree_; UnresolvedNHTree unresolved_nh_tree_; // VRF is stored to identify which VRF this table belonged to - // in case lifetimeactor has reset the vrf_. + // in case lifetimeactor has reset the vrf_. SandeshTraceBufferPtr OperDBTraceBuf; DISALLOW_COPY_AND_ASSIGN(AgentRouteTable); }; @@ -281,7 +281,7 @@ class AgentRoute : public Route { AgentPath *FindLocalPath() const; AgentPath *FindLocalVmPortPath() const; const AgentPath *GetActivePath() const; - const NextHop *GetActiveNextHop() const; + const NextHop *GetActiveNextHop() const; const std::string &dest_vn_name() const; bool IsRPFInvalid() const; @@ -332,7 +332,7 @@ class AgentRoute : public Route { AgentRouteData *data); VrfEntry *vrf_; - // Unicast table can contain routes for few multicast address + // Unicast table can contain routes for few multicast address // (ex. subnet multicast). Flag to specify if this is multicast route bool is_multicast_; std::string intf_route_type_; diff --git a/src/vnsw/agent/oper/agent_route_resync.cc b/src/vnsw/agent/oper/agent_route_resync.cc index abb9894925a..5ed921c7d4f 100644 --- a/src/vnsw/agent/oper/agent_route_resync.cc +++ b/src/vnsw/agent/oper/agent_route_resync.cc @@ -4,7 +4,7 @@ #include #include -#include +#include #include #include @@ -30,9 +30,9 @@ bool AgentRouteResync::RouteWalkNotify(DBTablePartBase *partition, } void AgentRouteResync::Update() { - StartVrfWalk(); + StartVrfWalk(); } void AgentRouteResync::UpdateRoutesInVrf(VrfEntry *vrf) { - StartRouteWalk(vrf); + StartRouteWalk(vrf); } diff --git a/src/vnsw/agent/oper/agent_route_walker.cc b/src/vnsw/agent/oper/agent_route_walker.cc index 9ebce8939fd..0eee5ac3a6a 100644 --- a/src/vnsw/agent/oper/agent_route_walker.cc +++ b/src/vnsw/agent/oper/agent_route_walker.cc @@ -244,7 +244,7 @@ void AgentRouteWalker::StartRouteWalk(VrfEntry *vrf) { } /* - * VRF entry notification handler + * VRF entry notification handler */ bool AgentRouteWalker::VrfWalkNotify(DBTablePartBase *partition, DBEntryBase *e) { @@ -393,8 +393,8 @@ void AgentRouteWalker::WalkDoneCallback(WalkDone cb) { walk_done_cb_ = cb; } -/* - * Callback is registered to notify walk complete of all route tables for +/* + * Callback is registered to notify walk complete of all route tables for * a VRF. */ void AgentRouteWalker::RouteWalkDoneForVrfCallback(RouteWalkDoneCb cb) { diff --git a/src/vnsw/agent/oper/agent_route_walker.h b/src/vnsw/agent/oper/agent_route_walker.h index fa9f0d84953..dc59b52beeb 100644 --- a/src/vnsw/agent/oper/agent_route_walker.h +++ b/src/vnsw/agent/oper/agent_route_walker.h @@ -24,7 +24,7 @@ * RouteWalkNotify() - This should be overriden to listen and act on route * entry notifications. By default it ignores the request. * 4) Only VRF walk - Use API StartVRFWalk and override VrfWalkNotify() to not - * start route table walk. In this way only VRF entries can be traversed + * start route table walk. In this way only VRF entries can be traversed * without route walks issued. * * Multiple objects of this class can have separate parallel walks. diff --git a/src/vnsw/agent/oper/agent_sandesh.cc b/src/vnsw/agent/oper/agent_sandesh.cc index 0ab2dd8cbe0..2930bc39482 100644 --- a/src/vnsw/agent/oper/agent_sandesh.cc +++ b/src/vnsw/agent/oper/agent_sandesh.cc @@ -4,7 +4,7 @@ #include -#include +#include #include #include diff --git a/src/vnsw/agent/oper/agent_sandesh.h b/src/vnsw/agent/oper/agent_sandesh.h index 21809ce0596..c741a32e7d5 100644 --- a/src/vnsw/agent/oper/agent_sandesh.h +++ b/src/vnsw/agent/oper/agent_sandesh.h @@ -55,7 +55,7 @@ class AgentSandeshManager { key_(key), context_(context) { } PageRequest(const PageRequest &req) : - key_(req.key_), context_(req.context_) { + key_(req.key_), context_(req.context_) { } ~PageRequest() { } @@ -274,8 +274,8 @@ class AgentInet4UcRtSandesh : public AgentSandesh { dump_table_ = true; } AgentInet4UcRtSandesh(VrfEntry *vrf, std::string context, - Ip4Address addr, uint8_t plen, bool stale) - : AgentSandesh(context, ""), vrf_(vrf), addr_(addr), plen_(plen), + Ip4Address addr, uint8_t plen, bool stale) + : AgentSandesh(context, ""), vrf_(vrf), addr_(addr), plen_(plen), stale_(stale) { dump_table_ = false; } @@ -294,8 +294,8 @@ class AgentInet4UcRtSandesh : public AgentSandesh { class AgentInet4McRtSandesh : public AgentSandesh { public: - AgentInet4McRtSandesh(VrfEntry *vrf, std::string context, std::string name, - bool stale) + AgentInet4McRtSandesh(VrfEntry *vrf, std::string context, std::string name, + bool stale) : AgentSandesh(context, name), vrf_(vrf), stale_(stale) { dump_table_ = true; } @@ -336,8 +336,8 @@ class AgentLayer2RtSandesh : public AgentSandesh { class AgentBridgeRtSandesh : public AgentSandesh { public: - AgentBridgeRtSandesh(VrfEntry *vrf, std::string context, std::string name, - bool stale) + AgentBridgeRtSandesh(VrfEntry *vrf, std::string context, std::string name, + bool stale) : AgentSandesh(context, name), vrf_(vrf), stale_(stale) {} private: @@ -366,13 +366,13 @@ class AgentEvpnRtSandesh : public AgentSandesh { class AgentInet6UcRtSandesh : public AgentSandesh { public: - AgentInet6UcRtSandesh(VrfEntry *vrf, std::string context, bool stale) : + AgentInet6UcRtSandesh(VrfEntry *vrf, std::string context, bool stale) : AgentSandesh(context, ""), vrf_(vrf), stale_(stale) { dump_table_ = true; } AgentInet6UcRtSandesh(VrfEntry *vrf, std::string context, - Ip6Address addr, uint8_t plen, bool stale) : - AgentSandesh(context, ""), vrf_(vrf), addr_(addr), plen_(plen), + Ip6Address addr, uint8_t plen, bool stale) : + AgentSandesh(context, ""), vrf_(vrf), addr_(addr), plen_(plen), stale_(stale) { dump_table_ = false; } diff --git a/src/vnsw/agent/oper/bgp_as_service.cc b/src/vnsw/agent/oper/bgp_as_service.cc index fcea2689f55..b956ae89909 100644 --- a/src/vnsw/agent/oper/bgp_as_service.cc +++ b/src/vnsw/agent/oper/bgp_as_service.cc @@ -666,7 +666,7 @@ BgpAsAService::BgpAsAServiceEntry::BgpAsAServiceEntry (const BgpAsAService::BgpAsAServiceEntry &rhs) : VmInterface::ListEntry(rhs.del_pending_), installed_(rhs.installed_), - local_peer_ip_(rhs.local_peer_ip_), + local_peer_ip_(rhs.local_peer_ip_), source_port_(rhs.source_port_), dest_port_(rhs.dest_port_), health_check_configured_(rhs.health_check_configured_), diff --git a/src/vnsw/agent/oper/config_manager.cc b/src/vnsw/agent/oper/config_manager.cc index f9d254d8311..ab954d4c0d3 100644 --- a/src/vnsw/agent/oper/config_manager.cc +++ b/src/vnsw/agent/oper/config_manager.cc @@ -376,7 +376,7 @@ void ConfigManager::Start() { bool ConfigManager::TimerRun() { int count = Run(); process_config_count_[timeout_] += count; - + if (Size() == 0) { timeout_ = kMinTimeout; return false; diff --git a/src/vnsw/agent/oper/config_manager.h b/src/vnsw/agent/oper/config_manager.h index 8c3133e4f36..febbe92566c 100644 --- a/src/vnsw/agent/oper/config_manager.h +++ b/src/vnsw/agent/oper/config_manager.h @@ -9,18 +9,18 @@ * process configuration thru IFNodeToReq or IFLinkToReq callback methods. * * In scaled environments there can be large number of invocations to - * IFNodeToReq and IFLinkToReq APIs. The config processing routines are + * IFNodeToReq and IFLinkToReq APIs. The config processing routines are * written to act on the latest version of configuration. So, an invocation * of config routine will override all previous invocations. Ideally, we wnat * to invoke the config callbacks only once after all configuraiton is * received. However, we dont have any marker to identify end of configuration. - * - * The next best design we follow is to add the objects changed into a + * + * The next best design we follow is to add the objects changed into a * change list. The change-list is run from a task-trigger. The list can * potentially compress multiple changes to a node * - * The changelist should also take care of dependency between objects. For - * example, VMInterface has reference to VirtualNetwork. So, the change list + * The changelist should also take care of dependency between objects. For + * example, VMInterface has reference to VirtualNetwork. So, the change list * for virtual-network should be invoked before VMInterface. The changelist * should take of all dependencies. * diff --git a/src/vnsw/agent/oper/ecmp.cc b/src/vnsw/agent/oper/ecmp.cc index e686f379176..ed95d5ff6a6 100644 --- a/src/vnsw/agent/oper/ecmp.cc +++ b/src/vnsw/agent/oper/ecmp.cc @@ -147,7 +147,7 @@ bool EcmpData::EcmpAddPath(AgentRoute *rt) { bool ret = false; if (count == 2 && ecmp_path_ == NULL) { - // This is second path being added, make ECMP + // This is second path being added, make ECMP AllocateEcmpPath(rt, vm_port_path); ret = true; } else if (count > 2) { @@ -274,7 +274,7 @@ bool EcmpData::EcmpDeletePath(AgentRoute *rt) { // Composite-NH is made from LOCAL_VM_PORT_PEER, count number of paths // with LOCAL_VM_PORT_PEER int count = 0; - for(Route::PathList::const_iterator it = rt->GetPathList().begin(); + for(Route::PathList::const_iterator it = rt->GetPathList().begin(); it != rt->GetPathList().end(); it++) { const AgentPath *it_path = static_cast(it.operator->()); diff --git a/src/vnsw/agent/oper/ecmp_load_balance.h b/src/vnsw/agent/oper/ecmp_load_balance.h index 48ff6ef7a59..9225bddf00e 100644 --- a/src/vnsw/agent/oper/ecmp_load_balance.h +++ b/src/vnsw/agent/oper/ecmp_load_balance.h @@ -37,7 +37,7 @@ class EcmpLoadBalance { SetAll(); } virtual ~EcmpLoadBalance() { } - + const std::string &source_ip_str() const { return HashingFieldsStr[(uint8_t)EcmpLoadBalance::SOURCE_IP]; } @@ -165,7 +165,7 @@ class EcmpLoadBalance { bool UpdateFields (const autogen::EcmpHashingIncludeFields &ecmp_hashing_fields) { - bool ret = false; + bool ret = false; if (hash_fields_to_use_[SOURCE_IP] != ecmp_hashing_fields.source_ip) { hash_fields_to_use_[SOURCE_IP] = ecmp_hashing_fields.source_ip; @@ -196,7 +196,7 @@ class EcmpLoadBalance { return ret; } -private: +private: bool hash_fields_to_use_[NUM_HASH_FIELDS]; }; diff --git a/src/vnsw/agent/oper/global_vrouter.cc b/src/vnsw/agent/oper/global_vrouter.cc index 42ea0e3ceab..1e1f5fe1ce4 100644 --- a/src/vnsw/agent/oper/global_vrouter.cc +++ b/src/vnsw/agent/oper/global_vrouter.cc @@ -264,9 +264,9 @@ class GlobalVrouter::FabricDnsResolver { ResolveMap::iterator it = address_map_.find(name); if (it != address_map_.end()) { address_map_.erase(it); - new_addr_map.insert(ResolvePair(name, it->second)); + new_addr_map.insert(ResolvePair(name, it->second)); } else { - new_addr_map.insert(ResolvePair(name, empty_addr_list)); + new_addr_map.insert(ResolvePair(name, empty_addr_list)); } } address_map_.swap(new_addr_map); @@ -328,7 +328,7 @@ class GlobalVrouter::FabricDnsResolver { request_count_++; } - // called in asio context, handle resolve response + // called in asio context, handle resolve response void ResolveHandler(const boost::system::error_code& error, boost_udp::resolver::iterator resolve_it, std::string &name, boost_udp::resolver *resolver) { @@ -367,7 +367,7 @@ class GlobalVrouter::FabricDnsResolver { // Also, add / delete receive routes for link local addresses in different VRFs class GlobalVrouter::LinkLocalRouteManager { public: - LinkLocalRouteManager(GlobalVrouter *vrouter) + LinkLocalRouteManager(GlobalVrouter *vrouter) : global_vrouter_(vrouter), vn_id_(DBTableBase::kInvalidId){ } @@ -510,7 +510,7 @@ bool GlobalVrouter::LinkLocalRouteManager::VnNotify(DBTablePartBase *partition, VrfEntry *vrf_entry = vn_entry->GetVrf(); Agent *agent = global_vrouter_->agent(); if (vn_entry->IsDeleted() || !vn_entry->layer3_forwarding() || !vrf_entry) { - LinkLocalDBState *state = static_cast + LinkLocalDBState *state = static_cast (vn_entry->GetState(partition->parent(), vn_id_)); if (!state) return true; @@ -630,7 +630,7 @@ void GlobalVrouter::UpdateSLOConfig(IFMapNode *node) { // Handle incoming global vrouter configuration void GlobalVrouter::GlobalVrouterConfig(IFMapNode *node) { - Agent::VxLanNetworkIdentifierMode cfg_vxlan_network_identifier_mode = + Agent::VxLanNetworkIdentifierMode cfg_vxlan_network_identifier_mode = Agent::AUTOMATIC; bool resync_vn = false; //resync_vn walks internally calls VMI walk. bool resync_route = false; @@ -638,7 +638,7 @@ void GlobalVrouter::GlobalVrouterConfig(IFMapNode *node) { if (node->IsDeleted() == false) { UpdateSLOConfig(node); - autogen::GlobalVrouterConfig *cfg = + autogen::GlobalVrouterConfig *cfg = static_cast(node->GetObject()); agent()->set_global_slo_status(cfg->enable_security_logging()); @@ -649,7 +649,7 @@ void GlobalVrouter::GlobalVrouterConfig(IFMapNode *node) { cfg_vxlan_network_identifier_mode = Agent::CONFIGURED; } UpdateLinkLocalServiceConfig(cfg->linklocal_services()); - UpdateCryptTunnelEndpointConfig(cfg->encryption_tunnel_endpoints(), + UpdateCryptTunnelEndpointConfig(cfg->encryption_tunnel_endpoints(), cfg->encryption_mode()); //Take the forwarding mode if its set, else fallback to l2_l3. @@ -686,7 +686,7 @@ void GlobalVrouter::GlobalVrouterConfig(IFMapNode *node) { DeletePortConfig(); } - if (cfg_vxlan_network_identifier_mode != + if (cfg_vxlan_network_identifier_mode != agent()->vxlan_network_identifier_mode()) { agent()->set_vxlan_network_identifier_mode (cfg_vxlan_network_identifier_mode); @@ -866,7 +866,7 @@ void GlobalVrouter::UpdateLinkLocalServiceConfig( void GlobalVrouter::DeleteLinkLocalServiceConfig() { std::vector dns_name_list; LinkLocalServicesMap linklocal_services_map; - + linklocal_services_map_.swap(linklocal_services_map); fabric_dns_resolver_->ResolveList(dns_name_list); ChangeNotify(&linklocal_services_map, &linklocal_services_map_); @@ -1027,7 +1027,7 @@ void GlobalVrouter::UpdateCryptTunnelEndpointConfig( if (it->tunnel_remote_ip_address.compare(agent()->router_id().to_string()) == 0) { continue; } - crypt_tunnels_map.insert(CryptTunnelsPair(CryptTunnelKey(it->tunnel_remote_ip_address), + crypt_tunnels_map.insert(CryptTunnelsPair(CryptTunnelKey(it->tunnel_remote_ip_address), CryptTunnel(mode))); } crypt_tunnels_map_.swap(crypt_tunnels_map); diff --git a/src/vnsw/agent/oper/global_vrouter.h b/src/vnsw/agent/oper/global_vrouter.h index a37ce782933..a0c3e6745c2 100644 --- a/src/vnsw/agent/oper/global_vrouter.h +++ b/src/vnsw/agent/oper/global_vrouter.h @@ -106,7 +106,7 @@ class GlobalVrouter : public OperIFMapTable { } }; - typedef std::string CryptTunnelKey; + typedef std::string CryptTunnelKey; struct CryptTunnel { CryptMode mode; CryptTunnel(CryptMode cmode): mode(cmode) {}; @@ -185,7 +185,7 @@ class GlobalVrouter : public OperIFMapTable { void ChangeLinkLocalService(const LinkLocalServicesMap::iterator &old_it, const LinkLocalServicesMap::iterator &new_it); - void UpdateCryptTunnelEndpointConfig(const EncryptionTunnelEndpointList &endpoint_list, + void UpdateCryptTunnelEndpointConfig(const EncryptionTunnelEndpointList &endpoint_list, const std::string encrypt_mode_str); void DeleteCryptTunnelEndpointConfig(); bool ChangeNotifyCryptTunnels(CryptTunnelsMap *old_value, diff --git a/src/vnsw/agent/oper/ifmap_dependency_manager.cc b/src/vnsw/agent/oper/ifmap_dependency_manager.cc index 68bf6bfbddc..d03a35a34c9 100644 --- a/src/vnsw/agent/oper/ifmap_dependency_manager.cc +++ b/src/vnsw/agent/oper/ifmap_dependency_manager.cc @@ -3,7 +3,7 @@ */ #include -#include +#include #include #include "oper/oper_db.h" @@ -272,7 +272,7 @@ void IFMapDependencyManager::PropogateNodeAndLinkChange(IFMapNode *node) { trigger_->Set(); } - + void IFMapDependencyManager::LinkObserver( DBTablePartBase *root, DBEntryBase *db_entry) { IFMapLink *link = static_cast(db_entry); diff --git a/src/vnsw/agent/oper/inet4_multicast_route.cc b/src/vnsw/agent/oper/inet4_multicast_route.cc index 2c5465c3744..e1df619236d 100644 --- a/src/vnsw/agent/oper/inet4_multicast_route.cc +++ b/src/vnsw/agent/oper/inet4_multicast_route.cc @@ -31,14 +31,14 @@ static void MulticastTableEnqueue(Agent *agent, DBRequest *req) { static void MulticastTableProcess(Agent *agent, const string &vrf_name, DBRequest &req) { - AgentRouteTable *table = + AgentRouteTable *table = agent->vrf_table()->GetInet4MulticastRouteTable(vrf_name); if (table) { table->Process(req); } } -DBTableBase *Inet4MulticastAgentRouteTable::CreateTable(DB *db, +DBTableBase *Inet4MulticastAgentRouteTable::CreateTable(DB *db, const std::string &name) { AgentRouteTable *table = new Inet4MulticastAgentRouteTable(db, name); table->Init(); @@ -46,8 +46,8 @@ DBTableBase *Inet4MulticastAgentRouteTable::CreateTable(DB *db, return table; } -void -Inet4MulticastAgentRouteTable::AddMulticastRoute(const string &vrf_name, +void +Inet4MulticastAgentRouteTable::AddMulticastRoute(const string &vrf_name, const string &vn_name, const Ip4Address &src_addr, const Ip4Address &grp_addr, @@ -66,8 +66,8 @@ Inet4MulticastAgentRouteTable::AddMulticastRoute(const string &vrf_name, DBRequest req; req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; - Inet4MulticastRouteKey *rt_key = new Inet4MulticastRouteKey(vrf_name, - grp_addr, + Inet4MulticastRouteKey *rt_key = new Inet4MulticastRouteKey(vrf_name, + grp_addr, src_addr); MulticastRoute *data = new MulticastRoute(vn_name, MplsTable::kInvalidLabel, @@ -77,7 +77,7 @@ Inet4MulticastAgentRouteTable::AddMulticastRoute(const string &vrf_name, req.key.reset(rt_key); req.data.reset(data); MulticastTableEnqueue(Agent::GetInstance(), &req); -} +} void Inet4MulticastAgentRouteTable::AddMulticastRoute(const Peer *peer, @@ -96,11 +96,11 @@ Inet4MulticastAgentRouteTable::AddMulticastRoute(const Peer *peer, MulticastTableEnqueue(Agent::GetInstance(), &req); } -void +void Inet4MulticastAgentRouteTable::AddVHostRecvRoute(const string &vm_vrf, const string &interface_name, const Ip4Address &addr, - bool policy) + bool policy) { DBRequest req; @@ -108,7 +108,7 @@ Inet4MulticastAgentRouteTable::AddVHostRecvRoute(const string &vm_vrf, Inet4MulticastRouteKey *rt_key = new Inet4MulticastRouteKey(vm_vrf, addr); req.key.reset(rt_key); VmInterfaceKey intf_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), interface_name); - ReceiveRoute *data = + ReceiveRoute *data = new ReceiveRoute(intf_key, MplsTable::kInvalidLabel, TunnelType::AllType(), policy, Agent::GetInstance()->fabric_vn_name()); @@ -117,16 +117,16 @@ Inet4MulticastAgentRouteTable::AddVHostRecvRoute(const string &vm_vrf, MulticastTableEnqueue(Agent::GetInstance(), &req); } -void -Inet4MulticastAgentRouteTable::DeleteMulticastRoute(const string &vrf_name, +void +Inet4MulticastAgentRouteTable::DeleteMulticastRoute(const string &vrf_name, const Ip4Address &src_addr, - const Ip4Address &grp_addr) + const Ip4Address &grp_addr) { DBRequest req; req.oper = DBRequest::DB_ENTRY_DELETE; - Inet4MulticastRouteKey *rt_key = new Inet4MulticastRouteKey(vrf_name, - grp_addr, + Inet4MulticastRouteKey *rt_key = new Inet4MulticastRouteKey(vrf_name, + grp_addr, src_addr); req.key.reset(rt_key); @@ -171,7 +171,7 @@ void Inet4MulticastAgentRouteTable::Delete(const string &vrf_name, } AgentRoute * -Inet4MulticastRouteKey::AllocRouteEntry(VrfEntry *vrf, bool is_multicast) const +Inet4MulticastRouteKey::AllocRouteEntry(VrfEntry *vrf, bool is_multicast) const { Inet4MulticastRouteEntry * entry = new Inet4MulticastRouteEntry(vrf, dip_, sip_); @@ -209,7 +209,7 @@ string Inet4MulticastRouteEntry::ToString() const { } int Inet4MulticastRouteEntry::CompareTo(const Route &rhs) const { - const Inet4MulticastRouteEntry &a = + const Inet4MulticastRouteEntry &a = static_cast(rhs); if (src_addr_ < a.src_addr_) @@ -217,7 +217,7 @@ int Inet4MulticastRouteEntry::CompareTo(const Route &rhs) const { if (src_addr_ > a.src_addr_) return 1; - + if (dst_addr_ < a.dst_addr_) return -1; @@ -228,14 +228,14 @@ int Inet4MulticastRouteEntry::CompareTo(const Route &rhs) const { } DBEntryBase::KeyPtr Inet4MulticastRouteEntry::GetDBRequestKey() const { - Inet4MulticastRouteKey *key = - new Inet4MulticastRouteKey(vrf()->GetName(), dst_addr_, + Inet4MulticastRouteKey *key = + new Inet4MulticastRouteKey(vrf()->GetName(), dst_addr_, src_addr_); return DBEntryBase::KeyPtr(key); } void Inet4MulticastRouteEntry::SetKey(const DBRequestKey *key) { - const Inet4MulticastRouteKey *k = + const Inet4MulticastRouteKey *k = static_cast(key); SetVrf(Agent::GetInstance()->vrf_table()->FindVrfFromName(k->vrf_name())); Ip4Address grp(k->dest_ip_addr()); @@ -266,7 +266,7 @@ bool Inet4MulticastRouteEntry::DBEntrySandesh(Sandesh *sresp, bool stale) const GetActiveNextHop()->SetNHSandeshData(data.nh); } - std::vector &list = + std::vector &list = const_cast&>(resp->get_route_list()); list.push_back(data); return true; @@ -285,7 +285,7 @@ bool Inet4MulticastRouteEntry::DBEntrySandesh(Sandesh *sresp, } void Inet4McRouteReq::HandleRequest() const { - VrfEntry *vrf = + VrfEntry *vrf = Agent::GetInstance()->vrf_table()->FindVrfFromId(get_vrf_index()); if (!vrf) { ErrorResp *resp = new ErrorResp(); diff --git a/src/vnsw/agent/oper/inet4_multicast_route.h b/src/vnsw/agent/oper/inet4_multicast_route.h index 780c33f7128..fb178191ace 100644 --- a/src/vnsw/agent/oper/inet4_multicast_route.h +++ b/src/vnsw/agent/oper/inet4_multicast_route.h @@ -43,9 +43,9 @@ class Inet4MulticastAgentRouteTable : public AgentRouteTable { const Ip4Address &grp_addr, uint32_t ethernet_tag, AgentRouteData *data); - static void DeleteMulticastRoute(const string &vrf_name, + static void DeleteMulticastRoute(const string &vrf_name, const Ip4Address &src_addr, - const Ip4Address &grp_addr); + const Ip4Address &grp_addr); static void DeleteMulticastRoute(const Peer *peer, const string &vrf_name, const Ip4Address &src_addr, @@ -61,7 +61,7 @@ class Inet4MulticastAgentRouteTable : public AgentRouteTable { class Inet4MulticastRouteEntry : public AgentRoute { public: - Inet4MulticastRouteEntry(VrfEntry *vrf, const Ip4Address &dst, + Inet4MulticastRouteEntry(VrfEntry *vrf, const Ip4Address &dst, const Ip4Address &src) : AgentRoute(vrf, true), dst_addr_(dst), src_addr_(src) { } @@ -107,7 +107,7 @@ class Inet4MulticastRouteKey : public AgentRouteKey { AgentRouteKey(peer, vrf_name), dip_(dip), sip_(sip), ethernet_tag_(ethernet_tag) { } - Inet4MulticastRouteKey(const string &vrf_name,const Ip4Address &dip, + Inet4MulticastRouteKey(const string &vrf_name,const Ip4Address &dip, const Ip4Address &sip) : AgentRouteKey(Agent::GetInstance()->multicast_peer(), vrf_name), dip_(dip), sip_(sip) { @@ -115,12 +115,12 @@ class Inet4MulticastRouteKey : public AgentRouteKey { } Inet4MulticastRouteKey(const string &vrf_name, const Ip4Address &dip) : AgentRouteKey(Agent::GetInstance()->multicast_peer(), vrf_name), - dip_(dip) { + dip_(dip) { boost::system::error_code ec; sip_ = IpAddress::from_string("0.0.0.0", ec).to_v4(); ethernet_tag_ = 0; } - Inet4MulticastRouteKey(const string &vrf_name) : + Inet4MulticastRouteKey(const string &vrf_name) : AgentRouteKey(Agent::GetInstance()->multicast_peer(), vrf_name) { boost::system::error_code ec; dip_ = IpAddress::from_string("255.255.255.255", ec).to_v4(); diff --git a/src/vnsw/agent/oper/inet_interface.cc b/src/vnsw/agent/oper/inet_interface.cc index e9b88845cbb..3ce1abb2b8f 100644 --- a/src/vnsw/agent/oper/inet_interface.cc +++ b/src/vnsw/agent/oper/inet_interface.cc @@ -55,7 +55,7 @@ Interface *InetInterfaceKey::AllocEntry(const InterfaceTable *table) const { Interface *InetInterfaceKey::AllocEntry(const InterfaceTable *table, const InterfaceData *data)const { - const InetInterfaceData *vhost_data = + const InetInterfaceData *vhost_data = static_cast(data); VrfKey key(data->vrf_name_); @@ -63,7 +63,7 @@ Interface *InetInterfaceKey::AllocEntry(const InterfaceTable *table, (table->agent()->vrf_table()->FindActiveEntry(&key)); assert(vrf); - Interface *xconnect = NULL; + Interface *xconnect = NULL; if (vhost_data->sub_type_ == InetInterface::VHOST) { PhysicalInterfaceKey key(vhost_data->xconnect_); xconnect = static_cast @@ -403,7 +403,7 @@ bool InetInterface::Delete(const DBRequest *req) { return true; } -// Interface Activate cannot be done in AllocEntry. It must be done in PostAdd +// Interface Activate cannot be done in AllocEntry. It must be done in PostAdd // Activating an interface results in adding Interface Nexthops. Creating of // Interface NH from AllocEntry will fail since the interface is not yet added // in DB Table PartitionInterface. So, Activate an interface in PostAdd diff --git a/src/vnsw/agent/oper/inet_interface.h b/src/vnsw/agent/oper/inet_interface.h index fcb20443b5d..34f2f7a2f2a 100644 --- a/src/vnsw/agent/oper/inet_interface.h +++ b/src/vnsw/agent/oper/inet_interface.h @@ -8,7 +8,7 @@ struct InetInterfaceData; ///////////////////////////////////////////////////////////////////////////// -// Implementation of inet interfaces created in host-os. +// Implementation of inet interfaces created in host-os. // // Example interfaces: // vhost0 : A L3 interface between host-os and vrouter. Used in KVM mode @@ -89,7 +89,7 @@ struct InetInterfaceKey : public InterfaceKey { }; struct InetInterfaceData : public InterfaceData { - InetInterfaceData(InetInterface::SubType sub_type, + InetInterfaceData(InetInterface::SubType sub_type, const std::string &vrf_name, const Ip4Address &addr, int plen, const Ip4Address &gw, const std::string &xconnect, const std::string vn_name, diff --git a/src/vnsw/agent/oper/inet_unicast_route.cc b/src/vnsw/agent/oper/inet_unicast_route.cc index 0b55f782b01..e98c032d506 100644 --- a/src/vnsw/agent/oper/inet_unicast_route.cc +++ b/src/vnsw/agent/oper/inet_unicast_route.cc @@ -226,7 +226,7 @@ bool InetUnicastAgentRouteTable::ResyncSubnetRoutes //3) Skip all the host routes present under this subnet belonging to a better // subnet(better subnet is the one which comes under subnet being added). // e.g. 1.1.1.10/24 is a better subnet in 1.1.1.10/16 while supernet can be -// 1.1.1.0/8 +// 1.1.1.0/8 void InetUnicastAgentRouteTable::TraverseHostRoutesInSubnet(InetUnicastRouteEntry *rt, const Peer *peer) @@ -273,7 +273,7 @@ InetUnicastAgentRouteTable::TraverseHostRoutesInSubnet(InetUnicastRouteEntry *rt //Proceed only for host route //Resync will ensure that subnet route is added to lpm host route //dependant rt(gw_ip). - lpm_rt->EnqueueRouteResync(); + lpm_rt->EnqueueRouteResync(); } } @@ -362,9 +362,9 @@ DBEntryBase::KeyPtr InetUnicastRouteEntry::GetDBRequestKey() const { } void InetUnicastRouteEntry::SetKey(const DBRequestKey *key) { - Agent *agent = + Agent *agent = (static_cast(get_table()))->agent(); - const InetUnicastRouteKey *k = + const InetUnicastRouteKey *k = static_cast(key); SetVrf(agent->vrf_table()->FindVrfFromName(k->vrf_name())); IpAddress tmp(k->addr()); @@ -414,7 +414,7 @@ InetUnicastRouteEntry::GetIpamSuperNetRoute() const { InetUnicastRouteEntry key(vrf(), addr_, plen, false); // Find next highest matching route InetUnicastRouteEntry *supernet_rt = table->FindRouteUsingKey(key); - + if (supernet_rt == NULL) return NULL; @@ -541,10 +541,10 @@ bool Inet4UnicastArpRoute::AddChangePathExtended(Agent *agent, AgentPath *path, bool ret = true; ArpNHKey key(vrf_name_, addr_, policy_); - NextHop *nh = + NextHop *nh = static_cast(agent->nexthop_table()->FindActiveEntry(&key)); path->set_unresolved(false); - + if (path->dest_vn_list() != vn_list_) { path->set_dest_vn_list(vn_list_); ret = true; @@ -581,7 +581,7 @@ bool Inet4UnicastGatewayRoute::AddChangePathExtended(Agent *agent, AgentPath *pa InetUnicastAgentRouteTable *table = NULL; table = static_cast (agent->vrf_table()->GetInet4UnicastRouteTable(vrf_name_)); - InetUnicastRouteEntry *rt = table->FindRoute(gw_ip_); + InetUnicastRouteEntry *rt = table->FindRoute(gw_ip_); if (rt == NULL || rt->plen() == 0) { path->set_unresolved(true); } else if (rt->GetActiveNextHop()->GetType() == NextHop::RESOLVE) { @@ -833,7 +833,7 @@ void UnresolvedRoute::HandleRequest() const { } void Inet4UcRouteReq::HandleRequest() const { - VrfEntry *vrf = + VrfEntry *vrf = Agent::GetInstance()->vrf_table()->FindVrfFromId(get_vrf_index()); if (!vrf) { ErrorResp *resp = new ErrorResp(); @@ -905,7 +905,7 @@ InetUnicastAgentRouteTable::DeleteReq(const Peer *peer, const string &vrf_name, } // Inline delete request -void +void InetUnicastAgentRouteTable::Delete(const Peer *peer, const string &vrf_name, const IpAddress &addr, uint8_t plen) { DBRequest req(DBRequest::DB_ENTRY_DELETE); @@ -914,7 +914,7 @@ InetUnicastAgentRouteTable::Delete(const Peer *peer, const string &vrf_name, InetUnicastTableProcess(Agent::GetInstance(), vrf_name, req); } -void +void InetUnicastAgentRouteTable::Delete(const Peer *peer, const string &vrf_name, const IpAddress &addr, uint8_t plen, AgentRouteData *data) { @@ -926,7 +926,7 @@ InetUnicastAgentRouteTable::Delete(const Peer *peer, const string &vrf_name, // Utility function to create a route to trap packets to agent. // Assumes that Interface-NH for "HOST Interface" is already present -void +void InetUnicastAgentRouteTable::AddHostRoute(const string &vrf_name, const IpAddress &addr, uint8_t plen, @@ -946,7 +946,7 @@ InetUnicastAgentRouteTable::AddHostRoute(const string &vrf_name, } // Create Route with VLAN NH -void +void InetUnicastAgentRouteTable::AddVlanNHRouteReq(const Peer *peer, const string &vm_vrf, const IpAddress &addr, @@ -1076,7 +1076,7 @@ InetUnicastAgentRouteTable::AddClonedLocalPathReq(const Peer *peer, // Create Route for a local VM // Assumes that Interface-NH for "VM Port" is already present -void +void InetUnicastAgentRouteTable::AddLocalVmRoute(const Peer *peer, const string &vm_vrf, const IpAddress &addr, @@ -1114,8 +1114,8 @@ InetUnicastAgentRouteTable::AddLocalVmRoute(const Peer *peer, InetUnicastTableProcess(Agent::GetInstance(), vm_vrf, req); } -void -InetUnicastAgentRouteTable::AddRemoteVmRouteReq(const Peer *peer, +void +InetUnicastAgentRouteTable::AddRemoteVmRouteReq(const Peer *peer, const string &vm_vrf, const IpAddress &vm_addr, uint8_t plen, @@ -1127,7 +1127,7 @@ InetUnicastAgentRouteTable::AddRemoteVmRouteReq(const Peer *peer, req.data.reset(data); InetUnicastTableEnqueue(Agent::GetInstance(), vm_vrf, &req); } - + void InetUnicastAgentRouteTable::AddArpReq(const string &route_vrf_name, const Ip4Address &ip, @@ -1194,7 +1194,7 @@ InetUnicastAgentRouteTable::ArpRoute(DBRequest::DBOperation op, case DBRequest::DB_ENTRY_DELETE: { VrfEntry *vrf = agent->vrf_table()->FindVrfFromName(route_vrf_name); - InetUnicastRouteEntry *rt = + InetUnicastRouteEntry *rt = static_cast(vrf-> GetInet4UnicastRouteTable()->Find(rt_key)); assert(resolved==false); @@ -1245,7 +1245,7 @@ InetUnicastAgentRouteTable::CheckAndAddArpReq(const string &vrf_name, void InetUnicastAgentRouteTable::AddResolveRoute(const Peer *peer, const string &vrf_name, - const Ip4Address &ip, + const Ip4Address &ip, const uint8_t plen, const InterfaceKey &intf, const uint32_t label, diff --git a/src/vnsw/agent/oper/inet_unicast_route.h b/src/vnsw/agent/oper/inet_unicast_route.h index bdd7fc5014b..5d69c926ed5 100644 --- a/src/vnsw/agent/oper/inet_unicast_route.h +++ b/src/vnsw/agent/oper/inet_unicast_route.h @@ -78,7 +78,7 @@ class InetUnicastRouteEntry : public AgentRoute { uint8_t plen() const { return plen_; } void set_plen(int plen) { plen_ = plen; } - //Key for patricia node lookup + //Key for patricia node lookup class Rtkey { public: static std::size_t BitLength(const AgentRoute *key) { @@ -153,10 +153,10 @@ class InetUnicastAgentRouteTable : public AgentRouteTable { virtual Agent::RouteTableType GetTableType() const { return type_; } - virtual void ProcessAdd(AgentRoute *rt) { + virtual void ProcessAdd(AgentRoute *rt) { tree_.Insert(static_cast(rt)); } - virtual void ProcessDelete(AgentRoute *rt) { + virtual void ProcessDelete(AgentRoute *rt) { tree_.Remove(static_cast(rt)); } virtual AgentSandeshPtr GetAgentSandesh(const AgentSandeshArguments *args, @@ -246,7 +246,7 @@ class InetUnicastAgentRouteTable : public AgentRouteTable { const TagList &tag_list, const PathPreference &path_preference); InetUnicastRouteEntry *FindResolveRoute(const Ip4Address &ip); - static InetUnicastRouteEntry *FindResolveRoute(const string &vrf_name, + static InetUnicastRouteEntry *FindResolveRoute(const string &vrf_name, const Ip4Address &ip); static void CheckAndAddArpReq(const string &vrf_name, const Ip4Address &ip, const Interface *intf, diff --git a/src/vnsw/agent/oper/instance_task.cc b/src/vnsw/agent/oper/instance_task.cc index ed21e35a260..a8a955490e5 100644 --- a/src/vnsw/agent/oper/instance_task.cc +++ b/src/vnsw/agent/oper/instance_task.cc @@ -65,7 +65,7 @@ bool InstanceTaskExecvp::IsSetup() { // "running" and return "false" to caller, so that caller does not // attempt to run the same task again. In this case, the child process // exit notification can not be received by instance manager, hence -// instance manager has to rely on TaskTimeout delete the task. +// instance manager has to rely on TaskTimeout delete the task. bool InstanceTaskExecvp::Run() { std::vector argv; diff --git a/src/vnsw/agent/oper/instance_task.h b/src/vnsw/agent/oper/instance_task.h index cec61692882..d27c8ff6e52 100644 --- a/src/vnsw/agent/oper/instance_task.h +++ b/src/vnsw/agent/oper/instance_task.h @@ -121,7 +121,7 @@ class InstanceTaskMethod : public InstanceTask { public: pid_t pid() const { return 0; - } + } }; class InstanceTaskQueue { diff --git a/src/vnsw/agent/oper/interface.cc b/src/vnsw/agent/oper/interface.cc index a805e2f7373..72aaa0b1c79 100644 --- a/src/vnsw/agent/oper/interface.cc +++ b/src/vnsw/agent/oper/interface.cc @@ -66,7 +66,7 @@ InterfaceTable::InterfaceTable(DB *db, const std::string &name) : this, _1, _2)); } -void InterfaceTable::Init(OperDB *oper) { +void InterfaceTable::Init(OperDB *oper) { operdb_ = oper; agent_ = oper->agent(); } @@ -155,7 +155,7 @@ bool InterfaceTable::ProcessConfig(IFMapNode *node, DBRequest &req, std::auto_ptr InterfaceTable::AllocEntry(const DBRequestKey *k) const{ const InterfaceKey *key = static_cast(k); - + return std::auto_ptr(static_cast (key->AllocEntry(this))); } @@ -942,9 +942,9 @@ void Interface::SetItfSandeshData(ItfSandeshData &data) const { reason += " >"; data.set_l2_active(reason); } - + std::vector fip_list; - VmInterface::FloatingIpSet::const_iterator it = + VmInterface::FloatingIpSet::const_iterator it = vintf->floating_ip_list().list_.begin(); while (it != vintf->floating_ip_list().list_.end()) { const VmInterface::FloatingIp &ip = *it; @@ -1004,7 +1004,7 @@ void Interface::SetItfSandeshData(ItfSandeshData &data) const { data.set_fip_list(fip_list); std::vector aip_list; - VmInterface::AliasIpSet::const_iterator a_it = + VmInterface::AliasIpSet::const_iterator a_it = vintf->alias_ip_list().list_.begin(); while (a_it != vintf->alias_ip_list().list_.end()) { const VmInterface::AliasIp &ip = *a_it; @@ -1030,7 +1030,7 @@ void Interface::SetItfSandeshData(ItfSandeshData &data) const { // Add Service VLAN list std::vector vlan_list; - VmInterface::ServiceVlanSet::const_iterator vlan_it = + VmInterface::ServiceVlanSet::const_iterator vlan_it = vintf->service_vlan_list().list_.begin(); while (vlan_it != vintf->service_vlan_list().list_.end()) { const VmInterface::ServiceVlan *vlan = vlan_it.operator->(); @@ -1162,7 +1162,7 @@ void Interface::SetItfSandeshData(ItfSandeshData &data) const { VmInterface::SecurityGroupEntrySet::const_iterator sgit; std::vector intf_sg_uuid_l; const VmInterface::SecurityGroupEntryList &sg_uuid_l = vintf->sg_list(); - for (sgit = sg_uuid_l.list_.begin(); sgit != sg_uuid_l.list_.end(); + for (sgit = sg_uuid_l.list_.begin(); sgit != sg_uuid_l.list_.end(); ++sgit) { VmIntfSgUuid sg_id; sg_id.set_sg_uuid(UuidToString(sgit->uuid_)); diff --git a/src/vnsw/agent/oper/interface.h b/src/vnsw/agent/oper/interface.h index 6562b6a7a04..2549199a1eb 100644 --- a/src/vnsw/agent/oper/interface.h +++ b/src/vnsw/agent/oper/interface.h @@ -6,7 +6,7 @@ ///////////////////////////////////////////////////////////////////////////// // Agent supports multiple type of interface. Class Interface is defines -// common attributes of all interfaces. All interfaces derive from the base +// common attributes of all interfaces. All interfaces derive from the base // Interface class ///////////////////////////////////////////////////////////////////////////// @@ -90,7 +90,7 @@ class Interface : AgentRefCount, public AgentOperDBEntry { // DBEntry virtual function. Must be implemented by derived interfaces virtual KeyPtr GetDBRequestKey() const = 0; - //DBEntry virtual function. Implmeneted in base class since its common + //DBEntry virtual function. Implmeneted in base class since its common //for all interfaces virtual void SetKey(const DBRequestKey *key); diff --git a/src/vnsw/agent/oper/mirror_table.cc b/src/vnsw/agent/oper/mirror_table.cc index 59b1cc6730d..3e647a64a5f 100644 --- a/src/vnsw/agent/oper/mirror_table.cc +++ b/src/vnsw/agent/oper/mirror_table.cc @@ -21,7 +21,7 @@ using namespace std; using namespace boost::asio; MirrorTable *MirrorTable::mirror_table_; -MirrorTable::~MirrorTable() { +MirrorTable::~MirrorTable() { boost::system::error_code err; if (udp_sock_.get()) { udp_sock_->close(err); @@ -396,7 +396,7 @@ void MirrorTable::AddMirrorEntry(const std::string &analyzer_name, req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; MirrorEntryKey *key = new MirrorEntryKey(analyzer_name); - MirrorEntryData *data = new MirrorEntryData(vrf_name, sip, + MirrorEntryData *data = new MirrorEntryData(vrf_name, sip, sport, dip, dport, 1, 0 , MacAddress::ZeroMac(), false); req.key.reset(key); @@ -555,13 +555,13 @@ void MirrorTable::ReadHandler(const boost::system::error_code &ec, size_t bytes_transferred) { if (ec) { - LOG(ERROR, "Error reading from Mirror sock. Error : " << + LOG(ERROR, "Error reading from Mirror sock. Error : " << boost::system::system_error(ec).what()); return; } - udp_sock_->async_receive(boost::asio::buffer(rx_buff_, sizeof(rx_buff_)), - boost::bind(&MirrorTable::ReadHandler, this, + udp_sock_->async_receive(boost::asio::buffer(rx_buff_, sizeof(rx_buff_)), + boost::bind(&MirrorTable::ReadHandler, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); } @@ -591,8 +591,8 @@ void MirrorTable::MirrorSockInit(void) { assert(ec.value() == 0); agent()->set_mirror_port(sock_ep.port()); - udp_sock_->async_receive(boost::asio::buffer(rx_buff_, sizeof(rx_buff_)), - boost::bind(&MirrorTable::ReadHandler, this, + udp_sock_->async_receive(boost::asio::buffer(rx_buff_, sizeof(rx_buff_)), + boost::bind(&MirrorTable::ReadHandler, this, boost::asio::placeholders::error, boost::asio::placeholders::bytes_transferred)); } @@ -641,7 +641,7 @@ bool MirrorEntry::DBEntrySandesh(Sandesh *sresp, std::string &name) const { MirrorEntrySandeshData data; set_mirror_entrySandeshData(data); - std::vector &list = + std::vector &list = const_cast&> (resp->get_mirror_entry_list()); list.push_back(data); diff --git a/src/vnsw/agent/oper/mirror_table.h b/src/vnsw/agent/oper/mirror_table.h index 334fae9ee5f..34c915cbaf1 100644 --- a/src/vnsw/agent/oper/mirror_table.h +++ b/src/vnsw/agent/oper/mirror_table.h @@ -55,7 +55,7 @@ struct MirrorEntryData : public AgentData { class MirrorEntry : AgentRefCount, public AgentDBEntry { public: - MirrorEntry(std::string analyzer_name) : + MirrorEntry(std::string analyzer_name) : analyzer_name_(analyzer_name), vrf_(NULL, this), nh_(NULL), vrf_name_(""), createdvrf_(false) { }; virtual ~MirrorEntry() { }; @@ -185,7 +185,7 @@ class MirrorTable : public AgentDBTable { static MirrorEntryData::MirrorEntryFlags DecodeMirrorFlag (const std::string &nh_mode, bool juniper_header); void DeleteMirrorVrf(MirrorEntry *entry); - bool IsConfigured(); + bool IsConfigured(); private: std::auto_ptr udp_sock_; static MirrorTable *mirror_table_; diff --git a/src/vnsw/agent/oper/mpls.cc b/src/vnsw/agent/oper/mpls.cc index 5dae297a644..343870bb993 100644 --- a/src/vnsw/agent/oper/mpls.cc +++ b/src/vnsw/agent/oper/mpls.cc @@ -27,7 +27,7 @@ MplsLabel::MplsLabel(Agent *agent, uint32_t label) : agent_(agent), label_(label), free_label_(false) { } -MplsLabel::~MplsLabel() { +MplsLabel::~MplsLabel() { if (free_label_) agent_->resource_manager()->Release(Resource::MPLS_INDEX, label_); } @@ -46,7 +46,7 @@ DBEntryBase::KeyPtr MplsLabel::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void MplsLabel::SetKey(const DBRequestKey *k) { +void MplsLabel::SetKey(const DBRequestKey *k) { const MplsLabelKey *key = static_cast(k); label_ = key->label(); } @@ -159,7 +159,7 @@ void MplsLabel::SendObjectLog(const AgentDBTable *table, info.set_event(str); const NextHop *nh = nexthop(); const Interface *intf = NULL; - /* Mpls is not expected to have any other nexthop apart from Interface + /* Mpls is not expected to have any other nexthop apart from Interface or Vlan */ if (nh != NULL) { string policy_str("Disabled"); @@ -183,7 +183,7 @@ void MplsLabel::SendObjectLog(const AgentDBTable *table, info.set_vlan_tag(vlan_nh->GetVlanTag()); break; case NextHop::COMPOSITE: - nh_type.assign("Composite"); + nh_type.assign("Composite"); break; default: nh_type.assign("unknown"); diff --git a/src/vnsw/agent/oper/mpls.h b/src/vnsw/agent/oper/mpls.h index 347fb5a02cb..ad3b5f35b89 100644 --- a/src/vnsw/agent/oper/mpls.h +++ b/src/vnsw/agent/oper/mpls.h @@ -61,7 +61,7 @@ class MplsLabel : AgentRefCount, public AgentDBEntry { virtual void SetKey(const DBRequestKey *key); virtual KeyPtr GetDBRequestKey() const; - + virtual uint32_t GetRefCount() const; virtual bool DBEntrySandesh(Sandesh *sresp, std::string &name) const; diff --git a/src/vnsw/agent/oper/multicast.cc b/src/vnsw/agent/oper/multicast.cc index 4bf84dde7cf..cce55dca410 100644 --- a/src/vnsw/agent/oper/multicast.cc +++ b/src/vnsw/agent/oper/multicast.cc @@ -40,8 +40,8 @@ SandeshTraceBufferPtr MulticastTraceBuf(SandeshTraceBufferCreate("Multicast", const Ip4Address MulticastHandler::kBroadcast = Ip4Address(0xFFFFFFFF); /* * Registeration for notification - * VM - Looking for local VM added - * VN - Looking for subnet information from VN + * VM - Looking for local VM added + * VN - Looking for subnet information from VN * Enable trace print messages */ void MulticastHandler::Register() { @@ -128,7 +128,7 @@ void MulticastHandler::DeleteBroadcast(const Peer *peer, } void MulticastHandler::HandleVxLanChange(const VnEntry *vn) { - if (vn->IsDeleted() || !vn->GetVrf()) + if (vn->IsDeleted() || !vn->GetVrf()) return; MulticastGroupObject *obj = @@ -467,7 +467,7 @@ bool MulticastHandler::FilterVmi(const VmInterface *vm_itf) { } /* Registered call for VM */ -void MulticastHandler::ModifyVmInterface(DBTablePartBase *partition, +void MulticastHandler::ModifyVmInterface(DBTablePartBase *partition, DBEntryBase *e) { Interface *intf = static_cast(e); @@ -561,19 +561,19 @@ void MulticastHandler::DeleteVmInterface(const VmInterface *intf, IpAddress::from_string("255.255.255.255", ec).to_v4(); std::set &obj_list = this->GetVmToMulticastObjMap( vm_itf->GetUuid()); - for (std::set::iterator it = obj_list.begin(); + for (std::set::iterator it = obj_list.begin(); it != obj_list.end(); it++) { if (((*it)->vrf_name() != vrf_name) || ((*it)->GetGroupAddress() != bcast_addr)) { continue; } - // When IPAM/VN goes off first than VM then it marks mc obj + // When IPAM/VN goes off first than VM then it marks mc obj // for deletion. Cleanup of related data structures like vm-mcobj // happens when VM goes off. So dont trigger any notify at same time. // However if all local VMs are gone then route will be deleted only - // when VN/IPAM goes off. At that time notify xmpp to unsubscribe - //Deletelocalmember removes vm from mc obj - if (((*it)->DeleteLocalMember(vm_itf->GetUuid()) == true) && + // when VN/IPAM goes off. At that time notify xmpp to unsubscribe + //Deletelocalmember removes vm from mc obj + if (((*it)->DeleteLocalMember(vm_itf->GetUuid()) == true) && ((*it)->IsDeleted() == false) && ((*it)->GetLocalListSize() != 0)) { TriggerLocalRouteChange(*it, agent_->local_vm_peer()); @@ -681,7 +681,7 @@ MulticastGroupObject *MulticastHandler::FindActiveGroupObject( const Ip4Address &dip) { MulticastGroupObject *obj = FindGroupObject(vrf_name, sip, dip); if ((obj == NULL) || obj->IsDeleted()) { - MCTRACE(LogSG, "Multicast object deleted ", vrf_name, + MCTRACE(LogSG, "Multicast object deleted ", vrf_name, sip.to_string(), dip.to_string(), 0); return NULL; } @@ -955,7 +955,7 @@ void MulticastHandler::AddVmInterfaceInFloodGroup(const VmInterface *vm_itf, bool add_route = false; std::string vn_name = vn->GetName(); - //TODO Push every thing via multi proto and remove multi proto check + //TODO Push every thing via multi proto and remove multi proto check //All broadcast addition 255.255.255.255 all_broadcast = this->FindGroupObject(vrf_name, Ip4Address(), broadcast); if (all_broadcast == NULL) { @@ -975,7 +975,7 @@ void MulticastHandler::AddVmInterfaceInFloodGroup(const VmInterface *vm_itf, if (TunnelType::ComputeType(TunnelType::AllType()) == TunnelType::VXLAN) { all_broadcast->set_vxlan_id(vn->GetVxLanId()); - } + } TriggerLocalRouteChange(all_broadcast, agent_->local_vm_peer()); } } @@ -1129,7 +1129,7 @@ void MulticastHandler::ModifyTorMembers(const Peer *peer, } // Helper to delete fabric nh -// For internal delete it uses invalid identifier. +// For internal delete it uses invalid identifier. // For delete via control node it uses the sequence sent. void MulticastGroupObject::FlushAllPeerInfo(const Agent *agent, const Peer *peer, @@ -1166,8 +1166,8 @@ MulticastHandler::MulticastHandler(Agent *agent) : } bool MulticastHandler::FlushPeerInfo(uint64_t peer_sequence) { - for (std::set::iterator it = - GetMulticastObjList().begin(); it != GetMulticastObjList().end(); + for (std::set::iterator it = + GetMulticastObjList().begin(); it != GetMulticastObjList().end(); it++) { //Delete all control node given paths (*it)->FlushAllPeerInfo(agent_, agent_->multicast_tree_builder_peer(), diff --git a/src/vnsw/agent/oper/multicast.h b/src/vnsw/agent/oper/multicast.h index d5cf3b0d410..f1979cae68e 100644 --- a/src/vnsw/agent/oper/multicast.h +++ b/src/vnsw/agent/oper/multicast.h @@ -28,7 +28,7 @@ struct OlistTunnelEntry { OlistTunnelEntry(const boost::uuids::uuid &device_uuid, uint32_t label, const Ip4Address &addr, - TunnelType::TypeBmap bmap) : + TunnelType::TypeBmap bmap) : device_uuid_(device_uuid), label_(label), daddr_(addr), @@ -63,7 +63,7 @@ typedef std::vector TunnelOlist; class MulticastGroupObject { public: typedef DependencyList MGList; - MulticastGroupObject(const std::string &vrf_name, + MulticastGroupObject(const std::string &vrf_name, const Ip4Address &grp_addr, const std::string &vn_name) : vrf_name_(vrf_name), grp_address_(grp_addr), vn_name_(vn_name), @@ -74,7 +74,7 @@ class MulticastGroupObject { boost::system::error_code ec; src_address_ = IpAddress::from_string("0.0.0.0", ec).to_v4(); local_olist_.clear(); - }; + }; MulticastGroupObject(const std::string &vrf_name, const std::string &vn_name, const Ip4Address &grp_addr, @@ -97,8 +97,8 @@ class MulticastGroupObject { return true; }; - //Delete local member from VM list in server - bool DeleteLocalMember(const boost::uuids::uuid &intf_uuid) { + //Delete local member from VM list in server + bool DeleteLocalMember(const boost::uuids::uuid &intf_uuid) { if (local_olist_.find(intf_uuid) == local_olist_.end()) { return false; } @@ -275,7 +275,7 @@ class MulticastHandler { void ModifyFabricMembers(const Peer *peer, const std::string &vrf_name, const Ip4Address &group, - const Ip4Address &source, + const Ip4Address &source, uint32_t source_label, const TunnelOlist &olist, uint64_t peer_identifier = 0); @@ -296,14 +296,14 @@ class MulticastHandler { //Registered for VN notification void ModifyVN(DBTablePartBase *partition, DBEntryBase *e); //Registered for VM notification - void ModifyVmInterface(DBTablePartBase *partition, DBEntryBase *e); - void NotifyPhysicalDevice(DBTablePartBase *partition, DBEntryBase *e); + void ModifyVmInterface(DBTablePartBase *partition, DBEntryBase *e); + void NotifyPhysicalDevice(DBTablePartBase *partition, DBEntryBase *e); //Register VM and VN notification void Register(); //Singleton object reference - static MulticastHandler *GetInstance() { - return obj_; + static MulticastHandler *GetInstance() { + return obj_; }; void TriggerLocalRouteChange(MulticastGroupObject *obj, const Peer *peer); void TriggerRemoteRouteChange(MulticastGroupObject *obj, @@ -414,7 +414,7 @@ class MulticastHandler { bool pbb_etree_enabled); //VM itf to multicast ob - void AddVmToMulticastObjMap(const boost::uuids::uuid &vm_itf_uuid, + void AddVmToMulticastObjMap(const boost::uuids::uuid &vm_itf_uuid, MulticastGroupObject *obj) { this->vm_to_mcobj_list_[vm_itf_uuid].insert(obj); }; diff --git a/src/vnsw/agent/oper/nexthop.cc b/src/vnsw/agent/oper/nexthop.cc index 9955be2f09a..1948987bcde 100644 --- a/src/vnsw/agent/oper/nexthop.cc +++ b/src/vnsw/agent/oper/nexthop.cc @@ -136,7 +136,7 @@ void NextHop::EnqueueResync() const { get_table()->Enqueue(&req); } -void NextHop::FillObjectLog(AgentLogEvent::type event, +void NextHop::FillObjectLog(AgentLogEvent::type event, NextHopObjectLogInfo &info) const { string type_str, policy_str("Disabled"), valid_str("Invalid"), str; switch (type_) { @@ -148,7 +148,7 @@ void NextHop::FillObjectLog(AgentLogEvent::type event, type_str.assign("RECEIVE"); break; - case NextHop::RESOLVE: + case NextHop::RESOLVE: type_str.assign("RESOLVE"); break; @@ -216,7 +216,7 @@ void NextHop::FillObjectLog(AgentLogEvent::type event, info.set_id(id_); } -void NextHop::FillObjectLogIntf(const Interface *intf, +void NextHop::FillObjectLogIntf(const Interface *intf, NextHopObjectLogInfo &info) { if (intf) { string if_type_str; @@ -243,10 +243,10 @@ void NextHop::FillObjectLogIntf(const Interface *intf, } } -void NextHop::FillObjectLogMac(const unsigned char *m, +void NextHop::FillObjectLogMac(const unsigned char *m, NextHopObjectLogInfo &info) { char mstr[32]; - snprintf(mstr, 32, "%02x:%02x:%02x:%02x:%02x:%02x", + snprintf(mstr, 32, "%02x:%02x:%02x:%02x:%02x:%02x", m[0], m[1], m[2], m[3], m[4], m[5]); string mac(mstr); info.set_mac(mac); @@ -349,7 +349,7 @@ VrfEntry *NextHopTable::FindVrfEntry(const VrfKey &key) const { void NextHopTable::Process(DBRequest &req) { agent()->ConcurrencyCheck(); - DBTablePartition *tpart = + DBTablePartition *tpart = static_cast(GetTablePartition(req.key.get())); tpart->Process(NULL, &req); } @@ -365,7 +365,7 @@ void NextHopTable::OnZeroRefcount(AgentDBEntry *e) { agent()->ConcurrencyCheck(); nh->OnZeroRefCount(); - + DBRequest req; req.oper = DBRequest::DB_ENTRY_DELETE; DBEntryBase::KeyPtr key = nh->GetDBRequestKey(); @@ -398,7 +398,7 @@ bool ArpNH::NextHopIsLess(const DBEntry &rhs) const { if (vrf_.get() != a.vrf_.get()) { return vrf_.get() < a.vrf_.get(); } - + return (ip_ < a.ip_); } @@ -496,7 +496,7 @@ NextHop *InterfaceNHKey::AllocEntry() const { bool InterfaceNH::CanAdd() const { if (interface_ == NULL) { - LOG(ERROR, "Invalid Interface in InterfaceNH. Skip Add"); + LOG(ERROR, "Invalid Interface in InterfaceNH. Skip Add"); return false; } @@ -737,7 +737,7 @@ void InterfaceNH::CreatePhysicalInterfaceNh(const string &ifname, req.data.reset(new InterfaceNHData(Agent::GetInstance()->fabric_vrf_name())); NextHopTable::GetInstance()->Process(req); } - + void InterfaceNH::DeletePhysicalInterfaceNh(const string &ifname, const MacAddress &mac) { DBRequest req(DBRequest::DB_ENTRY_DELETE); @@ -777,7 +777,7 @@ bool InterfaceNH::NeedMplsLabel() { ///////////////////////////////////////////////////////////////////////////// bool VrfNH::CanAdd() const { if (vrf_ == NULL) { - LOG(ERROR, "Invalid VRF in VrfNH. Skip Add"); + LOG(ERROR, "Invalid VRF in VrfNH. Skip Add"); return false; } @@ -862,7 +862,7 @@ TunnelNH::~TunnelNH() { bool TunnelNH::CanAdd() const { if (vrf_ == NULL) { - LOG(ERROR, "Invalid VRF in TunnelNH. Skip Add"); + LOG(ERROR, "Invalid VRF in TunnelNH. Skip Add"); return false; } @@ -1144,7 +1144,7 @@ bool MirrorNH::ChangeEntry(const DBRequest *req) { //Trigger ARP resolution valid = false; rt_table->AddUnresolvedNH(this); - + const ResolveNH *nh = static_cast(rt->GetActiveNextHop()); std::string nexthop_vrf = nh->get_interface()->vrf()->GetName(); @@ -1240,7 +1240,7 @@ void MirrorNH::SendObjectLog(const NextHopTable *table, ///////////////////////////////////////////////////////////////////////////// bool ReceiveNH::CanAdd() const { if (interface_ == NULL) { - LOG(ERROR, "Invalid Interface in ReceiveNH. Skip Add"); + LOG(ERROR, "Invalid Interface in ReceiveNH. Skip Add"); return false; } @@ -1252,7 +1252,7 @@ NextHop *ReceiveNHKey::AllocEntry() const { (Agent::GetInstance()->interface_table()->Find(intf_key_.get(), true)); if (intf && intf->IsDeleted() && intf->GetRefCount() == 0) { // Ignore interface which are deleted, and there are no reference to it - // taking reference on deleted interface with refcount 0, would result + // taking reference on deleted interface with refcount 0, would result // in DB state set on deleted interface entry intf = NULL; } @@ -1265,7 +1265,7 @@ void ReceiveNH::SetKey(const DBRequestKey *key) { interface_ = NextHopTable::GetInstance()->FindInterface(*nh_key->intf_key_.get()); }; -// Create 2 ReceiveNH for every VPort. One with policy another without +// Create 2 ReceiveNH for every VPort. One with policy another without // policy void ReceiveNH::Create(NextHopTable *table, const Interface *intf, bool policy) { @@ -1284,7 +1284,7 @@ void ReceiveNH::Create(NextHopTable *table, const Interface *intf, void ReceiveNH::Delete(NextHopTable *table, const Interface *intf, bool policy) { DBRequest req(DBRequest::DB_ENTRY_DELETE); - InterfaceKey *key = + InterfaceKey *key = static_cast(intf->GetDBRequestKey().get())->Clone(); req.key.reset(new ReceiveNHKey(key, policy)); req.data.reset(NULL); @@ -1375,7 +1375,7 @@ void L2ReceiveNH::Create( ) { ///////////////////////////////////////////////////////////////////////////// bool VlanNH::CanAdd() const { if (interface_ == NULL) { - LOG(ERROR, "Invalid Interface in VlanNH. Skip Add"); + LOG(ERROR, "Invalid Interface in VlanNH. Skip Add"); return false; } @@ -1758,7 +1758,7 @@ void CompositeNH::SendObjectLog(const NextHopTable *table, component_nh_info.set_label(comp_nh->label()); component_nh_info.set_server_ip(tun_nh->GetDip()->to_string()); break; - } + } case INTERFACE: { const InterfaceNH *intf_nh = static_cast(nh); @@ -1774,7 +1774,7 @@ void CompositeNH::SendObjectLog(const NextHopTable *table, const VlanNH *vlan_nh = static_cast(nh); component_nh_info.set_type("Vlan"); component_nh_info.set_label(comp_nh->label()); - const Interface *intf = + const Interface *intf = static_cast(vlan_nh->GetInterface()); component_nh_info.set_intf_name(intf->name()); break; @@ -2611,7 +2611,7 @@ void PBBNH::SendObjectLog(const NextHopTable *table, // NextHop Sandesh routines ///////////////////////////////////////////////////////////////////////////// static void FillComponentNextHop(const CompositeNH *comp_nh, - std::vector &list) + std::vector &list) { for (ComponentNHList::const_iterator it = comp_nh->begin(); it != comp_nh->end(); it++) { @@ -2625,7 +2625,7 @@ static void FillComponentNextHop(const CompositeNH *comp_nh, switch (component_nh->nh()->GetType()) { case NextHop::INTERFACE: { sdata.set_type("Interface"); - const InterfaceNH *sub_nh = + const InterfaceNH *sub_nh = static_cast(component_nh->nh()); if (sub_nh && sub_nh->GetInterface()) sdata.set_label(component_nh->label()); @@ -2635,7 +2635,7 @@ static void FillComponentNextHop(const CompositeNH *comp_nh, } case NextHop::TUNNEL: { sdata.set_type("Tunnel"); - const TunnelNH *tnh = + const TunnelNH *tnh = static_cast(component_nh->nh()); sdata.set_dip(tnh->GetDip()->to_string()); sdata.set_sip(tnh->GetSip()->to_string()); @@ -2645,7 +2645,7 @@ static void FillComponentNextHop(const CompositeNH *comp_nh, } case NextHop::VLAN: { sdata.set_type("Vlan"); - const VlanNH *vlan_nh = + const VlanNH *vlan_nh = static_cast(component_nh->nh()); sdata.set_itf(vlan_nh->GetInterface()->name()); sdata.set_vlan_tag(vlan_nh->GetVlanTag()); @@ -2673,10 +2673,10 @@ static void FillComponentNextHop(const CompositeNH *comp_nh, } static void FillL2CompositeNextHop(const CompositeNH *comp_nh, - L2CompositeData &data) + L2CompositeData &data) { std::stringstream str; - str << "L2 Composite, subnh count : " + str << "L2 Composite, subnh count : " << comp_nh->ComponentNHCount(); data.set_type(str.str()); if (comp_nh->ComponentNHCount() == 0) @@ -2687,24 +2687,24 @@ static void FillL2CompositeNextHop(const CompositeNH *comp_nh, } static void FillL3CompositeNextHop(const CompositeNH *comp_nh, - L3CompositeData &data) + L3CompositeData &data) { std::stringstream str; - str << "L3 Composite, subnh count : " + str << "L3 Composite, subnh count : " << comp_nh->ComponentNHCount(); data.set_type(str.str()); if (comp_nh->ComponentNHCount() == 0) return; - std::vector data_list; - FillComponentNextHop(comp_nh, data_list); + std::vector data_list; + FillComponentNextHop(comp_nh, data_list); data.set_mc_list(data_list); } static void FillMultiProtoCompositeNextHop(const CompositeNH *comp_nh, - NhSandeshData &data) + NhSandeshData &data) { std::stringstream str; - str << "Multi Proto Composite, subnh count : " + str << "Multi Proto Composite, subnh count : " << comp_nh->ComponentNHCount(); data.set_type(str.str()); if (comp_nh->ComponentNHCount() == 0) @@ -2715,7 +2715,7 @@ static void FillMultiProtoCompositeNextHop(const CompositeNH *comp_nh, if (component_nh == NULL) { continue; } - const CompositeNH *sub_cnh = + const CompositeNH *sub_cnh = static_cast(component_nh->nh()); if (sub_cnh->composite_nh_type() == Composite::L2COMP) { L2CompositeData l2_data; @@ -2730,7 +2730,7 @@ static void FillMultiProtoCompositeNextHop(const CompositeNH *comp_nh, } } -static void ExpandCompositeNextHop(const CompositeNH *comp_nh, +static void ExpandCompositeNextHop(const CompositeNH *comp_nh, NhSandeshData &data) { stringstream comp_str; @@ -2758,7 +2758,7 @@ static void ExpandCompositeNextHop(const CompositeNH *comp_nh, break; } case Composite::FABRIC: { - comp_str << "fabric Composite" << " sub nh count: " + comp_str << "fabric Composite" << " sub nh count: " << comp_nh->ComponentNHCount(); data.set_type(comp_str.str()); if (comp_nh->ComponentNHCount() == 0) @@ -2778,20 +2778,20 @@ static void ExpandCompositeNextHop(const CompositeNH *comp_nh, FillComponentNextHop(comp_nh, data_list); data.set_mc_list(data_list); break; - } + } case Composite::L3COMP: { - comp_str << "L3 Composite" << " sub nh count: " + comp_str << "L3 Composite" << " sub nh count: " << comp_nh->ComponentNHCount(); data.set_type(comp_str.str()); if (comp_nh->ComponentNHCount() == 0) break; - std::vector data_list; - FillComponentNextHop(comp_nh, data_list); + std::vector data_list; + FillComponentNextHop(comp_nh, data_list); data.set_mc_list(data_list); break; } case Composite::L2COMP: { - comp_str << "L2 Composite" << " sub nh count: " + comp_str << "L2 Composite" << " sub nh count: " << comp_nh->ComponentNHCount(); data.set_type(comp_str.str()); if (comp_nh->ComponentNHCount() == 0) @@ -2818,34 +2818,34 @@ static void ExpandCompositeNextHop(const CompositeNH *comp_nh, data.set_type(comp_str.str()); if (comp_nh->ComponentNHCount() == 0) break; - std::vector data_list; - FillComponentNextHop(comp_nh, data_list); + std::vector data_list; + FillComponentNextHop(comp_nh, data_list); data.set_mc_list(data_list); break; - } + } case Composite::MULTIPROTO: { - comp_str << "Multiproto Composite" << " sub nh count: " + comp_str << "Multiproto Composite" << " sub nh count: " << comp_nh->ComponentNHCount(); data.set_type(comp_str.str()); FillMultiProtoCompositeNextHop(comp_nh, data); break; - } + } case Composite::ECMP: case Composite::LOCAL_ECMP: { - comp_str << "ECMP Composite" << " sub nh count: " + comp_str << "ECMP Composite" << " sub nh count: " << comp_nh->ComponentNHCount(); data.set_type(comp_str.str()); - std::vector data_list; - FillComponentNextHop(comp_nh, data_list); + std::vector data_list; + FillComponentNextHop(comp_nh, data_list); data.set_mc_list(data_list); break; - } + } default: { comp_str << "UNKNOWN<" << comp_nh->composite_nh_type() << ">"; data.set_type(comp_str.str()); break; - } + } } } diff --git a/src/vnsw/agent/oper/nexthop.h b/src/vnsw/agent/oper/nexthop.h index d75f5ec6054..fee461b6f2e 100644 --- a/src/vnsw/agent/oper/nexthop.h +++ b/src/vnsw/agent/oper/nexthop.h @@ -233,7 +233,7 @@ class MemberList { }; ///////////////////////////////////////////////////////////////////////////// -// Class to manage supported tunnel-types +// Class to manage supported tunnel-types ///////////////////////////////////////////////////////////////////////////// class TunnelType { public: @@ -312,7 +312,7 @@ class TunnelType { return TunnelType::VxlanType(); return TunnelType::AllType(); } - static TypeBmap AllType() {return ((1 << MPLS_GRE) | (1 << MPLS_UDP) | + static TypeBmap AllType() {return ((1 << MPLS_GRE) | (1 << MPLS_UDP) | (1 << VXLAN));} static TypeBmap GREType() {return (1 << MPLS_GRE);} static TypeBmap UDPType() {return (1 << MPLS_UDP);} @@ -327,7 +327,7 @@ class TunnelType { }; ///////////////////////////////////////////////////////////////////////////// -// Base class for NextHop. Implementation of specific NextHop must +// Base class for NextHop. Implementation of specific NextHop must // derive from this class ///////////////////////////////////////////////////////////////////////////// class NextHop : AgentRefCount, public AgentDBEntry { @@ -352,7 +352,7 @@ class NextHop : AgentRefCount, public AgentDBEntry { NextHop(Type type, bool policy) : type_(type), valid_(true), policy_(policy), id_(kInvalidIndex), mpls_label_(), learning_enabled_(false), etree_leaf_(false) {} - NextHop(Type type, bool valid, bool policy) : + NextHop(Type type, bool valid, bool policy) : type_(type), valid_(valid), policy_(policy), id_(kInvalidIndex), mpls_label_(), learning_enabled_(false), etree_leaf_(false) {} virtual ~NextHop(); @@ -647,7 +647,7 @@ class ReceiveNHData : public NextHopData { class ReceiveNH : public NextHop { public: - ReceiveNH(Interface *intf, bool policy) : + ReceiveNH(Interface *intf, bool policy) : NextHop(RECEIVE, true, policy), interface_(intf) { }; virtual ~ReceiveNH() { }; @@ -1123,7 +1123,7 @@ class InterfaceNH : public NextHop { const Interface *GetInterface() const {return interface_.get();}; const MacAddress &GetDMac() const {return dmac_;}; bool IsVxlanRouting() const { - return flags_ & InterfaceNHFlags::VXLAN_ROUTING; + return flags_ & InterfaceNHFlags::VXLAN_ROUTING; } bool is_multicastNH() const { return flags_ & InterfaceNHFlags::MULTICAST; }; bool IsBridge() const { return flags_ & InterfaceNHFlags::BRIDGE; }; @@ -1197,7 +1197,7 @@ class InterfaceNH : public NextHop { InterfaceRef interface_; uint8_t flags_; MacAddress dmac_; - VrfEntryRef vrf_; + VrfEntryRef vrf_; bool delete_on_zero_refcount_; bool layer2_control_word_; DISALLOW_COPY_AND_ASSIGN(InterfaceNH); @@ -1304,7 +1304,7 @@ class VrfNH : public NextHop { class VlanNHKey : public NextHopKey { public: VlanNHKey(const uuid &vm_port_uuid, uint16_t vlan_tag) : - NextHopKey(NextHop::VLAN, false), + NextHopKey(NextHop::VLAN, false), intf_key_(new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, vm_port_uuid, "")), vlan_tag_(vlan_tag) { @@ -1312,7 +1312,7 @@ class VlanNHKey : public NextHopKey { VlanNHKey(InterfaceKey *key, uint16_t vlan_tag) : NextHopKey(NextHop::VLAN, false), intf_key_(key), vlan_tag_(vlan_tag) { } - + virtual ~VlanNHKey() {} virtual NextHop *AllocEntry() const; virtual NextHopKey *Clone() const { @@ -1397,7 +1397,7 @@ class VlanNH : public NextHop { uint16_t vlan_tag_; MacAddress smac_; MacAddress dmac_; - VrfEntryRef vrf_; + VrfEntryRef vrf_; DISALLOW_COPY_AND_ASSIGN(VlanNH); }; @@ -1474,7 +1474,7 @@ class ComponentNHKey { const std::string &vrf_name); ComponentNHKey(int label, const uuid &intf_uuid, uint8_t flags, const MacAddress &mac): - label_(label), + label_(label), nh_key_(new InterfaceNHKey( new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, intf_uuid, ""), false, flags, mac)) { diff --git a/src/vnsw/agent/oper/oper_dhcp_options.h b/src/vnsw/agent/oper/oper_dhcp_options.h index 8c423cef339..07ef6dae371 100644 --- a/src/vnsw/agent/oper/oper_dhcp_options.h +++ b/src/vnsw/agent/oper/oper_dhcp_options.h @@ -35,7 +35,7 @@ class OperDhcpOptions { return prefix_ == rhs.prefix_ && plen_ == rhs.plen_ && gw_ == rhs.gw_; } - std::string ToString() const { + std::string ToString() const { char len[32]; snprintf(len, sizeof(len), "%u", plen_); return prefix_.to_string() + "/" + std::string(len) + diff --git a/src/vnsw/agent/oper/operdb_init.cc b/src/vnsw/agent/oper/operdb_init.cc index 080979faa6c..0f73ede2e25 100644 --- a/src/vnsw/agent/oper/operdb_init.cc +++ b/src/vnsw/agent/oper/operdb_init.cc @@ -77,7 +77,7 @@ T *DBTableCreate(DB *db, Agent *agent, OperDB *oper, void OperDB::CreateDBTables(DB *db) { DB::RegisterFactory("db.interface.0", &InterfaceTable::CreateTable); DB::RegisterFactory("db.nexthop.0", &NextHopTable::CreateTable); - DB::RegisterFactory("db.crypttunnel.0", + DB::RegisterFactory("db.crypttunnel.0", boost::bind(&CryptTunnelTable::CreateTable, agent_, _1, _2)); DB::RegisterFactory("uc.route.0", diff --git a/src/vnsw/agent/oper/packet_interface.h b/src/vnsw/agent/oper/packet_interface.h index e1555bb9fc4..84149874b30 100644 --- a/src/vnsw/agent/oper/packet_interface.h +++ b/src/vnsw/agent/oper/packet_interface.h @@ -6,7 +6,7 @@ #define vnsw_agent_packet_interface_hpp ///////////////////////////////////////////////////////////////////////////// -// Implementation of Pkt Interface. Interface is used to exchange packets +// Implementation of Pkt Interface. Interface is used to exchange packets // between vrouter to agent ///////////////////////////////////////////////////////////////////////////// diff --git a/src/vnsw/agent/oper/peer.cc b/src/vnsw/agent/oper/peer.cc index 628461e2f1a..73dd4583c8d 100644 --- a/src/vnsw/agent/oper/peer.cc +++ b/src/vnsw/agent/oper/peer.cc @@ -113,7 +113,7 @@ BgpPeer::BgpPeer(AgentXmppChannel *channel, const Ip4Address &server_ip, BgpPeer::~BgpPeer() { const Agent *agent = route_walker()->agent(); - // TODO verify if this unregister can be done in walkdone callback + // TODO verify if this unregister can be done in walkdone callback // for delpeer if ((id_ != -1) && agent->vrf_table()) { agent->vrf_table()->Unregister(id_); @@ -158,7 +158,7 @@ void BgpPeer::StopPeerNotifyRoutes() { } void BgpPeer::PeerNotifyMulticastRoutes(bool associate) { - route_walker()->Start(ControllerRouteWalker::NOTIFYMULTICAST, associate, + route_walker()->Start(ControllerRouteWalker::NOTIFYMULTICAST, associate, NULL); } @@ -225,7 +225,7 @@ ControllerRouteWalker *BgpPeer::delete_stale_walker() const { /* * Get the VRF state and unregister from all route table using * rt_export listener id. This will be called for active and non active bgp - * peers. In case of active bgp peers send unsubscribe to control node(request + * peers. In case of active bgp peers send unsubscribe to control node(request * came via vrf delete). */ void BgpPeer::DeleteVrfState(DBTablePartBase *partition, @@ -241,7 +241,7 @@ void BgpPeer::DeleteVrfState(DBTablePartBase *partition, for (uint8_t table_type = (Agent::INVALID + 1); table_type < Agent::ROUTE_TABLE_MAX; table_type++) { - if (vrf_state->rt_export_[table_type]) + if (vrf_state->rt_export_[table_type]) vrf_state->rt_export_[table_type]->Unregister(); } @@ -252,7 +252,7 @@ void BgpPeer::DeleteVrfState(DBTablePartBase *partition, if (SkipAddChangeRequest() == false) { AgentXmppChannel::ControllerSendSubscribe(GetAgentXmppChannel(), vrf, - false); + false); } } @@ -263,16 +263,16 @@ void BgpPeer::DeleteVrfState(DBTablePartBase *partition, } // For given peer return the dbstate for given VRF and partition -DBState *BgpPeer::GetVrfExportState(DBTablePartBase *partition, +DBState *BgpPeer::GetVrfExportState(DBTablePartBase *partition, DBEntryBase *entry) { DBTableBase::ListenerId id = GetVrfExportListenerId(); VrfEntry *vrf = static_cast(entry); - return (static_cast(vrf->GetState(partition->parent(), + return (static_cast(vrf->GetState(partition->parent(), id))); } // For given route return the dbstate for given partiton -DBState *BgpPeer::GetRouteExportState(DBTablePartBase *partition, +DBState *BgpPeer::GetRouteExportState(DBTablePartBase *partition, DBEntryBase *entry) { AgentRoute *route = static_cast(entry); VrfEntry *vrf = route->vrf(); @@ -281,7 +281,7 @@ DBState *BgpPeer::GetRouteExportState(DBTablePartBase *partition, GetTablePartition(vrf); VrfExport::State *vs = static_cast - (GetVrfExportState(vrf_partition, vrf)); + (GetVrfExportState(vrf_partition, vrf)); if (vs == NULL) return NULL; diff --git a/src/vnsw/agent/oper/peer.h b/src/vnsw/agent/oper/peer.h index e330c4a4b54..b56d975d67c 100644 --- a/src/vnsw/agent/oper/peer.h +++ b/src/vnsw/agent/oper/peer.h @@ -166,7 +166,7 @@ class BgpPeer : public DynamicPeer { // For testing void SetVrfListenerId(DBTableBase::ListenerId id) { id_ = id; } - DBTableBase::ListenerId GetVrfExportListenerId() { return id_; } + DBTableBase::ListenerId GetVrfExportListenerId() { return id_; } // Table Walkers //Notify walker @@ -213,7 +213,7 @@ class BgpPeer : public DynamicPeer { }; // Peer for local-vm-port paths. There can be multiple VMs with same IP. -// They are all added as different path. ECMP path will consolidate all +// They are all added as different path. ECMP path will consolidate all // local-vm-port paths class LocalVmPortPeer : public Peer { public: @@ -224,7 +224,7 @@ class LocalVmPortPeer : public Peer { virtual ~LocalVmPortPeer() { } bool Compare(const Peer *rhs) const { - const LocalVmPortPeer *local = + const LocalVmPortPeer *local = static_cast(rhs); return handle_ < local->handle_; } diff --git a/src/vnsw/agent/oper/physical_device_vn.cc b/src/vnsw/agent/oper/physical_device_vn.cc index 7ad4a961016..f232b29d148 100644 --- a/src/vnsw/agent/oper/physical_device_vn.cc +++ b/src/vnsw/agent/oper/physical_device_vn.cc @@ -209,7 +209,7 @@ bool PhysicalDeviceVnTable::DeleteConfigEntry(const boost::uuids::uuid &vmi, return false; config_tree_.erase(PhysicalDeviceVnToVmi(dev, vn, vmi)); - // Dont delete physical-device-vn entry if there are more entries in + // Dont delete physical-device-vn entry if there are more entries in // config-tree with given dev and vn ConfigTree::iterator it = config_tree_.upper_bound(PhysicalDeviceVnToVmi(dev, vn, nil_uuid())); @@ -220,7 +220,7 @@ bool PhysicalDeviceVnTable::DeleteConfigEntry(const boost::uuids::uuid &vmi, del_entry = true; else if (it->vn_ != vn) del_entry = true; - + if (del_entry) { agent()->config_manager()->DelPhysicalDeviceVn(dev, vn); DBRequest req(DBRequest::DB_ENTRY_DELETE); diff --git a/src/vnsw/agent/oper/physical_interface.cc b/src/vnsw/agent/oper/physical_interface.cc index 95514625b0f..eb26d38fb11 100644 --- a/src/vnsw/agent/oper/physical_interface.cc +++ b/src/vnsw/agent/oper/physical_interface.cc @@ -202,7 +202,7 @@ PhysicalInterfaceData::PhysicalInterfaceData(Agent *agent, IFMapNode *node, ip_(ip) { EthInit(vrf_name); } - + ///////////////////////////////////////////////////////////////////////////// // Config handling routines ///////////////////////////////////////////////////////////////////////////// diff --git a/src/vnsw/agent/oper/remote_physical_interface.h b/src/vnsw/agent/oper/remote_physical_interface.h index 35030bef280..72eb713d0f4 100644 --- a/src/vnsw/agent/oper/remote_physical_interface.h +++ b/src/vnsw/agent/oper/remote_physical_interface.h @@ -7,7 +7,7 @@ struct RemotePhysicalInterfaceData; ///////////////////////////////////////////////////////////////////////////// -// Remote Physical Ports represents physical ports on an external device +// Remote Physical Ports represents physical ports on an external device // UUID is the key ///////////////////////////////////////////////////////////////////////////// class RemotePhysicalInterface : public Interface { diff --git a/src/vnsw/agent/oper/route_leak.cc b/src/vnsw/agent/oper/route_leak.cc index d60f38c6a36..9b88acfbb30 100644 --- a/src/vnsw/agent/oper/route_leak.cc +++ b/src/vnsw/agent/oper/route_leak.cc @@ -9,7 +9,7 @@ void RouteLeakState::AddIndirectRoute(const AgentRoute *route) { InetUnicastAgentRouteTable *table = dest_vrf_->GetInet4UnicastRouteTable(); - const InetUnicastRouteEntry *uc_rt = + const InetUnicastRouteEntry *uc_rt = static_cast(route); const AgentPath *active_path = uc_rt->GetActivePath(); const TunnelNH *nh = dynamic_cast(active_path->nexthop()); @@ -52,7 +52,7 @@ void RouteLeakState::AddIndirectRoute(const AgentRoute *route) { void RouteLeakState::AddInterfaceRoute(const AgentRoute *route, const AgentPath *path) { - const InetUnicastRouteEntry *uc_rt = + const InetUnicastRouteEntry *uc_rt = static_cast(route); const AgentPath *active_path = path; @@ -213,7 +213,7 @@ bool RouteLeakState::CanAdd(const InetUnicastRouteEntry *rt) { } void RouteLeakState::AddRoute(const AgentRoute *route) { - const InetUnicastRouteEntry *uc_rt = + const InetUnicastRouteEntry *uc_rt = static_cast(route); if (CanAdd(uc_rt) == false) { @@ -273,12 +273,12 @@ void RouteLeakState::DeleteRoute(const AgentRoute *route, } } -RouteLeakVrfState::RouteLeakVrfState(VrfEntry *source_vrf, +RouteLeakVrfState::RouteLeakVrfState(VrfEntry *source_vrf, VrfEntry *dest_vrf): source_vrf_(source_vrf), dest_vrf_(dest_vrf), deleted_(false) { AgentRouteTable *table = source_vrf->GetInet4UnicastRouteTable(); - route_listener_id_ = table->Register(boost::bind(&RouteLeakVrfState::Notify, + route_listener_id_ = table->Register(boost::bind(&RouteLeakVrfState::Notify, this, _1, _2)); //Walker would be used to address change of dest VRF table @@ -349,7 +349,7 @@ bool RouteLeakVrfState::Notify(DBTablePartBase *partition, DBEntryBase *entry) { } if (state == NULL && dest_vrf_) { - state = new RouteLeakState(dest_vrf_->GetInet4UnicastRouteTable()->agent(), + state = new RouteLeakState(dest_vrf_->GetInet4UnicastRouteTable()->agent(), NULL); route->SetState(partition->parent(), route_listener_id_, state); } @@ -397,8 +397,8 @@ RouteLeakManager::~RouteLeakManager() { void RouteLeakManager::Notify(DBTablePartBase *partition, DBEntryBase *entry) { VrfEntry *vrf = static_cast(entry); - RouteLeakVrfState *state = - static_cast(entry->GetState(partition->parent(), + RouteLeakVrfState *state = + static_cast(entry->GetState(partition->parent(), vrf_listener_id_)); if (vrf->IsDeleted()) { diff --git a/src/vnsw/agent/oper/sg.cc b/src/vnsw/agent/oper/sg.cc index 8137891bfb9..ff09b37e5d1 100644 --- a/src/vnsw/agent/oper/sg.cc +++ b/src/vnsw/agent/oper/sg.cc @@ -70,7 +70,7 @@ bool SgTable::ChangeHandler(DBEntry *entry, const DBRequest *req) { bool ret = false; SgEntry *sg = static_cast(entry); SgData *data = static_cast(req->data.get()); - + if (sg->sg_id_ != data->sg_id_) { sg->sg_id_ = data->sg_id_; ret = true; diff --git a/src/vnsw/agent/oper/sg.h b/src/vnsw/agent/oper/sg.h index f820595b859..473b39e50ba 100644 --- a/src/vnsw/agent/oper/sg.h +++ b/src/vnsw/agent/oper/sg.h @@ -23,8 +23,8 @@ struct SgKey : public AgentOperDBKey { struct SgData : public AgentOperDBData { SgData(Agent *agent, IFMapNode *node, const uint32_t &sg_id, const uuid &egress_acl_id, const uuid &ingress_acl_id) : - AgentOperDBData(agent, node), sg_id_(sg_id), - egress_acl_id_(egress_acl_id), + AgentOperDBData(agent, node), sg_id_(sg_id), + egress_acl_id_(egress_acl_id), ingress_acl_id_(ingress_acl_id) { } virtual ~SgData() { } @@ -36,7 +36,7 @@ struct SgData : public AgentOperDBData { class SgEntry : AgentRefCount, public AgentOperDBEntry { public: - SgEntry(uuid sg_uuid, uint32_t sg_id) : sg_uuid_(sg_uuid), sg_id_(sg_id), + SgEntry(uuid sg_uuid, uint32_t sg_id) : sg_uuid_(sg_uuid), sg_id_(sg_id), egress_acl_(NULL), ingress_acl_(NULL) {}; SgEntry(uuid sg_uuid) : sg_uuid_(sg_uuid) { }; virtual ~SgEntry() { }; diff --git a/src/vnsw/agent/oper/test/docker_instance_adapter_test.cc b/src/vnsw/agent/oper/test/docker_instance_adapter_test.cc index f20fb9eaffa..64c34750e43 100644 --- a/src/vnsw/agent/oper/test/docker_instance_adapter_test.cc +++ b/src/vnsw/agent/oper/test/docker_instance_adapter_test.cc @@ -14,7 +14,7 @@ class DockerAdapterTest : public ::testing::Test { boost::uuids::random_generator gen; agent_ = new Agent; docker_adapter = new DockerInstanceAdapter("/bin/true", agent_); - + properties_.virtualization_type = ServiceInstance::VRouterInstance; properties_.vrouter_instance_type = ServiceInstance::Docker; properties_.instance_id = gen(); diff --git a/src/vnsw/agent/oper/test/libvirt_instance_adapter_test.cc b/src/vnsw/agent/oper/test/libvirt_instance_adapter_test.cc index 496d9345fa1..285e007fb66 100644 --- a/src/vnsw/agent/oper/test/libvirt_instance_adapter_test.cc +++ b/src/vnsw/agent/oper/test/libvirt_instance_adapter_test.cc @@ -29,7 +29,7 @@ class LibvirtAdapterTest : public ::testing::Test { virtual void SetUp() { agent_ = new Agent; libvirt_adapter_ = new LibvirtInstanceAdapter(agent_, "qemu:///system"); - + properties_.virtualization_type = ServiceInstance::VRouterInstance; properties_.vrouter_instance_type = ServiceInstance::KVM; properties_.instance_id = @@ -37,9 +37,9 @@ class LibvirtAdapterTest : public ::testing::Test { properties_.vmi_inside = boost::lexical_cast("ea9b8b18-8182-11e4-8ad5-47899f2d45f1"); - properties_.vmi_outside = + properties_.vmi_outside = boost::lexical_cast("eb0e2d30-8182-11e4-b09d-533359975d6a"); - properties_.vmi_management = + properties_.vmi_management = boost::lexical_cast("324d6de6-8183-11e4-8a75-13b524544c2f"); properties_.mac_addr_inside = "00:50:56:00:00:01"; @@ -95,7 +95,7 @@ TEST_F(LibvirtAdapterTest, LibvirtStart) { TEST_F(LibvirtAdapterTest, LibvirtDomainCreated) { virConnectPtr conn = virConnectOpen("qemu:///system"); ASSERT_NE(conn, (virConnectPtr)(NULL)); - std::string dom_uuid_str = + std::string dom_uuid_str = boost::lexical_cast(properties_.instance_id); virDomainPtr dom; for (int i = 0; i < 20; i++) { @@ -120,7 +120,7 @@ TEST_F(LibvirtAdapterTest, LibvirtStop) { TEST_F(LibvirtAdapterTest, LibvirtDomainDestroyed) { virConnectPtr conn = virConnectOpen("qemu:///system"); ASSERT_NE(conn, (virConnectPtr)(NULL)); - std::string dom_uuid_str = + std::string dom_uuid_str = boost::lexical_cast(properties_.instance_id); virDomainPtr dom; for (int i = 0; i < 20; i++) { diff --git a/src/vnsw/agent/oper/test/test_aap.cc b/src/vnsw/agent/oper/test/test_aap.cc index 0f8fb23b03c..4a3020a4405 100644 --- a/src/vnsw/agent/oper/test/test_aap.cc +++ b/src/vnsw/agent/oper/test/test_aap.cc @@ -128,7 +128,7 @@ TEST_F(TestAap, AddDel_1) { AddAap("intf1", 1, v); EXPECT_TRUE(RouteFind("vrf1", ip, 32)); - EXPECT_TRUE(RouteGet("vrf1", ip, 32)->GetActiveNextHop()->GetType() == + EXPECT_TRUE(RouteGet("vrf1", ip, 32)->GetActiveNextHop()->GetType() == NextHop::INTERFACE); v.clear(); AddAap("intf1", 1, v); diff --git a/src/vnsw/agent/oper/test/test_control_word.cc b/src/vnsw/agent/oper/test/test_control_word.cc index 6a0b3c2d0c2..abb7665fbcb 100644 --- a/src/vnsw/agent/oper/test/test_control_word.cc +++ b/src/vnsw/agent/oper/test/test_control_word.cc @@ -92,7 +92,7 @@ class TestControlWord : public ::testing::Test { TEST_F(TestControlWord, InterfaceNH) { VmInterface *vm_intf = static_cast(VmPortGet(1)); EXPECT_TRUE(vm_intf->layer2_control_word() == false); - const InterfaceNH *l3_no_policy = + const InterfaceNH *l3_no_policy = static_cast(vm_intf->l3_interface_nh_no_policy()); const InterfaceNH *l2_policy = static_cast(vm_intf->l2_interface_nh_policy()); @@ -128,13 +128,13 @@ TEST_F(TestControlWord, RemoteBridgeRoute) { MacAddress smac(0x00, 0x00, 0x00, 0x01, 0x01, 0xaa); Ip4Address server_ip(0x10101010); - BridgeTunnelRouteAdd(bgp_peer_ptr, + BridgeTunnelRouteAdd(bgp_peer_ptr, "vrf1", TunnelType::AllType(), server_ip, (MplsTable::kStartLabel + 60), smac, Ip4Address::from_string("0.0.0.0"), 32); client->WaitForIdle(); - AgentRoute *rt = L2RouteGet("vrf1", smac); + AgentRoute *rt = L2RouteGet("vrf1", smac); EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); ChangeControlWord("vn1", true); @@ -143,7 +143,7 @@ TEST_F(TestControlWord, RemoteBridgeRoute) { ChangeControlWord("vn1", false); EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); - EvpnAgentRouteTable::DeleteReq(bgp_peer_ptr, "vrf1", smac, + EvpnAgentRouteTable::DeleteReq(bgp_peer_ptr, "vrf1", smac, Ip4Address(0), 0, NULL); client->WaitForIdle(); DeleteBgpPeer(bgp_peer_ptr); @@ -155,7 +155,7 @@ TEST_F(TestControlWord, CompositeNH) { AgentRoute *rt = L2RouteGet("vrf1", smac); EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); - const CompositeNH *comp_nh = + const CompositeNH *comp_nh = dynamic_cast(rt->GetActiveNextHop()); EXPECT_TRUE(comp_nh->layer2_control_word() == false); @@ -180,30 +180,30 @@ TEST_F(TestControlWord, BridgeDomain) { AgentRoute *rt = L2RouteGet("vrf1:00000000-0000-0000-0000-000000000001", smac); EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); - const CompositeNH *comp_nh = + const CompositeNH *comp_nh = dynamic_cast(rt->GetActiveNextHop()); EXPECT_TRUE(comp_nh->layer2_control_word() == false); - MplsLabel *mpls = - agent_->mpls_table()->FindMplsLabel(bd->vrf()->table_label()); - EXPECT_TRUE(mpls->nexthop()->GetType() == NextHop::VRF); - const VrfNH *vrf_nh = dynamic_cast(mpls->nexthop()); - EXPECT_TRUE(vrf_nh->layer2_control_word() == false); - EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); + MplsLabel *mpls = + agent_->mpls_table()->FindMplsLabel(bd->vrf()->table_label()); + EXPECT_TRUE(mpls->nexthop()->GetType() == NextHop::VRF); + const VrfNH *vrf_nh = dynamic_cast(mpls->nexthop()); + EXPECT_TRUE(vrf_nh->layer2_control_word() == false); + EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); - ChangeControlWord("vn1", true); - EXPECT_TRUE(vrf_nh->layer2_control_word() == true); - EXPECT_TRUE(comp_nh->layer2_control_word() == true); - EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == true); + ChangeControlWord("vn1", true); + EXPECT_TRUE(vrf_nh->layer2_control_word() == true); + EXPECT_TRUE(comp_nh->layer2_control_word() == true); + EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == true); - ChangeControlWord("vn1", false); - EXPECT_TRUE(vrf_nh->layer2_control_word() == false); - EXPECT_TRUE(comp_nh->layer2_control_word() == false); - EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); + ChangeControlWord("vn1", false); + EXPECT_TRUE(vrf_nh->layer2_control_word() == false); + EXPECT_TRUE(comp_nh->layer2_control_word() == false); + EXPECT_TRUE(rt->GetActivePath()->layer2_control_word() == false); DelNode("bridge-domain", "bridge1"); - DelLink("virtual-network", "vn1", "bridge-domain", "bridge1"); - client->WaitForIdle(); + DelLink("virtual-network", "vn1", "bridge-domain", "bridge1"); + client->WaitForIdle(); } int main(int argc, char *argv[]) { diff --git a/src/vnsw/agent/oper/test/test_fabric_interface.cc b/src/vnsw/agent/oper/test/test_fabric_interface.cc index 03aecea2612..5c0ef1095eb 100644 --- a/src/vnsw/agent/oper/test/test_fabric_interface.cc +++ b/src/vnsw/agent/oper/test/test_fabric_interface.cc @@ -29,8 +29,8 @@ #include "filter/acl.h" #include "test_cmn_util.h" #include "vr_types.h" -#include -#include +#include +#include void RouterIdDepInit(Agent *agent) { } diff --git a/src/vnsw/agent/oper/test/test_fabric_vmi.cc b/src/vnsw/agent/oper/test/test_fabric_vmi.cc index 4b122d8c5f4..8eaf66491b6 100644 --- a/src/vnsw/agent/oper/test/test_fabric_vmi.cc +++ b/src/vnsw/agent/oper/test/test_fabric_vmi.cc @@ -123,7 +123,7 @@ TEST_F(FabricVmiTest, basic_1) { PathPreference path_preference(1, PathPreference::LOW, false, false); TunnelType::TypeBmap bmap = (1 << TunnelType::MPLS_GRE | 1 << TunnelType::NATIVE); - Inet4TunnelRouteAdd(peer_, + Inet4TunnelRouteAdd(peer_, agent->fabric_policy_vrf_name().c_str(), ip, 32, server_ip, bmap, 16, "vn1", SecurityGroupList(), TagList(), path_preference); @@ -163,9 +163,9 @@ TEST_F(FabricVmiTest, basic_2) { //Route should be leaked to fabric VRF EXPECT_TRUE(RouteFind(agent->fabric_vrf_name(), ip, 32)); const VmInterface *vm_intf = static_cast(VmPortGet(2)); - EXPECT_TRUE(vm_intf->forwarding_vrf()->GetName() == + EXPECT_TRUE(vm_intf->forwarding_vrf()->GetName() == agent->fabric_vrf_name()); - const InterfaceNH *intf_nh = + const InterfaceNH *intf_nh = dynamic_cast(vm_intf->flow_key_nh()); EXPECT_TRUE(intf_nh->GetVrf()->GetName() == agent->fabric_vrf_name()); EXPECT_TRUE(vm_intf->proxy_arp_mode() == VmInterface::PROXY_ARP_UNRESTRICTED); diff --git a/src/vnsw/agent/oper/test/test_inet_interface.cc b/src/vnsw/agent/oper/test/test_inet_interface.cc index 15d2d57a579..c67130d1932 100644 --- a/src/vnsw/agent/oper/test/test_inet_interface.cc +++ b/src/vnsw/agent/oper/test/test_inet_interface.cc @@ -47,7 +47,7 @@ class InetInterfaceTest : public ::testing::Test { agent_ = Agent::GetInstance(); DBRequest req(DBRequest::DB_ENTRY_DELETE); - req.key.reset(new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + req.key.reset(new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, nil_uuid(), "vhost0")); req.data.reset(new VmInterfaceConfigData(NULL, NULL)); agent_->interface_table()->Enqueue(&req); diff --git a/src/vnsw/agent/oper/test/test_intf.cc b/src/vnsw/agent/oper/test/test_intf.cc index ad343e625bd..1e245d1f850 100644 --- a/src/vnsw/agent/oper/test/test_intf.cc +++ b/src/vnsw/agent/oper/test/test_intf.cc @@ -505,8 +505,8 @@ TEST_F(IntfTest, ActivateInactivate_vn) { EXPECT_TRUE(VmPortFind(8)); client->Reset(); - //Delete VM, and delay deletion of nova - //message (BGP connection drop case) + //Delete VM, and delay deletion of nova + //message (BGP connection drop case) DelLink("virtual-network", "vn1", "virtual-machine-interface", "vnet8"); client->WaitForIdle(); // Interface is active even if VM is deleted @@ -3493,7 +3493,7 @@ TEST_F(IntfTest, GwIntfAdd) { client->WaitForIdle(); EXPECT_TRUE(VmPortActive(input1, 0)); EXPECT_TRUE(RouteFind("vrf1", "8.1.1.0", 24)); - + //Verify that route is pointing to resolve NH //and the route points to table NH Ip4Address addr = Ip4Address::from_string("8.1.1.0"); @@ -3506,7 +3506,7 @@ TEST_F(IntfTest, GwIntfAdd) { EXPECT_TRUE(rt->GetActiveLabel() != MplsTable::kInvalidLabel); EXPECT_TRUE(rt->GetActiveNextHop()->GetType() == NextHop::RESOLVE); } - + DelLink("virtual-machine-interface", input1[0].name, "subnet", "subnet"); DelLink("physical-router", agent->host_name().c_str(), "physical-interface", "pi1"); @@ -3521,7 +3521,7 @@ TEST_F(IntfTest, GwIntfAdd) { DeleteVmportEnv(input1, 1, true); client->WaitForIdle(); - + EXPECT_FALSE(VmPortFind(8)); VmInterfaceKey key(AgentKey::ADD_DEL_CHANGE, MakeUuid(8), ""); WAIT_FOR(100, 1000, (Agent::GetInstance()->interface_table()->Find(&key, true) @@ -3554,7 +3554,7 @@ TEST_F(IntfTest, GwSubnetChange) { client->WaitForIdle(); EXPECT_TRUE(VmPortActive(input1, 0)); EXPECT_TRUE(RouteFind("vrf1", "8.1.1.0", 24)); - + //Verify that route is pointing to resolve NH //and the route points to table NH Ip4Address addr = Ip4Address::from_string("8.1.1.0"); @@ -3594,7 +3594,7 @@ TEST_F(IntfTest, GwSubnetChange) { EXPECT_FALSE(RouteFind("vrf1", "9.1.1.0", 24)); DeleteVmportEnv(input1, 1, true); client->WaitForIdle(); - + EXPECT_FALSE(VmPortFind(8)); VmInterfaceKey key(AgentKey::ADD_DEL_CHANGE, MakeUuid(8), ""); WAIT_FOR(100, 1000, (Agent::GetInstance()->interface_table()->Find(&key, true) diff --git a/src/vnsw/agent/oper/test/test_linklocal.cc b/src/vnsw/agent/oper/test/test_linklocal.cc index 89faabdb610..670785e305c 100644 --- a/src/vnsw/agent/oper/test/test_linklocal.cc +++ b/src/vnsw/agent/oper/test/test_linklocal.cc @@ -81,9 +81,9 @@ TEST_F(LinkLocalTest, LinkLocalReqTest) { FillServices(services, MAX_SERVICES); AddLinkLocalConfig(services, MAX_SERVICES); - struct PortInfo input[] = { - {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, - }; + struct PortInfo input[] = { + {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, + }; CreateVmportEnv(input, 1, 0); client->WaitForIdle(); client->Reset(); @@ -96,9 +96,9 @@ TEST_F(LinkLocalTest, LinkLocalReqTest) { AddIPAM("ipam1", ipam_info, 3); client->WaitForIdle(); - struct PortInfo new_input[] = { - {"vnet2", 2, "2.2.2.2", "00:00:00:02:02:02", 2, 2}, - }; + struct PortInfo new_input[] = { + {"vnet2", 2, "2.2.2.2", "00:00:00:02:02:02", 2, 2}, + }; CreateVmportEnv(new_input, 1, 0); client->WaitForIdle(); client->Reset(); @@ -151,9 +151,9 @@ TEST_F(LinkLocalTest, LinkLocalReqTest) { client->Reset(); DelIPAM("ipam1"); client->WaitForIdle(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); - DeleteVmportEnv(new_input, 1, 1, 0); + DeleteVmportEnv(new_input, 1, 1, 0); client->WaitForIdle(); } @@ -163,9 +163,9 @@ TEST_F(LinkLocalTest, LinkLocalChangeTest) { FillServices(services, MAX_SERVICES); AddLinkLocalConfig(services, MAX_SERVICES); - struct PortInfo input[] = { - {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, - }; + struct PortInfo input[] = { + {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, + }; CreateVmportEnv(input, 1, 0); client->WaitForIdle(); client->Reset(); @@ -219,7 +219,7 @@ TEST_F(LinkLocalTest, LinkLocalChangeTest) { local_rt = RouteGet("vrf1", Ip4Address::from_string("169.254.100.100"), 32); EXPECT_TRUE(local_rt == NULL); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); } @@ -229,9 +229,9 @@ TEST_F(LinkLocalTest, GlobalVrouterDeleteTest) { FillServices(services, MAX_SERVICES); AddLinkLocalConfig(services, MAX_SERVICES); - struct PortInfo input[] = { - {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, - }; + struct PortInfo input[] = { + {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, + }; CreateVmportEnv(input, 1, 0); client->WaitForIdle(); client->Reset(); @@ -244,9 +244,9 @@ TEST_F(LinkLocalTest, GlobalVrouterDeleteTest) { AddIPAM("ipam1", ipam_info, 3); client->WaitForIdle(); - struct PortInfo new_input[] = { - {"vnet2", 2, "2.2.2.2", "00:00:00:02:02:02", 2, 2}, - }; + struct PortInfo new_input[] = { + {"vnet2", 2, "2.2.2.2", "00:00:00:02:02:02", 2, 2}, + }; CreateVmportEnv(new_input, 1, 0); client->WaitForIdle(); client->Reset(); @@ -292,9 +292,9 @@ TEST_F(LinkLocalTest, GlobalVrouterDeleteTest) { client->Reset(); DelIPAM("ipam1"); client->WaitForIdle(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); - DeleteVmportEnv(new_input, 1, 1, 0); + DeleteVmportEnv(new_input, 1, 1, 0); client->WaitForIdle(); } diff --git a/src/vnsw/agent/oper/test/test_qos_config.cc b/src/vnsw/agent/oper/test/test_qos_config.cc index 783edbfcf74..7ac53c57eb6 100644 --- a/src/vnsw/agent/oper/test/test_qos_config.cc +++ b/src/vnsw/agent/oper/test/test_qos_config.cc @@ -450,7 +450,7 @@ TEST_F(QosConfigClassTest, Test11) { DelNode("qos-config", "qos_config"); DelNode("qos-config", "qos_config1"); - DelNode("global-qos-config", + DelNode("global-qos-config", "default-global-system-config:default-global-qos-config"); DelGlobalConfig(fc_data, 2); client->WaitForIdle(); diff --git a/src/vnsw/agent/oper/test/test_vhost_vmi.cc b/src/vnsw/agent/oper/test/test_vhost_vmi.cc index 3e5f8111a51..5b4786cd84b 100644 --- a/src/vnsw/agent/oper/test/test_vhost_vmi.cc +++ b/src/vnsw/agent/oper/test/test_vhost_vmi.cc @@ -63,7 +63,7 @@ class FabricVmiTest : public ::testing::Test { virtual void SetUp() { agent = Agent::GetInstance(); client->WaitForIdle(); - + AddVn(DEFAULT_VN, 1); AddIPAM(DEFAULT_VN, ipam_info, 1); @@ -80,7 +80,7 @@ class FabricVmiTest : public ::testing::Test { virtual void TearDown() { DelIPAM(DEFAULT_VN); DelVn(DEFAULT_VN); - //DelNode("virtual-machine-interface", "vhost0"); + //DelNode("virtual-machine-interface", "vhost0"); DelLink("virtual-machine-interface", "vhost0", "virtual-network", DEFAULT_VN); client->WaitForIdle(); @@ -97,7 +97,7 @@ class FabricVmiTest : public ::testing::Test { }; TEST_F(FabricVmiTest, CrossConnect) { - const VmInterface *vm_intf = + const VmInterface *vm_intf = static_cast(VhostGet("vhost0")); EXPECT_TRUE(vm_intf->parent()->name() == "vnet0"); EXPECT_TRUE(vm_intf->vmi_type() == VmInterface::VHOST); @@ -211,7 +211,7 @@ TEST_F(FabricVmiTest, PolicyChange) { str << ""; AddNode("virtual-machine-interface", "vhost0", 10, str.str().c_str()); - const AgentRoute *rt = RouteGet(agent->fabric_policy_vrf_name(), + const AgentRoute *rt = RouteGet(agent->fabric_policy_vrf_name(), agent->router_id(), 32); EXPECT_TRUE(rt->GetActiveNextHop()->GetType() == NextHop::INTERFACE); diff --git a/src/vnsw/agent/oper/test/test_vrf_assign.cc b/src/vnsw/agent/oper/test/test_vrf_assign.cc index 733620601d9..3fd8b81d4be 100644 --- a/src/vnsw/agent/oper/test/test_vrf_assign.cc +++ b/src/vnsw/agent/oper/test/test_vrf_assign.cc @@ -161,7 +161,7 @@ TEST_F(VrfAssignTest, Check_key_manipulations) { //Verify key VrfAssign *vrf_assign = VrfAssignTable::FindVlanReq(MakeUuid(1), 1); DBEntryBase::KeyPtr tmp_key = vrf_assign->GetDBRequestKey(); - VrfAssign::VrfAssignKey *key = + VrfAssign::VrfAssignKey *key = static_cast(tmp_key.get()); VlanVrfAssign *vlan_vrf_assign = static_cast(vrf_assign); EXPECT_TRUE(key != NULL); @@ -169,7 +169,7 @@ TEST_F(VrfAssignTest, Check_key_manipulations) { EXPECT_TRUE(key->intf_uuid_ == MakeUuid(1)); EXPECT_TRUE(key->type_ == VrfAssign::VLAN); std::auto_ptr new_key(new VrfAssign::VrfAssignKey()); - new_key->VlanInit(MakeUuid(1), 2); + new_key->VlanInit(MakeUuid(1), 2); vlan_vrf_assign->SetKey(new_key.get()); EXPECT_TRUE(vlan_vrf_assign->GetVlanTag() == 2); vrf_assign->SetKey(key); diff --git a/src/vnsw/agent/oper/test/test_xml_agent_init.h b/src/vnsw/agent/oper/test/test_xml_agent_init.h index ccad882d87b..3982032cdef 100644 --- a/src/vnsw/agent/oper/test/test_xml_agent_init.h +++ b/src/vnsw/agent/oper/test/test_xml_agent_init.h @@ -16,7 +16,7 @@ class TestClient; TestClient *PhysicalDeviceTestInit(const char *init_file, bool ksync_init); -// The class to drive agent initialization. +// The class to drive agent initialization. // Defines control parameters used to enable/disable agent features class TestXmlAgentInit : public TestAgentInit { public: diff --git a/src/vnsw/agent/oper/test/test_xml_physical_device.cc b/src/vnsw/agent/oper/test/test_xml_physical_device.cc index 55d7ea20def..37ae0d45b50 100644 --- a/src/vnsw/agent/oper/test/test_xml_physical_device.cc +++ b/src/vnsw/agent/oper/test/test_xml_physical_device.cc @@ -589,7 +589,7 @@ bool AgentUtXmlMulticastTorValidate::Validate() { } //Add multicast tor olist TunnelOlist olist; - olist.push_back(OlistTunnelEntry(nil_uuid(), 10, + olist.push_back(OlistTunnelEntry(nil_uuid(), 10, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::VxlanType())); AgentPath *path = NULL; diff --git a/src/vnsw/agent/oper/tunnel_nh.h b/src/vnsw/agent/oper/tunnel_nh.h index 6d3432f3e76..009b496ab22 100644 --- a/src/vnsw/agent/oper/tunnel_nh.h +++ b/src/vnsw/agent/oper/tunnel_nh.h @@ -17,7 +17,7 @@ class TunnelNH : public NextHop { bool policy, TunnelType type, const MacAddress &rewrite_dmac); virtual ~TunnelNH(); - virtual std::string ToString() const { + virtual std::string ToString() const { return "Tunnel to " + dip_.to_string() + " rewrite mac " + rewrite_dmac_.ToString(); } @@ -37,7 +37,7 @@ class TunnelNH : public NextHop { const MacAddress &rewrite_dmac() const {return rewrite_dmac_;} const TunnelType &GetTunnelType() const {return tunnel_type_;}; const Interface *GetCryptInterface() const {return crypt_interface_.get();}; - bool GetCrypt() const {return crypt_;}; + bool GetCrypt() const {return crypt_;}; bool GetCryptTunnelAvailable() const {return crypt_tunnel_available_;}; virtual void SendObjectLog(const NextHopTable *table, AgentLogEvent::type event) const; diff --git a/src/vnsw/agent/oper/vm.cc b/src/vnsw/agent/oper/vm.cc index 210250cb65c..f50d4d4c0c5 100644 --- a/src/vnsw/agent/oper/vm.cc +++ b/src/vnsw/agent/oper/vm.cc @@ -43,7 +43,7 @@ DBEntryBase::KeyPtr VmEntry::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void VmEntry::SetKey(const DBRequestKey *key) { +void VmEntry::SetKey(const DBRequestKey *key) { const VmKey *k = static_cast(key); uuid_ = k->uuid_; } diff --git a/src/vnsw/agent/oper/vm_interface.cc b/src/vnsw/agent/oper/vm_interface.cc index 8d611c71cc3..19ad23e52cc 100644 --- a/src/vnsw/agent/oper/vm_interface.cc +++ b/src/vnsw/agent/oper/vm_interface.cc @@ -45,7 +45,7 @@ const char *VmInterface::kInterfaceStatic = "interface-static"; ///////////////////////////////////////////////////////////////////////////// // VM-Interface entry routines ///////////////////////////////////////////////////////////////////////////// -VmInterface::VmInterface(const boost::uuids::uuid &uuid, +VmInterface::VmInterface(const boost::uuids::uuid &uuid, const std::string &name, bool os_oper_state, const boost::uuids::uuid &logical_router_uuid) : @@ -299,7 +299,7 @@ bool VmInterface::Resync(const InterfaceTable *table, // Compute service-ip for the interface vm_ip_service_addr_ = GetServiceIp(primary_ip_addr()).to_v4(); - // Add/Update L2 + // Add/Update L2 if (l2_active_) { UpdateL2(); } @@ -645,18 +645,18 @@ bool VmInterface::SecurityGroupEntryList::UpdateList return true; } -VmInterface::SecurityGroupEntry::SecurityGroupEntry() : +VmInterface::SecurityGroupEntry::SecurityGroupEntry() : ListEntry(), VmInterfaceState(), uuid_(nil_uuid()) { } VmInterface::SecurityGroupEntry::SecurityGroupEntry -(const SecurityGroupEntry &rhs) : +(const SecurityGroupEntry &rhs) : ListEntry(rhs.del_pending_), VmInterfaceState(rhs.l2_installed_, rhs.l3_installed_), uuid_(rhs.uuid_) { } -VmInterface::SecurityGroupEntry::SecurityGroupEntry(const uuid &u) : +VmInterface::SecurityGroupEntry::SecurityGroupEntry(const uuid &u) : ListEntry(), VmInterfaceState(), uuid_(u) { } @@ -668,7 +668,7 @@ bool VmInterface::SecurityGroupEntry::operator == return uuid_ == rhs.uuid_; } -bool VmInterface::SecurityGroupEntry::operator() +bool VmInterface::SecurityGroupEntry::operator() (const SecurityGroupEntry &lhs, const SecurityGroupEntry &rhs) const { return lhs.IsLess(&rhs); } @@ -822,7 +822,7 @@ bool VrfTableLabelState::AddL3(const Agent *agent, VmInterface *vmi) const { // L2 nexthops: // These L2 nexthop are used by multicast and bridge. Presence of multicast // forces it to be present in ipv4 mode(l3-only). -// +// // L3 nexthops: // Also creates L3 interface NH, if layer3_forwarding is set. // It does not depend on oper state of ip forwarding. @@ -1066,7 +1066,7 @@ VmInterfaceState::Op ResolveRouteState::GetOpL3(const Agent *agent, if (vrf_ != vmi->forwarding_vrf() || subnet_ != vmi->subnet() || plen_ != vmi->subnet_plen()) return VmInterfaceState::DEL_ADD; - + return VmInterfaceState::ADD; } @@ -1193,7 +1193,7 @@ VmInterfaceState::Op VmiRouteState::GetOpL3 if (vrf_ != vmi->vrf()) return VmInterfaceState::DEL_ADD; - + if (ip_ != vmi->dhcp_addr()) return VmInterfaceState::DEL_ADD; @@ -1251,7 +1251,7 @@ bool VmiRouteState::AddL2(const Agent *agent, VmInterface *vmi) const { if (vrf_ == NULL || vmi->vn() == NULL) return false; - vmi->AddL2InterfaceRoute(Ip4Address(), vmi->vm_mac(), Ip4Address(0)); + vmi->AddL2InterfaceRoute(Ip4Address(), vmi->vm_mac(), Ip4Address(0)); return true; } @@ -1529,7 +1529,7 @@ bool VmInterface::FloatingIpList::UpdateList(const Agent *agent, return true; } -VmInterface::FloatingIp::FloatingIp() : +VmInterface::FloatingIp::FloatingIp() : ListEntry(), VmInterfaceState(), floating_ip_(), vn_(NULL), vrf_(NULL, this), vrf_name_(""), vn_uuid_(), fixed_ip_(), direction_(DIRECTION_BOTH), port_map_enabled_(false), @@ -2131,7 +2131,7 @@ VmInterface::AllowedAddressPair::~AllowedAddressPair() { } bool VmInterface::AllowedAddressPair::operator() (const AllowedAddressPair &lhs, - const AllowedAddressPair &rhs) + const AllowedAddressPair &rhs) const { return lhs.IsLess(&rhs); } @@ -2337,7 +2337,7 @@ bool VmInterface::ServiceVlanList::UpdateList if (prev->del_pending_) { list_.erase(prev); } - } + } } it = list_.begin(); diff --git a/src/vnsw/agent/oper/vm_interface.h b/src/vnsw/agent/oper/vm_interface.h index d2357c5d481..9166ef3423f 100644 --- a/src/vnsw/agent/oper/vm_interface.h +++ b/src/vnsw/agent/oper/vm_interface.h @@ -809,7 +809,7 @@ class VmInterface : public Interface { struct VrfAssignRule : ListEntry { VrfAssignRule(); VrfAssignRule(const VrfAssignRule &rhs); - VrfAssignRule(uint32_t id, + VrfAssignRule(uint32_t id, const autogen::MatchConditionType &match_condition_, const std::string &vrf_name, bool ignore_acl); ~VrfAssignRule(); @@ -1284,7 +1284,7 @@ class VmInterface : public Interface { return slo_list_; } - const std::string GetAnalyzer() const; + const std::string GetAnalyzer() const; bool IsL2Active() const; bool IsIpv6Active() const; @@ -1467,7 +1467,7 @@ class VmInterface : public Interface { // to agent or if it would flood the request in the VN. bool dhcp_enable_; // true if IP is to be obtained from DHCP Relay and not learnt from fabric - bool do_dhcp_relay_; + bool do_dhcp_relay_; // Proxy ARP mode for interface ProxyArpMode proxy_arp_mode_; // VM-Name. Used by DNS @@ -1577,7 +1577,7 @@ struct VmInterfaceKey : public InterfaceKey { virtual ~VmInterfaceKey() { } Interface *AllocEntry(const InterfaceTable *table) const; - Interface *AllocEntry(const InterfaceTable *table, + Interface *AllocEntry(const InterfaceTable *table, const InterfaceData *data) const; InterfaceKey *Clone() const; }; @@ -1586,7 +1586,7 @@ struct VmInterfaceKey : public InterfaceKey { // The base class for different type of InterfaceData used for VmInterfaces. // // Request for VM-Interface data are of 3 types -// - ADD_DEL_CHANGE +// - ADD_DEL_CHANGE // Message for ADD/DEL/CHANGE of an interface // - MIRROR // Data for mirror enable/disable diff --git a/src/vnsw/agent/oper/vm_interface_config.cc b/src/vnsw/agent/oper/vm_interface_config.cc index 12d6a33e3a7..d66636c939a 100644 --- a/src/vnsw/agent/oper/vm_interface_config.cc +++ b/src/vnsw/agent/oper/vm_interface_config.cc @@ -560,7 +560,7 @@ static void BuildInstanceIp(Agent *agent, VmInterfaceConfigData *data, if (err.value() != 0) { return; } - + if (ip->secondary() != true && ip->service_instance_ip() != true && ip->service_health_check_ip() != true) { is_primary = true; @@ -1628,7 +1628,7 @@ bool InterfaceTable::VmiProcessConfig(IFMapNode *node, DBRequest &req, //iterate through links for paremt VMI for VM for (DBGraphVertex::adjacency_iterator vmi_iter = parent_vmi_node->begin(vmi_graph); vmi_iter != parent_vmi_node->end(vmi_graph); ++vmi_iter) { - + IFMapNode *vm_node = static_cast(vmi_iter.operator->()); if (agent_->config_manager()->SkipNode(vm_node, agent_->cfg()->cfg_vm_table())) { continue; diff --git a/src/vnsw/agent/oper/vm_interface_request.cc b/src/vnsw/agent/oper/vm_interface_request.cc index 21cae9bc8f3..59db9d0f3c9 100644 --- a/src/vnsw/agent/oper/vm_interface_request.cc +++ b/src/vnsw/agent/oper/vm_interface_request.cc @@ -90,7 +90,7 @@ VmInterfaceConfigData::VmInterfaceConfigData(Agent *agent, IFMapNode *node) : tx_vlan_id_(VmInterface::kInvalidVlanId), logical_interface_(nil_uuid()), ecmp_load_balance_(), service_health_check_ip_(), service_ip_(0), - service_ip_ecmp_(false), service_ip6_(), service_ip_ecmp6_(false), + service_ip_ecmp_(false), service_ip6_(), service_ip_ecmp6_(false), qos_config_uuid_(), learning_enabled_(false), vhostuser_mode_(VmInterface::vHostUserClient), is_left_si_(false), service_mode_(VmInterface::SERVICE_MODE_ERROR), si_other_end_vmi_(nil_uuid()), vmi_cfg_uuid_(nil_uuid()), @@ -245,7 +245,7 @@ bool VmInterface::CopyIp6Address(const Ip6Address &addr) { return ret; } -// Copies configuration from DB-Request data. The actual applying of +// Copies configuration from DB-Request data. The actual applying of // configuration, like adding/deleting routes must be done with ApplyConfig() bool VmInterface::CopyConfig(const InterfaceTable *table, const VmInterfaceConfigData *data, @@ -600,9 +600,9 @@ bool VmInterface::CopyConfig(const InterfaceTable *table, SecurityGroupEntrySet &old_sg_list = sg_list_.list_; const SecurityGroupEntrySet &new_sg_list = data->sg_list_.list_; *sg_changed = - AuditList - (sg_list_, old_sg_list.begin(), old_sg_list.end(), - new_sg_list.begin(), new_sg_list.end()); + AuditList + (sg_list_, old_sg_list.begin(), old_sg_list.end(), + new_sg_list.begin(), new_sg_list.end()); if (*sg_changed) { ret = true; } diff --git a/src/vnsw/agent/oper/vm_interface_utils.cc b/src/vnsw/agent/oper/vm_interface_utils.cc index a7f23470bfc..ca3d62fa1cc 100644 --- a/src/vnsw/agent/oper/vm_interface_utils.cc +++ b/src/vnsw/agent/oper/vm_interface_utils.cc @@ -145,7 +145,7 @@ void VmInterface::GetOsParams(Agent *agent) { // - If interface is deleted, it is inactive // - VN, VRF are set // - If sub_interface VMIs, parent_ should be set -// (We dont track parent_ and activate sub-interfaces. So, we only check +// (We dont track parent_ and activate sub-interfaces. So, we only check // parent_ is present and not necessarily active) // - For non-VMWARE hypervisors, // The tap interface must be created. This is verified by os_index_ @@ -160,7 +160,7 @@ bool VmInterface::IsActive() const { } // If sub_interface VMIs, parent_vmi_ should be set - // (We dont track parent_ and activate sub-interfaces. So, we only check + // (We dont track parent_ and activate sub-interfaces. So, we only check // paremt_vmi is present and not necessarily active) // Check if parent is not active set the SubInterface also not active const VmInterface *parentIntf = static_cast(parent()); @@ -833,7 +833,7 @@ const string VmInterface::GetAnalyzer() const { } } -const Peer *VmInterface::peer() const { +const Peer *VmInterface::peer() const { return peer_.get(); } diff --git a/src/vnsw/agent/oper/vn.cc b/src/vnsw/agent/oper/vn.cc index b7d260a5d20..9f132ee8973 100644 --- a/src/vnsw/agent/oper/vn.cc +++ b/src/vnsw/agent/oper/vn.cc @@ -61,10 +61,10 @@ VnIpam::VnIpam(const std::string& ip, uint32_t len, const std::string& gw, Ip4Address VnIpam::GetBroadcastAddress() const { if (ip_prefix.is_v4()) { - Ip4Address broadcast(ip_prefix.to_v4().to_ulong() | + Ip4Address broadcast(ip_prefix.to_v4().to_ulong() | ~(0xFFFFFFFF << (32 - plen))); return broadcast; - } + } return Ip4Address(0); } @@ -85,7 +85,7 @@ Ip6Address VnIpam::GetV6SubnetAddress() const { bool VnIpam::IsSubnetMember(const IpAddress &ip) const { if (ip_prefix.is_v4() && ip.is_v4()) { return ((ip_prefix.to_v4().to_ulong() | - ~(0xFFFFFFFF << (32 - plen))) == + ~(0xFFFFFFFF << (32 - plen))) == (ip.to_v4().to_ulong() | ~(0xFFFFFFFF << (32 - plen)))); } else if (ip_prefix.is_v6() && ip.is_v6()) { return IsIp6SubnetMember(ip.to_v6(), ip_prefix.to_v6(), plen); @@ -124,7 +124,7 @@ DBEntryBase::KeyPtr VnEntry::GetDBRequestKey() const { return DBEntryBase::KeyPtr(new VnKey(uuid_)); } -void VnEntry::SetKey(const DBRequestKey *key) { +void VnEntry::SetKey(const DBRequestKey *key) { const VnKey *k = static_cast(key); uuid_ = k->uuid_; } @@ -202,7 +202,7 @@ bool VnEntry::ChangeHandler(Agent *agent, const DBRequest *req) { } // Recompute the forwarding modes in VN - // Must rebake the routes if any change in forwarding modes + // Must rebake the routes if any change in forwarding modes bool resync_routes = false; resync_routes = UpdateForwardingMode(agent); ret |= resync_routes; @@ -478,11 +478,11 @@ bool VnEntry::HandleIpamChange(Agent *agent, VnIpam *old_ipam, if (old_ipam->dhcp_enable != new_ipam->dhcp_enable) { changed = true; } - + return changed; } -void VnEntry::UpdateHostRoute(Agent *agent, const IpAddress &old_address, +void VnEntry::UpdateHostRoute(Agent *agent, const IpAddress &old_address, const IpAddress &new_address, bool policy) { if (vrf_.get() && (vrf_->GetName() != agent->linklocal_vrf_name())) { @@ -674,11 +674,11 @@ bool VnEntry::GetIpamVdnsData(const IpAddress &vm_addr, !agent_->domain_config_table()->GetIpam(ipam_name, ipam_type) || ipam_type->ipam_dns_method != "virtual-dns-server") return false; - + if (!agent_->domain_config_table()->GetVDns( ipam_type->ipam_dns_server.virtual_dns_server_name, vdns_type)) return false; - + return true; } @@ -831,17 +831,17 @@ void VnTable::GlobalVrouterConfigChanged() { * situation needs to be handled. * This is a temporary solution in which all VRF other than primary VRF * is ignored. - * Example: + * Example: * VN name: domain:vn1 * VRF 1: domain:vn1:vn1 ----> Primary * VRF 2: domain:vn1:service-vn1_vn2 ----> Second vrf linked to vn1 * Break the VN and VRF name into tokens based on ':' - * So in primary vrf last and second-last token will be same and will be + * So in primary vrf last and second-last token will be same and will be * equal to last token of VN name. Keep this VRF. * The second VRF last and second-last token are not same so it will be ignored. * */ -bool IsVRFServiceChainingInstance(const string &vn_name, const string &vrf_name) +bool IsVRFServiceChainingInstance(const string &vn_name, const string &vrf_name) { vector vn_token_result; vector vrf_token_result; @@ -851,17 +851,17 @@ bool IsVRFServiceChainingInstance(const string &vn_name, const string &vrf_name) split(vrf_token_result, vrf_name, is_any_of(":"), token_compress_on); vrf_token_result_size = vrf_token_result.size(); - /* + /* * This check is to handle test cases where vrf and vn name * are single word without discriminator ':' * e.g. vrf1 or vn1. In these cases we dont ignore and use - * the VRF + * the VRF */ if (vrf_token_result_size == 1) { return false; - } + } if ((vrf_token_result.at(vrf_token_result_size - 1) == - vrf_token_result.at(vrf_token_result_size - 2)) && + vrf_token_result.at(vrf_token_result_size - 2)) && (vn_token_result.at(vn_token_result.size() - 1) == vrf_token_result.at(vrf_token_result_size - 1))) { return false; @@ -869,12 +869,12 @@ bool IsVRFServiceChainingInstance(const string &vn_name, const string &vrf_name) return true; } -IFMapNode *VnTable::FindTarget(IFMapAgentTable *table, IFMapNode *node, +IFMapNode *VnTable::FindTarget(IFMapAgentTable *table, IFMapNode *node, std::string node_type) { for (DBGraphVertex::adjacency_iterator it = node->begin(table->GetGraph()); it != node->end(table->GetGraph()); ++it) { IFMapNode *adj_node = static_cast(it.operator->()); - if (adj_node->table()->Typename() == node_type) + if (adj_node->table()->Typename() == node_type) return adj_node; } return NULL; @@ -889,7 +889,7 @@ int VnTable::GetCfgVnId(VirtualNetwork *cfg_vn) { int VnTable::ComputeCfgVxlanId(IFMapNode *node) { VirtualNetwork *cfg = static_cast (node->GetObject()); - if (Agent::GetInstance()->vxlan_network_identifier_mode() == + if (Agent::GetInstance()->vxlan_network_identifier_mode() == Agent::CONFIGURED) { return cfg->properties().vxlan_network_identifier; } else { @@ -1138,7 +1138,7 @@ bool VnTable::ProcessConfig(IFMapNode *node, DBRequest &req, } void VnTable::AddVn(const uuid &vn_uuid, const string &name, - const uuid &acl_id, const string &vrf_name, + const uuid &acl_id, const string &vrf_name, const std::vector &ipam, const VnData::VnIpamDataMap &vn_ipam_data, int vn_id, int vxlan_id, bool admin_state, bool enable_rpf, @@ -1148,14 +1148,14 @@ void VnTable::AddVn(const uuid &vn_uuid, const string &name, UuidList empty_list; req.key.reset(new VnKey(vn_uuid)); bool mirror_destination = false; - VnData *data = new VnData(agent(), NULL, name, acl_id, vrf_name, nil_uuid(), + VnData *data = new VnData(agent(), NULL, name, acl_id, vrf_name, nil_uuid(), nil_uuid(), ipam, vn_ipam_data, vxlan_id, vn_id, admin_state, enable_rpf, flood_unknown_unicast, Agent::NONE, nil_uuid(), mirror_destination, pbb_etree_enable, pbb_evpn_enable, layer2_control_word, empty_list, false, false, nil_uuid(), false); - + req.data.reset(data); Enqueue(&req); } @@ -1491,7 +1491,7 @@ bool DomainConfig::GetIpam(const std::string &name, autogen::IpamType *ipam) { return true; } -bool DomainConfig::GetVDns(const std::string &vdns, +bool DomainConfig::GetVDns(const std::string &vdns, autogen::VirtualDnsType *vdns_type) { VdnsDomainConfigMap::iterator it = vdns_config_.find(vdns); if (it == vdns_config_.end()) diff --git a/src/vnsw/agent/oper/vn.h b/src/vnsw/agent/oper/vn.h index c43a8df4906..89e8c9d4cbc 100644 --- a/src/vnsw/agent/oper/vn.h +++ b/src/vnsw/agent/oper/vn.h @@ -309,7 +309,7 @@ class VnTable : public AgentOperDBTable { virtual DBEntry *OperDBAdd(const DBRequest *req); virtual bool OperDBOnChange(DBEntry *entry, const DBRequest *req); virtual bool OperDBDelete(DBEntry *entry, const DBRequest *req); - virtual bool OperDBResync(DBEntry *entry, const DBRequest *req); + virtual bool OperDBResync(DBEntry *entry, const DBRequest *req); virtual bool IFNodeToReq(IFMapNode *node, DBRequest &req, const boost::uuids::uuid &u); @@ -349,7 +349,7 @@ class VnTable : public AgentOperDBTable { const std::string &ipam_name, std::vector *vn_ipam); VnData *BuildData(IFMapNode *node); - IFMapNode *FindTarget(IFMapAgentTable *table, IFMapNode *node, + IFMapNode *FindTarget(IFMapAgentTable *table, IFMapNode *node, std::string node_type); DBTable::DBTableWalkRef walk_ref_; @@ -391,7 +391,7 @@ class DomainConfig { typedef std::map VdnsDomainConfigMap; typedef std::pair VdnsDomainConfigPair; typedef boost::function Callback; - + DomainConfig(Agent *); virtual ~DomainConfig(); void Init(); diff --git a/src/vnsw/agent/oper/vrf.cc b/src/vnsw/agent/oper/vrf.cc index f6c04dcf18a..fae8f67dcaa 100644 --- a/src/vnsw/agent/oper/vrf.cc +++ b/src/vnsw/agent/oper/vrf.cc @@ -37,11 +37,11 @@ VrfTable *VrfTable::vrf_table_; class VrfEntry::DeleteActor : public LifetimeActor { public: - DeleteActor(VrfEntry *vrf) : + DeleteActor(VrfEntry *vrf) : LifetimeActor((static_cast(vrf->get_table()))-> agent()->lifetime_manager()), table_(vrf, this) { } - virtual ~DeleteActor() { + virtual ~DeleteActor() { } virtual bool MayDelete() const { //No table present, then this VRF can be deleted @@ -58,7 +58,7 @@ class VrfEntry::DeleteActor : public LifetimeActor { VrfEntryRef table_; }; -VrfEntry::VrfEntry(const string &name, uint32_t flags, Agent *agent) : +VrfEntry::VrfEntry(const string &name, uint32_t flags, Agent *agent) : name_(name), id_(kInvalidIndex), flags_(flags), walkid_(DBTableWalker::kInvalidWalkerId), deleter_(NULL), rt_table_db_(), delete_timeout_timer_(NULL), @@ -163,7 +163,7 @@ void VrfEntry::DeleteRouteTables() { void VrfEntry::PostAdd() { VrfTable *table = static_cast(get_table()); Agent *agent = table->agent(); - // get_table() would return NULL in Add(), so move dependent functions and + // get_table() would return NULL in Add(), so move dependent functions and // initialization to PostAdd deleter_.reset(new DeleteActor(this)); if (route_resync_walker_.get() == NULL) { @@ -222,7 +222,7 @@ DBEntryBase::KeyPtr VrfEntry::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void VrfEntry::SetKey(const DBRequestKey *key) { +void VrfEntry::SetKey(const DBRequestKey *key) { const VrfKey *k = static_cast(key); name_ = k->name_; } @@ -357,7 +357,7 @@ bool VrfEntry::DBEntrySandesh(Sandesh *sresp, std::string &name) const { RDInstanceId(table->agent()->tor_agent_enabled()); data.set_RD(rd.str()); - std::vector &list = + std::vector &list = const_cast&>(resp->get_vrf_list()); data.set_vxlan_id(vxlan_id_); data.set_mac_aging_time(mac_aging_time_); @@ -417,7 +417,7 @@ void VrfEntry::StartDeleteTimer() { delete_timeout_timer_ = TimerManager::CreateTimer( *(agent->event_manager())->io_service(), "VrfDeleteTimer"); - delete_timeout_timer_->Start(kDeleteTimeout, + delete_timeout_timer_->Start(kDeleteTimeout, boost::bind(&VrfEntry::DeleteTimeout, this)); } @@ -525,7 +525,7 @@ class VrfDeleteWalker : public AgentRouteWalker { return false; } - static void WalkDone(VrfDeleteWalker *walker) { + static void WalkDone(VrfDeleteWalker *walker) { walker->mgr()->ReleaseWalker(walker); walker->agent()->vrf_table()->reset_vrf_delete_walker(); } @@ -604,7 +604,7 @@ bool VrfTable::OperDBOnChange(DBEntry *entry, const DBRequest *req) { VnEntry *vn = agent()->vn_table()->Find(data->vn_uuid_); bool resync_routes = false; - + if (vn != vrf->vn_.get()) { resync_routes = true; vrf->vn_.reset(vn); @@ -759,7 +759,7 @@ DBTableBase *VrfTable::CreateTable(DB *db, const std::string &name) { VrfEntry *VrfTable::FindVrfFromName(const string &name) { VrfNameTree::const_iterator it; - + it = name_tree_.find(name); if (it == name_tree_.end()) { return NULL; @@ -808,7 +808,7 @@ InetUnicastAgentRouteTable *VrfTable::GetInet6UnicastRouteTable AgentRouteTable *VrfTable::GetRouteTable(const string &vrf_name, uint8_t table_type) { VrfDbTree::const_iterator it; - + it = dbtree_[table_type].find(vrf_name); if (it == dbtree_[table_type].end()) { return NULL; @@ -1084,7 +1084,7 @@ class RouteDeleteWalker : public AgentRouteWalker { //Override route notification bool RouteWalkNotify(DBTablePartBase *partition, DBEntryBase *e) { - AgentRoute *rt = static_cast(e); + AgentRoute *rt = static_cast(e); for(Route::PathList::const_iterator it = rt->GetPathList().begin(); it != rt->GetPathList().end(); ) { const AgentPath *path = diff --git a/src/vnsw/agent/oper/vrf.h b/src/vnsw/agent/oper/vrf.h index de8773426c7..7a499d5cbe4 100644 --- a/src/vnsw/agent/oper/vrf.h +++ b/src/vnsw/agent/oper/vrf.h @@ -293,7 +293,7 @@ class VrfTable : public AgentOperDBTable { void CreateStaticVrf(const string &name); void DeleteStaticVrf(const string &name); void CreateFabricPolicyVrf(const string &name); - + // Create VRF Table with given name static DBTableBase *CreateTable(DB *db, const std::string &name); static VrfTable *GetInstance() {return vrf_table_;}; @@ -309,7 +309,7 @@ class VrfTable : public AgentOperDBTable { void FreeVrfId(size_t index); virtual bool CanNotify(IFMapNode *dbe); - + InetUnicastAgentRouteTable *GetInet4UnicastRouteTable (const std::string &vrf_name); AgentRouteTable *GetInet4MulticastRouteTable(const std::string &vrf_name); diff --git a/src/vnsw/agent/oper/vrf_assign.cc b/src/vnsw/agent/oper/vrf_assign.cc index 5391bec1cbb..ec576a26c5f 100644 --- a/src/vnsw/agent/oper/vrf_assign.cc +++ b/src/vnsw/agent/oper/vrf_assign.cc @@ -25,7 +25,7 @@ std::auto_ptr VrfAssignTable::AllocEntry(const DBRequestKey *k) const { } VrfAssign *VrfAssignTable::AllocWithKey(const DBRequestKey *k) const { - const VrfAssign::VrfAssignKey *key = + const VrfAssign::VrfAssignKey *key = static_cast(k); VrfAssign *assign = NULL; @@ -35,7 +35,7 @@ VrfAssign *VrfAssignTable::AllocWithKey(const DBRequestKey *k) const { switch (key->type_) { case VrfAssign::VLAN: { - VlanVrfAssign *vlan_assign = + VlanVrfAssign *vlan_assign = new VlanVrfAssign(intrface, key->vlan_tag_); assign = static_cast(vlan_assign); } @@ -50,7 +50,7 @@ VrfAssign *VrfAssignTable::AllocWithKey(const DBRequestKey *k) const { } DBEntry *VrfAssignTable::Add(const DBRequest *req) { - const VrfAssign::VrfAssignKey *key = + const VrfAssign::VrfAssignKey *key = static_cast(req->key.get()); VrfAssign *rule = AllocWithKey(key); if (rule->interface_.get() == NULL) { @@ -168,7 +168,7 @@ bool VrfAssign::IsLess(const DBEntry &rhs) const { bool VrfAssign::Change(const DBRequest *req) { bool ret = false; - VrfAssign::VrfAssignData *data = + VrfAssign::VrfAssignData *data = static_cast(req->data.get()); VrfEntry *vrf = VrfAssignTable::GetInstance()->FindVrf(data->vrf_name_); diff --git a/src/vnsw/agent/oper/vrf_assign.h b/src/vnsw/agent/oper/vrf_assign.h index 1f78498b6d8..b6504243853 100644 --- a/src/vnsw/agent/oper/vrf_assign.h +++ b/src/vnsw/agent/oper/vrf_assign.h @@ -36,7 +36,7 @@ class VrfAssign : AgentRefCount, public AgentDBEntry { }; struct VrfAssignData : public AgentData { - VrfAssignData(const std::string vrf_name) : + VrfAssignData(const std::string vrf_name) : AgentData(), vrf_name_(vrf_name) { }; virtual ~VrfAssignData() { }; diff --git a/src/vnsw/agent/oper/vxlan.cc b/src/vnsw/agent/oper/vxlan.cc index c2c7ac0a256..7f3d30b31fd 100644 --- a/src/vnsw/agent/oper/vxlan.cc +++ b/src/vnsw/agent/oper/vxlan.cc @@ -16,7 +16,7 @@ using namespace std; -VxLanId::~VxLanId() { +VxLanId::~VxLanId() { if (vxlan_id_ == VxLanTable::kInvalidvxlan_id) { return; } @@ -27,7 +27,7 @@ DBEntryBase::KeyPtr VxLanId::GetDBRequestKey() const { return DBEntryBase::KeyPtr(key); } -void VxLanId::SetKey(const DBRequestKey *k) { +void VxLanId::SetKey(const DBRequestKey *k) { const VxLanIdKey *key = static_cast(k); vxlan_id_ = key->vxlan_id(); } @@ -359,7 +359,7 @@ void VxLanId::SendObjectLog(const AgentDBTable *table, AgentLogEvent::type event) const { VxLanObjectLogInfo info; string str, nh_type; - + info.set_vxlan_id((int)vxlan_id_); switch (event) { case AgentLogEvent::ADD: @@ -382,11 +382,11 @@ void VxLanId::SendObjectLog(const AgentDBTable *table, //const VrfNH *vrf_nh; switch(nh->GetType()) { case NextHop::VRF: { - nh_type.assign("VRF"); - const VrfNH *vrf_nh = static_cast(nh); + nh_type.assign("VRF"); + const VrfNH *vrf_nh = static_cast(nh); info.set_vrf_name(vrf_nh->GetVrf()->GetName()); break; - } + } default: nh_type.assign("unknown"); break; diff --git a/src/vnsw/agent/oper/vxlan.h b/src/vnsw/agent/oper/vxlan.h index 1fea1bb6e61..9a202739ba9 100644 --- a/src/vnsw/agent/oper/vxlan.h +++ b/src/vnsw/agent/oper/vxlan.h @@ -24,7 +24,7 @@ class VxLanId : AgentRefCount, public AgentDBEntry { virtual string ToString() const { return "vxlan_id"; }; virtual void SetKey(const DBRequestKey *key); virtual KeyPtr GetDBRequestKey() const; - + uint32_t vxlan_id() const {return vxlan_id_;}; const NextHop *nexthop() const {return nh_.get();}; @@ -57,10 +57,10 @@ class VxLanIdKey : public AgentKey { class VxLanIdData : public AgentData { public: VxLanIdData(const string &vrf_name, DBRequest &req, bool mirror_destination) : - vrf_name_(vrf_name) { + vrf_name_(vrf_name) { nh_req_.Swap(&req); mirror_destination_ = mirror_destination; - }; + }; virtual ~VxLanIdData() { }; string &vrf_name() {return vrf_name_;} DBRequest &nh_req() {return nh_req_;} diff --git a/src/vnsw/agent/oper/windows/interface_params.cc b/src/vnsw/agent/oper/windows/interface_params.cc index f1b3eaab2e9..80108bf4229 100644 --- a/src/vnsw/agent/oper/windows/interface_params.cc +++ b/src/vnsw/agent/oper/windows/interface_params.cc @@ -190,7 +190,7 @@ static boost::optional GetRealIdsFromOptionalLuid(boost::opti /* We assume that interface is UP */ os_params.os_oper_state_ = true; - + return os_params; } diff --git a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/multicast_mac_local_ovsdb.h b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/multicast_mac_local_ovsdb.h index e7919515288..6af7923ab04 100644 --- a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/multicast_mac_local_ovsdb.h +++ b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/multicast_mac_local_ovsdb.h @@ -2,8 +2,8 @@ * Copyright (c) 2015 Juniper Networks, Inc. All rights reserved. */ -#ifndef SRC_VNSW_AGENT_OVS_TOR_AGENT_OVSDB_CLIENT_MULTICAST_MAC_LOCAL_OVSDB_H_ -#define SRC_VNSW_AGENT_OVS_TOR_AGENT_OVSDB_CLIENT_MULTICAST_MAC_LOCAL_OVSDB_H_ +#ifndef SRC_VNSW_AGENT_OVS_TOR_AGENT_OVSDB_CLIENT_MULTICAST_MAC_LOCAL_OVSDB_H_ +#define SRC_VNSW_AGENT_OVS_TOR_AGENT_OVSDB_CLIENT_MULTICAST_MAC_LOCAL_OVSDB_H_ #include #include diff --git a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_ssl.cc b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_ssl.cc index b1d24c065cf..9d92d1b5427 100644 --- a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_ssl.cc +++ b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_ssl.cc @@ -169,7 +169,7 @@ OvsdbClientSslSession::OvsdbClientSslSession(Agent *agent, bool async_ready) : OvsdbClientSession(agent, manager), SslSession(server, sock, async_ready), status_("Init") { - reader_ = new OvsdbClientTcpSessionReader(this, + reader_ = new OvsdbClientTcpSessionReader(this, boost::bind(&OvsdbClientSslSession::RecvMsg, this, _1, _2)); // Process session events in KSync workqueue task context, diff --git a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_tcp.cc b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_tcp.cc index 9560f5a6bd0..0f6eb259125 100644 --- a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_tcp.cc +++ b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/ovsdb_client_tcp.cc @@ -115,7 +115,7 @@ OvsdbClientTcpSession::OvsdbClientTcpSession(Agent *agent, "OVSDB Client TCP reconnect Timer", agent->task_scheduler()->GetTaskId("Agent::KSync"), 0)) { - reader_ = new OvsdbClientTcpSessionReader(this, + reader_ = new OvsdbClientTcpSessionReader(this, boost::bind(&OvsdbClientTcpSession::RecvMsg, this, _1, _2)); // Process session events in KSync workqueue task context, @@ -260,7 +260,7 @@ bool OvsdbClientTcpSession::ReconnectTimerCb() { } OvsdbClientTcpSessionReader::OvsdbClientTcpSessionReader( - TcpSession *session, ReceiveCallback callback) : + TcpSession *session, ReceiveCallback callback) : TcpMessageReader(session, callback) { } diff --git a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/unicast_mac_remote_ovsdb.cc b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/unicast_mac_remote_ovsdb.cc index 74fcef97d93..66b2104b44f 100644 --- a/src/vnsw/agent/ovs_tor_agent/ovsdb_client/unicast_mac_remote_ovsdb.cc +++ b/src/vnsw/agent/ovs_tor_agent/ovsdb_client/unicast_mac_remote_ovsdb.cc @@ -177,7 +177,7 @@ bool UnicastMacRemoteEntry::Sync(DBEntry *db_entry) { const NextHop *nh = entry->GetActiveNextHop(); const TunnelNH *tunnel = NULL; - /* + /* * TOR Agent will not have any local VM so only tunnel nexthops * are to be looked into */ diff --git a/src/vnsw/agent/pkt/flow_entry.cc b/src/vnsw/agent/pkt/flow_entry.cc index 40bb1f74765..d688e115024 100644 --- a/src/vnsw/agent/pkt/flow_entry.cc +++ b/src/vnsw/agent/pkt/flow_entry.cc @@ -749,7 +749,7 @@ void FlowEntry::InitRevFlow(const PktFlowInfo *info, const PktInfo *pkt, data_.flow_source_plen_map = info->flow_dest_plen_map; data_.flow_dest_plen_map = info->flow_source_plen_map; data_.vrf = info->dest_vrf; - + if (!info->nat_done) { data_.dest_vrf = info->flow_source_vrf; } else { @@ -1537,7 +1537,7 @@ void FlowEntry::GetPolicyInfo(const VnEntry *vn, const FlowEntry *rflow) { // Reset old values first ResetPolicy(); - // Short flows means there is some information missing for the flow. Skip + // Short flows means there is some information missing for the flow. Skip // getting policy information for short flow. When the information is // complete, GetPolicyInfo is called again if (is_flags_set(FlowEntry::ShortFlow)) { @@ -1551,7 +1551,7 @@ void FlowEntry::GetPolicyInfo(const VnEntry *vn, const FlowEntry *rflow) { if (data_.intf_entry->type() != Interface::VM_INTERFACE) return; - // Get Network policy/mirror cfg policy/mirror policies + // Get Network policy/mirror cfg policy/mirror policies GetPolicy(vn, rflow); // Get Sg list @@ -1790,7 +1790,7 @@ void FlowEntry::GetApplicationPolicySet(const Interface *intf, // The direction stored in flow is defined with vrouter as reference point // Ingress : Packet to Vrouter from VM // Egress : Packet from Vrouter to VM -// +// // Function takes care of copying right rules static bool CopySgEntries(const VmInterface *vm_port, bool ingress_acl, std::list &list) { @@ -1809,7 +1809,7 @@ static bool CopySgEntries(const VmInterface *vm_port, bool ingress_acl, ret = true; } MatchAclParams acl; - // As per definition above, + // As per definition above, // get EgressACL if flow direction is Ingress // get IngressACL if flow direction is Egress if (ingress_acl) { @@ -1988,7 +1988,7 @@ uint32_t FlowEntry::MatchAcl(const PacketHeader &hdr, // PASS default GW traffic, if it is ICMP or DNS if ((hdr.protocol == IPPROTO_ICMP || - (hdr.protocol == IPPROTO_UDP && + (hdr.protocol == IPPROTO_UDP && (hdr.src_port == DNS_SERVER_PORT || hdr.dst_port == DNS_SERVER_PORT))) && (pkt_handler->IsGwPacket(data_.intf_entry.get(), hdr.dst_ip) || @@ -2257,27 +2257,27 @@ void FlowEntry::SessionMatch(SessionPolicy *sp, SessionPolicy *rsp, // both the ports. sg_policy.m_acl_l will contain ACL for port in forward flow and // sg_policy.m_out_acl_l will have ACL from other port // -// If forward flow goes thru NAT, the key for matching ACL in +// If forward flow goes thru NAT, the key for matching ACL in // sg_policy.m_out_acl_l can potentially change. The routine SetOutPacketHeader // takes care of forming header after NAT // // Rules applied are based on flow type // Non-Local Forward Flow -// Network Policy. +// Network Policy. // Out-Network Policy will be empty // SG // Out-SG will be empty // Non-Local Reverse Flow -// Network Policy. +// Network Policy. // Out-Network Policy will be empty // SG and out-SG from forward flow // Local Forward Flow -// Network Policy. +// Network Policy. // Out-Network Policy // SG -// Out-SG +// Out-SG // Local Reverse Flow -// Network Policy. +// Network Policy. // Out-Network Policy // SG and out-SG from forward flow bool FlowEntry::DoPolicy() { @@ -2342,7 +2342,7 @@ bool FlowEntry::DoPolicy() { SessionMatch(&data_.match_p.aps_policy, r_aps_policy, false); } else { // SG is reflexive ACL. For reverse-flow, copy SG action from - // forward flow + // forward flow UpdateReflexiveAction(); } @@ -2479,7 +2479,7 @@ bool FlowEntry::ActionRecompute() { action &= ~(1 << TrafficAction::VRF_TRANSLATE); action |= data_.match_p.vrf_assign_acl_action; - if (action & (1 << TrafficAction::VRF_TRANSLATE) && + if (action & (1 << TrafficAction::VRF_TRANSLATE) && data_.match_p.action_info.vrf_translate_action_.ignore_acl() == true) { //In case of multi inline service chain, match condition generated on //each of service instance interface takes higher priority than @@ -2922,7 +2922,7 @@ void FlowEntry::FillFlowInfo(FlowInfo &info) const { info.set_mirror_vrf(data_.mirror_vrf); info.set_implicit_deny(ImplicitDenyFlow()); info.set_short_flow(is_flags_set(FlowEntry::ShortFlow)); - if (is_flags_set(FlowEntry::EcmpFlow) && + if (is_flags_set(FlowEntry::EcmpFlow) && data_.component_nh_idx != CompositeNH::kInvalidComponentNHIdx) { info.set_ecmp_index(data_.component_nh_idx); } @@ -2962,7 +2962,7 @@ static void SetAclListAceId(const AclDBEntry *acl, continue; } AclEntryIDList::const_iterator ait; - for (ait = (*ma_it).ace_id_list.begin(); + for (ait = (*ma_it).ace_id_list.begin(); ait != (*ma_it).ace_id_list.end(); ++ ait) { AceId ace_id; ace_id.id = ait->id_; @@ -2995,7 +2995,7 @@ void FlowEntry::SetAclFlowSandeshData(const AclDBEntry *acl, fe_sandesh_data.set_dest_vn_list(data_.DestinationVnList()); std::vector v; SecurityGroupList::const_iterator it; - for (it = data_.source_sg_id_l.begin(); + for (it = data_.source_sg_id_l.begin(); it != data_.source_sg_id_l.end(); it++) { v.push_back(*it); } @@ -3045,7 +3045,7 @@ void FlowEntry::SetAclFlowSandeshData(const AclDBEntry *acl, "yes" : "no"); fe_sandesh_data.set_nat(is_flags_set(FlowEntry::NatFlow) ? "yes" : "no"); fe_sandesh_data.set_implicit_deny(ImplicitDenyFlow() ? "yes" : "no"); - fe_sandesh_data.set_short_flow(is_flags_set(FlowEntry::ShortFlow) ? + fe_sandesh_data.set_short_flow(is_flags_set(FlowEntry::ShortFlow) ? "yes" : "no"); fe_sandesh_data.set_l3_flow(l3_flow_); fe_sandesh_data.set_smac(data_.smac.ToString()); diff --git a/src/vnsw/agent/pkt/flow_entry.h b/src/vnsw/agent/pkt/flow_entry.h index 8688fe6dc82..9fb13c01e58 100644 --- a/src/vnsw/agent/pkt/flow_entry.h +++ b/src/vnsw/agent/pkt/flow_entry.h @@ -143,7 +143,7 @@ struct FlowKey { dst_port(dport_p) { } - FlowKey(const FlowKey &key) : + FlowKey(const FlowKey &key) : family(key.family), nh(key.nh), src_addr(key.src_addr), dst_addr(key.dst_addr), protocol(key.protocol), src_port(key.src_port), dst_port(key.dst_port) { @@ -649,11 +649,11 @@ class FlowEntry { const MatchPolicy &match_p() const { return data_.match_p; } bool ActionSet(TrafficAction::Action action) const { - return ((data_.match_p.action_info.action & + return ((data_.match_p.action_info.action & (1 << action)) ? true : false); } - bool ImplicitDenyFlow() const { - return ((data_.match_p.action_info.action & + bool ImplicitDenyFlow() const { + return ((data_.match_p.action_info.action & (1 << TrafficAction::IMPLICIT_DENY)) ? true : false); } bool deleted() { return deleted_; } @@ -832,7 +832,7 @@ class FlowEntry { // IMPORTANT: Remember to update Reset() routine if new fields are added // IMPORTANT: Remember to update Copy() routine if new fields are added }; - + void intrusive_ptr_add_ref(FlowEntry *fe); void intrusive_ptr_release(FlowEntry *fe); @@ -978,7 +978,7 @@ class PortTable { void set_timeout(uint64_t timeout) { cache_.set_timeout(timeout); } - + tbb::recursive_mutex& mutex() { return mutex_; } diff --git a/src/vnsw/agent/pkt/flow_event.cc b/src/vnsw/agent/pkt/flow_event.cc index 39f5c6b1089..bbc00458878 100644 --- a/src/vnsw/agent/pkt/flow_event.cc +++ b/src/vnsw/agent/pkt/flow_event.cc @@ -86,7 +86,7 @@ void FlowEventQueueBase::TaskExit(bool done) { uint32_t sys = (r.ru_stime.tv_sec - rusage_.ru_stime.tv_sec) * 1000; sys += ((r.ru_stime.tv_usec - rusage_.ru_stime.tv_usec) / 1000); - LOG(ERROR, queue_->Description() + LOG(ERROR, queue_->Description() << " Time exceeded " << ((t - task_start_) / 1000) << " Count " << count_ << " User " << user << " Sys " << sys); diff --git a/src/vnsw/agent/pkt/flow_handler.cc b/src/vnsw/agent/pkt/flow_handler.cc index c01e43f2c88..fef7e11d987 100644 --- a/src/vnsw/agent/pkt/flow_handler.cc +++ b/src/vnsw/agent/pkt/flow_handler.cc @@ -122,7 +122,7 @@ bool FlowHandler::Run() { pkt_info_->vrf = fe->data().vrf; info.l3_flow = fe->l3_flow(); info.out_component_nh_idx = fe->data().component_nh_idx; - } + } if (info.Process(pkt_info_.get(), &in, &out) == false) { info.short_flow = true; diff --git a/src/vnsw/agent/pkt/flow_mgmt.cc b/src/vnsw/agent/pkt/flow_mgmt.cc index 2424aba19e8..1942d9dc040 100644 --- a/src/vnsw/agent/pkt/flow_mgmt.cc +++ b/src/vnsw/agent/pkt/flow_mgmt.cc @@ -1244,7 +1244,7 @@ bool FlowMgmtEntry::Delete(FlowEntry *flow, FlowMgmtKeyNode *node) { return flow_list_.size(); } -// An entry *cannot* be deleted if +// An entry *cannot* be deleted if // - It contains flows // - It has seen ADD but not seen any DELETE bool FlowMgmtEntry::CanDelete() const { diff --git a/src/vnsw/agent/pkt/flow_mgmt.h b/src/vnsw/agent/pkt/flow_mgmt.h index aaeaf626fe7..0f5e2a1ee7a 100644 --- a/src/vnsw/agent/pkt/flow_mgmt.h +++ b/src/vnsw/agent/pkt/flow_mgmt.h @@ -76,7 +76,7 @@ // - Operational entry to list of dependent flows // - Flow entry to list of operational-entries it is dependent on // 4. DBClient module registers to DBTables of interest and tracks changes to -// operational-db entries +// operational-db entries // 5. Flow Table module will enqueue a message to Flow Management queue on // add/delete/change of operational entries // 6. The action in flow-management module for operational entry events will @@ -753,7 +753,7 @@ class InetRouteFlowMgmtKey : public RouteFlowMgmtKey { } return NULL; - } + } bool Match(const IpAddress &match_ip) const { if (ip_.is_v4()) { diff --git a/src/vnsw/agent/pkt/flow_mgmt_dbclient.cc b/src/vnsw/agent/pkt/flow_mgmt_dbclient.cc index c90be8c4b1f..f4a7e4a4819 100644 --- a/src/vnsw/agent/pkt/flow_mgmt_dbclient.cc +++ b/src/vnsw/agent/pkt/flow_mgmt_dbclient.cc @@ -228,7 +228,7 @@ void FlowMgmtDbClient::VnNotify(DBTablePartBase *part, DBEntryBase *e) { } bool changed = false; - if (state != NULL) { + if (state != NULL) { acl = state->acl_; macl = state->macl_; mcacl = state->mcacl_; @@ -241,7 +241,7 @@ void FlowMgmtDbClient::VnNotify(DBTablePartBase *part, DBEntryBase *e) { const AclDBEntry *new_mcacl = vn->GetMirrorCfgAcl(); bool new_enable_rpf = vn->enable_rpf(); bool new_flood_unknown_unicast = vn->flood_unknown_unicast(); - + if (state == NULL) { state = new VnFlowHandlerState(new_acl, new_macl, new_mcacl, new_enable_rpf, @@ -582,7 +582,7 @@ bool FlowMgmtDbClient::HandleTrackingIpChange(const AgentRoute *rt, } } } - + //Check if any path has been deleted RouteFlowHandlerState::FixedIpMap::const_iterator old_it = state->fixed_ip_map_.begin(); diff --git a/src/vnsw/agent/pkt/flow_mgmt_dbclient.h b/src/vnsw/agent/pkt/flow_mgmt_dbclient.h index b5c68464326..77c6b0d52da 100644 --- a/src/vnsw/agent/pkt/flow_mgmt_dbclient.h +++ b/src/vnsw/agent/pkt/flow_mgmt_dbclient.h @@ -27,7 +27,7 @@ class FlowMgmtDbClient { AclDBEntryConstRef mcacl_; bool enable_rpf_; bool flood_unknown_unicast_; - VnFlowHandlerState(const AclDBEntry *acl, + VnFlowHandlerState(const AclDBEntry *acl, const AclDBEntry *macl, const AclDBEntry *mcacl, bool enable_rpf, bool flood_unknown_unicast) : diff --git a/src/vnsw/agent/pkt/flow_table.cc b/src/vnsw/agent/pkt/flow_table.cc index 1283e32d117..e906326bd98 100644 --- a/src/vnsw/agent/pkt/flow_table.cc +++ b/src/vnsw/agent/pkt/flow_table.cc @@ -277,7 +277,7 @@ void FlowTable::AddInternal(FlowEntry *flow_req, FlowEntry *flow, UpdateReverseFlow(flow, rflow); - // Add the forward flow after adding the reverse flow first to avoid + // Add the forward flow after adding the reverse flow first to avoid // following sequence // 1. Agent adds forward flow // 2. vrouter releases the packet @@ -839,7 +839,7 @@ bool FlowTable::ProcessFlowEvent(const FlowEvent *req, FlowEntry *flow, } else { flow->MakeShortFlow(FlowEntry::SHORT_NO_MIRROR_ENTRY); flow->ResetRetryCount(); - } + } UpdateKSync(flow, true); break; diff --git a/src/vnsw/agent/pkt/flow_table.h b/src/vnsw/agent/pkt/flow_table.h index 0f649067ac4..b1e9ddceadc 100644 --- a/src/vnsw/agent/pkt/flow_table.h +++ b/src/vnsw/agent/pkt/flow_table.h @@ -201,7 +201,7 @@ class FlowTable { return flow_entry_map_.begin(); } FlowTable::FlowEntryMap::iterator end() { - return flow_entry_map_.end(); + return flow_entry_map_.end(); } const LinkLocalFlowInfoMap &linklocal_flow_info_map() { @@ -214,11 +214,11 @@ class FlowTable { static const char *TaskName() { return kTaskFlowEvent; } // Sandesh routines void Copy(FlowEntry *lhs, FlowEntry *rhs, bool update); - void SetAclFlowSandeshData(const AclDBEntry *acl, AclFlowResp &data, + void SetAclFlowSandeshData(const AclDBEntry *acl, AclFlowResp &data, const int last_count); - void SetAceSandeshData(const AclDBEntry *acl, AclFlowCountResp &data, + void SetAceSandeshData(const AclDBEntry *acl, AclFlowCountResp &data, int ace_id); - + void RecomputeFlow(FlowEntry *flow); void DeleteMessage(FlowEntry *flow); diff --git a/src/vnsw/agent/pkt/pkt_flow_info.cc b/src/vnsw/agent/pkt/pkt_flow_info.cc index b95213c3de7..8f1753b1f2b 100644 --- a/src/vnsw/agent/pkt/pkt_flow_info.cc +++ b/src/vnsw/agent/pkt/pkt_flow_info.cc @@ -42,7 +42,7 @@ const Ip4Address PktFlowInfo::kDefaultIpv4; const Ip6Address PktFlowInfo::kDefaultIpv6; -static void LogError(const PktInfo *pkt, const PktFlowInfo *flow_info, +static void LogError(const PktInfo *pkt, const PktFlowInfo *flow_info, const char *str) { if (pkt->family == Address::INET || pkt->family == Address::INET6) { FLOW_TRACE(DetailErr, pkt->agent_hdr.cmd_param, pkt->agent_hdr.ifindex, @@ -55,7 +55,7 @@ static void LogError(const PktInfo *pkt, const PktFlowInfo *flow_info, // VRF changed for the packet. Treat it as Layer3 packet from now. // Note: -// Features like service chain are supported only for Layer3. Bridge +// Features like service chain are supported only for Layer3. Bridge // entries are not leaked into the new VRF and any bridge entry lookup // into new VRF will also Fail. So, even VRouter will treat packets // as L3 after VRF transaltion. @@ -118,7 +118,7 @@ static uint32_t NhToVrf(const NextHop *nh) { break; } case NextHop::NextHop::INTERFACE: { - const Interface *intf = + const Interface *intf = (static_cast(nh))->GetInterface(); if (intf) vrf = intf->vrf(); @@ -150,7 +150,7 @@ static bool IsVgwOrVmInterface(const Interface *intf) { } static bool PickEcmpMember(const Agent *agent, const NextHop **nh, - const PktInfo *pkt, PktFlowInfo *info, + const PktInfo *pkt, PktFlowInfo *info, const EcmpLoadBalance &ecmp_load_balance) { const CompositeNH *comp_nh = dynamic_cast(*nh); // ECMP supported only if composite-type is ECMP or LOCAL_ECMP @@ -203,8 +203,8 @@ static bool PickEcmpMember(const Agent *agent, const NextHop **nh, // force_vmport means, we want destination to be VM_INTERFACE only // This is to avoid routing across fabric interface itself static bool NhDecode(const Agent *agent, const NextHop *nh, const PktInfo *pkt, - PktFlowInfo *info, PktControlInfo *in, - PktControlInfo *out, bool force_vmport, + PktFlowInfo *info, PktControlInfo *in, + PktControlInfo *out, bool force_vmport, const EcmpLoadBalance &ecmp_load_balance) { bool ret = true; @@ -397,8 +397,8 @@ static bool NhDecode(const Agent *agent, const NextHop *nh, const PktInfo *pkt, // Decode route and get Interface / ECMP information static bool RouteToOutInfo(const Agent *agent, const AgentRoute *rt, - const PktInfo *pkt, PktFlowInfo *info, - PktControlInfo *in, PktControlInfo *out) { + const PktInfo *pkt, PktFlowInfo *info, + PktControlInfo *in, PktControlInfo *out) { const AgentPath *path = rt->GetActivePath(); if (path == NULL) return false; @@ -562,7 +562,7 @@ void PktFlowInfo::LinkLocalServiceFromVm(const PktInfo *pkt, PktControlInfo *in, return; } - const VmInterface *vm_port = + const VmInterface *vm_port = static_cast(in->intf_); uint16_t nat_port; @@ -574,7 +574,7 @@ void PktFlowInfo::LinkLocalServiceFromVm(const PktInfo *pkt, PktControlInfo *in, // link local service not configured, drop the request in->rt_ = NULL; out->rt_ = NULL; - return; + return; } out->vrf_ = agent->vrf_table()->FindVrfFromName(agent->fabric_vrf_name()); @@ -620,12 +620,12 @@ void PktFlowInfo::LinkLocalServiceFromHost(const PktInfo *pkt, PktControlInfo *i // Link local services supported only for IPv4 for now if (pkt->family != Address::INET) { - in->rt_ = NULL; - out->rt_ = NULL; + in->rt_ = NULL; + out->rt_ = NULL; return; } - const VmInterface *vm_port = + const VmInterface *vm_port = static_cast(out->intf_); if (vm_port == NULL) { // Force implicit deny @@ -823,7 +823,7 @@ void PktFlowInfo::ProcessHealthCheckFatFlow(const VmInterface *vmi, // - Packet originated from remote vm void PktFlowInfo::FloatingIpDNat(const PktInfo *pkt, PktControlInfo *in, PktControlInfo *out) { - const VmInterface *vm_port = + const VmInterface *vm_port = static_cast(out->intf_); const VmInterface::FloatingIpSet &fip_list = vm_port->floating_ip_list().list_; @@ -933,7 +933,7 @@ void PktFlowInfo::FloatingIpSNat(const PktInfo *pkt, PktControlInfo *in, return; //TODO: V6 FIP } - const VmInterface *intf = + const VmInterface *intf = static_cast(in->intf_); const VmInterface::FloatingIpSet &fip_list = intf->floating_ip_list().list_; VmInterface::FloatingIpSet::const_iterator it = fip_list.begin(); @@ -1380,7 +1380,7 @@ void PktFlowInfo::IngressProcess(const PktInfo *pkt, PktControlInfo *in, FloatingIpSNat(pkt, in, out); } } - + if (out->rt_ != NULL) { // Route is present. If IP-DA is a floating-ip, we need DNAT if (RouteToOutInfo(agent, out->rt_, pkt, this, in, out)) { @@ -1504,7 +1504,7 @@ void PktFlowInfo::EgressProcess(const PktInfo *pkt, PktControlInfo *in, } //Delay hash pick up till route is picked. if (NhDecode(agent, nh, pkt, this, in, out, true, - EcmpLoadBalance()) == false) { + EcmpLoadBalance()) == false) { return; } @@ -1721,12 +1721,12 @@ bool PktFlowInfo::Process(const PktInfo *pkt, PktControlInfo *in, } if (nat_done && (pkt->ignore_address == VmInterface::IGNORE_SOURCE || - pkt->ignore_address == VmInterface::IGNORE_DESTINATION)) { + pkt->ignore_address == VmInterface::IGNORE_DESTINATION)) { /* IGNORE_SOURCE/IGNORE_DESTINATION not supported for NAT flows */ - LogError(pkt, this, "Flow : Fat-flow and NAT cannot co-exist"); - short_flow = true; - short_flow_reason = FlowEntry::SHORT_FAT_FLOW_NAT_CONFLICT; - return false; + LogError(pkt, this, "Flow : Fat-flow and NAT cannot co-exist"); + short_flow = true; + short_flow_reason = FlowEntry::SHORT_FAT_FLOW_NAT_CONFLICT; + return false; } if (!disable_validation) { @@ -2119,7 +2119,7 @@ void PktFlowInfo::SetPktInfo(boost::shared_ptr pkt_info) { IpAddress PktFlowInfo::FamilyToAddress(Address::Family family) { if (pkt->family == Address::INET6) { - return Ip6Address(); + return Ip6Address(); } return Ip4Address(); } diff --git a/src/vnsw/agent/pkt/pkt_flow_info.h b/src/vnsw/agent/pkt/pkt_flow_info.h index 0f52bbdcf8a..8f535bfc386 100644 --- a/src/vnsw/agent/pkt/pkt_flow_info.h +++ b/src/vnsw/agent/pkt/pkt_flow_info.h @@ -18,8 +18,8 @@ struct MatchPolicy; typedef map FlowRouteRefMap; struct PktControlInfo { - PktControlInfo() : - vrf_(NULL), intf_(NULL), rt_(NULL), vn_(NULL), vm_(NULL), + PktControlInfo() : + vrf_(NULL), intf_(NULL), rt_(NULL), vn_(NULL), vm_(NULL), vlan_nh_(false), vlan_tag_(0) { } virtual ~PktControlInfo() { } @@ -56,7 +56,7 @@ class PktFlowInfo { flow_entry(NULL), flood_unknown_unicast(false), bgp_router_service_flow(false), alias_ip_flow(false), ttl(0), underlay_flow(false), - src_policy_vrf(-1), dst_policy_vrf(-1), port_allocated(false), + src_policy_vrf(-1), dst_policy_vrf(-1), port_allocated(false), overlay_route_not_found(false) { } diff --git a/src/vnsw/agent/pkt/pkt_handler.cc b/src/vnsw/agent/pkt/pkt_handler.cc index 199b6f0499d..6ac41761103 100644 --- a/src/vnsw/agent/pkt/pkt_handler.cc +++ b/src/vnsw/agent/pkt/pkt_handler.cc @@ -311,7 +311,7 @@ void PktHandler::HandleRcvPkt(const AgentHdr &hdr, const PacketBufferPtr &buff){ boost::shared_ptr info(new PacketBufferEnqueueItem(hdr, buff)); work_queue_.Enqueue(info); - + } bool PktHandler::ProcessPacket(boost::shared_ptr item) { @@ -326,7 +326,7 @@ bool PktHandler::ProcessPacket(boost::shared_ptr item) } void PktHandler::PktModuleEnqueue(PktModuleName mod, const AgentHdr &hdr, - boost::shared_ptr pkt_info, + boost::shared_ptr pkt_info, uint8_t * pkt) { pkt_info->packet_buffer()->set_module(mod); stats_.PktRcvd(mod); @@ -763,7 +763,7 @@ int PktHandler::ParseUserPkt(PktInfo *pkt_info, Interface *intf, // IP Packets len += ParseIpPacket(pkt_info, pkt_type, (pkt + len)); - + // If packet is an IP fragment and not flow trap, ignore it if (IgnoreFragmentedPacket(pkt_info)) { agent_->stats()->incr_pkt_fragments_dropped(); @@ -870,7 +870,7 @@ bool PktHandler::IsDHCPPacket(PktInfo *pkt_info) { return false; } - if (pkt_info->dport == DHCP_SERVER_PORT || + if (pkt_info->dport == DHCP_SERVER_PORT || pkt_info->sport == DHCP_CLIENT_PORT) { // we dont handle DHCPv6 coming from fabric return true; @@ -1020,7 +1020,7 @@ bool PktHandler::IsFlowPacket(const AgentHdr &agent_hdr) { bool PktHandler::IsDiagPacket(PktInfo *pkt_info) { if (pkt_info->agent_hdr.cmd == AgentHdr::TRAP_ZERO_TTL || - pkt_info->agent_hdr.cmd == AgentHdr::TRAP_ICMP_ERROR + pkt_info->agent_hdr.cmd == AgentHdr::TRAP_ICMP_ERROR || pkt_info->agent_hdr.cmd == AgentHdr::TRAP_ROUTER_ALERT) return true; return false; @@ -1197,7 +1197,7 @@ std::size_t PktInfo::hash(const Agent *agent, // // On Compute-1, the hash computation uses same 5-tuple and will always // result in even number. As a result, flows from Compute-1 will go to - // even-numbered ECMP members and never odd-numbered members. + // even-numbered ECMP members and never odd-numbered members. // If Compute-2 happens to have only 2 members, all flows go to ecmp-index // 0 and never to 1 // diff --git a/src/vnsw/agent/pkt/pkt_handler.h b/src/vnsw/agent/pkt/pkt_handler.h index 22cfcf9d5c1..826d34488fd 100644 --- a/src/vnsw/agent/pkt/pkt_handler.h +++ b/src/vnsw/agent/pkt/pkt_handler.h @@ -109,13 +109,13 @@ struct PktType { }; struct sctphdr { - u_int16_t th_sport; + u_int16_t th_sport; u_int16_t th_dport; u_int32_t vtag; }; struct AgentHdr { - // Packet commands between agent and vrouter. The values must be in-sync + // Packet commands between agent and vrouter. The values must be in-sync // with vrouter/include/vr_defs.h enum PktCommand { TX_SWITCH = AGENT_CMD_SWITCH, @@ -277,7 +277,7 @@ class PktHandler { bool ProcessPacket(boost::shared_ptr item); // identify pkt type and send to the registered handler void HandleRcvPkt(const AgentHdr &hdr, const PacketBufferPtr &buff); - void SendMessage(PktModuleName mod, InterTaskMsg *msg); + void SendMessage(PktModuleName mod, InterTaskMsg *msg); bool IsGwPacket(const Interface *intf, const IpAddress &dst_ip); @@ -413,7 +413,7 @@ struct PktInfo { const AgentHdr &GetAgentHdr() const; void UpdateHeaderPtr(); std::size_t hash(const Agent *agent, - const EcmpLoadBalance &ecmp_has_fields_to_use) const; + const EcmpLoadBalance &ecmp_has_fields_to_use) const; PacketBuffer *packet_buffer() const { return packet_buffer_.get(); } PacketBufferPtr packet_buffer_ptr() const { return packet_buffer_; } diff --git a/src/vnsw/agent/pkt/pkt_sandesh_flow.h b/src/vnsw/agent/pkt/pkt_sandesh_flow.h index 2680e2841ad..ef9f01c43bc 100644 --- a/src/vnsw/agent/pkt/pkt_sandesh_flow.h +++ b/src/vnsw/agent/pkt/pkt_sandesh_flow.h @@ -22,7 +22,7 @@ class PktSandeshFlow : public Task { void SendResponse(SandeshResponse *resp); bool SetFlowKey(std::string key); static std::string GetFlowKey(const FlowKey &key, uint16_t partition_id); - + virtual bool Run(); std::string Description() const { return "PktSandeshFlow"; } void SetSandeshFlowData(std::vector &list, FlowEntry *fe, diff --git a/src/vnsw/agent/pkt/proto.cc b/src/vnsw/agent/pkt/proto.cc index 414fb47bc06..e516cfdee8d 100644 --- a/src/vnsw/agent/pkt/proto.cc +++ b/src/vnsw/agent/pkt/proto.cc @@ -11,7 +11,7 @@ //////////////////////////////////////////////////////////////////////////////// Proto::Proto(Agent *agent, const char *task_name, PktHandler::PktModuleName mod, - boost::asio::io_service &io) + boost::asio::io_service &io) : agent_(agent), module_(mod), trace_(true), free_buffer_(false), io_(io), work_queue_(TaskScheduler::GetInstance()->GetTaskId(task_name), mod, boost::bind(&Proto::ProcessProto, this, _1)) { @@ -21,7 +21,7 @@ Proto::Proto(Agent *agent, const char *task_name, PktHandler::PktModuleName mod, work_queue_.set_name(str.str()); } -Proto::~Proto() { +Proto::~Proto() { work_queue_.Shutdown(); } diff --git a/src/vnsw/agent/pkt/proto_handler.cc b/src/vnsw/agent/pkt/proto_handler.cc index 4ece0cc19ff..599802dd2f5 100644 --- a/src/vnsw/agent/pkt/proto_handler.cc +++ b/src/vnsw/agent/pkt/proto_handler.cc @@ -238,7 +238,7 @@ uint16_t ProtoHandler::Csum(uint16_t *ptr, std::size_t len, uint32_t sum) const{ return ~sum; } -uint16_t ProtoHandler::UdpCsum(in_addr_t src, in_addr_t dest, +uint16_t ProtoHandler::UdpCsum(in_addr_t src, in_addr_t dest, std::size_t len, udphdr *udp) const { uint32_t sum = 0; PseudoUdpHdr phdr(src, dest, IPPROTO_UDP, htons(len)); diff --git a/src/vnsw/agent/pkt/test/test_ecmp_l2_pkt.cc b/src/vnsw/agent/pkt/test/test_ecmp_l2_pkt.cc index d9f970c56c3..b6c687c6f4c 100644 --- a/src/vnsw/agent/pkt/test/test_ecmp_l2_pkt.cc +++ b/src/vnsw/agent/pkt/test/test_ecmp_l2_pkt.cc @@ -210,7 +210,7 @@ TEST_F(EcmpTest, EcmpTest_2) { //Send packet from MX3 to VM //Verify that index are set fine TEST_F(EcmpTest, EcmpTest_3) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpMplsPacket(eth_intf_id, MX_3, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); @@ -241,7 +241,7 @@ TEST_F(EcmpTest, EcmpTest_3) { //Send one more flow setup message from MX2 to VM //verify that component index gets update TEST_F(EcmpTest, EcmpTest_4) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpMplsPacket(eth_intf_id, MX_0, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); @@ -267,7 +267,7 @@ TEST_F(EcmpTest, EcmpTest_4) { TxIpMplsPacket(eth_intf_id, MX_2, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); - client->WaitForIdle(); + client->WaitForIdle(); EXPECT_EQ(2, flow_proto_->FlowCount()); EXPECT_TRUE(entry->data().rpf_nh.get() == rt->GetActiveNextHop()); diff --git a/src/vnsw/agent/pkt/test/test_ecmp_local.cc b/src/vnsw/agent/pkt/test/test_ecmp_local.cc index d24b71cd28c..c12de3b2c63 100644 --- a/src/vnsw/agent/pkt/test/test_ecmp_local.cc +++ b/src/vnsw/agent/pkt/test/test_ecmp_local.cc @@ -15,7 +15,7 @@ class LocalEcmpTest : public EcmpTest { virtual void SetUp() { EcmpTest::SetUp(); } - + virtual void TearDown() { EcmpTest::TearDown(); } @@ -500,7 +500,7 @@ TEST_F(LocalEcmpTest, EcmpToEcmp_RpfFail_1) { } TEST_F(LocalEcmpTest, Metadata_Ecmp_1) { - const VmInterface *vhost = + const VmInterface *vhost = static_cast(agent_->vhost_interface()); TxTcpPacket(vhost->id(), vhost->primary_ip_addr().to_string().c_str(), @@ -515,14 +515,14 @@ TEST_F(LocalEcmpTest, Metadata_Ecmp_1) { EXPECT_TRUE(flow != NULL); EXPECT_TRUE(flow->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); - + InetUnicastRouteEntry *rt = RouteGet("vrf1", vmi_[11]->primary_ip_addr(), 32); - const CompositeNH *cnh = + const CompositeNH *cnh = dynamic_cast(rt->GetActiveNextHop()); - EXPECT_TRUE(cnh->GetNH(flow->data().component_nh_idx) == + EXPECT_TRUE(cnh->GetNH(flow->data().component_nh_idx) == vmi_[11]->l3_interface_nh_no_policy()); - + client->WaitForIdle(); } diff --git a/src/vnsw/agent/pkt/test/test_ecmp_mx.cc b/src/vnsw/agent/pkt/test/test_ecmp_mx.cc index 961e6473b41..893c1ffd070 100644 --- a/src/vnsw/agent/pkt/test/test_ecmp_mx.cc +++ b/src/vnsw/agent/pkt/test/test_ecmp_mx.cc @@ -47,7 +47,7 @@ class EcmpTest : public ::testing::Test { vm1_label = vmi->label(); eth_intf_id = EthInterfaceGet("vnet0")->id(); } - + virtual void TearDown() { DeleteVmportEnv(input1, 1, true); client->WaitForIdle(); @@ -114,7 +114,7 @@ class EcmpTest : public ::testing::Test { //Verify component index is set and correspnding //rpf nexthop TEST_F(EcmpTest, EcmpTest_1) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpPacket(VmPortGetId(1), "1.1.1.1", "2.1.1.1", 1); client->WaitForIdle(); @@ -129,7 +129,7 @@ TEST_F(EcmpTest, EcmpTest_1) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); @@ -144,7 +144,7 @@ TEST_F(EcmpTest, EcmpTest_1) { // Reverse flow is ECMP. ECMP Index is not set // Reverse flow rpf next is Composite NH TEST_F(EcmpTest, EcmpTest_2) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpMplsPacket(eth_intf_id, MX_2, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); @@ -175,7 +175,7 @@ TEST_F(EcmpTest, EcmpTest_2) { //Send packet from MX3 to VM //Verify that index are set fine TEST_F(EcmpTest, EcmpTest_3) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpMplsPacket(eth_intf_id, MX_3, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); @@ -206,7 +206,7 @@ TEST_F(EcmpTest, EcmpTest_3) { //Send one more flow setup message from MX2 to VM //verify that component index gets update TEST_F(EcmpTest, EcmpTest_4) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4); TxIpMplsPacket(eth_intf_id, MX_0, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); @@ -232,7 +232,7 @@ TEST_F(EcmpTest, EcmpTest_4) { TxIpMplsPacket(eth_intf_id, MX_2, router_id, vm1_label, "8.8.8.8", "1.1.1.1", 1, 10); - client->WaitForIdle(); + client->WaitForIdle(); EXPECT_EQ(2, flow_proto_->FlowCount()); EXPECT_TRUE(entry->data().rpf_nh.get() == rt->GetActiveNextHop()); @@ -328,7 +328,7 @@ TEST_F(EcmpTest, EcmpTest_6) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); @@ -385,7 +385,7 @@ TEST_F(EcmpTest, EcmpTest_7) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); @@ -536,11 +536,11 @@ TEST_F(EcmpTest, FabricVmi) { dynamic_cast(rt->GetActiveNextHop()); EXPECT_TRUE(comp_nh->ComponentNHCount() == 3); - //Create PHYSICAL interface to receive GRE packets on it. - PhysicalInterfaceKey key(agent_->fabric_interface_name()); - Interface *intf = static_cast - (agent_->interface_table()->FindActiveEntry(&key)); - EXPECT_TRUE(intf != NULL); + //Create PHYSICAL interface to receive GRE packets on it. + PhysicalInterfaceKey key(agent_->fabric_interface_name()); + Interface *intf = static_cast + (agent_->interface_table()->FindActiveEntry(&key)); + EXPECT_TRUE(intf != NULL); for (uint32_t i = 0; i < 100; i++) { TxTcpPacket(0, "2.1.1.1", "1.1.1.10", i, i, false, i, 0); diff --git a/src/vnsw/agent/pkt/test/test_ecmp_remote.cc b/src/vnsw/agent/pkt/test/test_ecmp_remote.cc index 35e107c8ca7..920a4d1d975 100644 --- a/src/vnsw/agent/pkt/test/test_ecmp_remote.cc +++ b/src/vnsw/agent/pkt/test/test_ecmp_remote.cc @@ -286,7 +286,7 @@ TEST_F(RemoteEcmpTest, Fabric_NonEcmpToEcmp_1) { //VIP of vrf2 interfaces char vm_ip[80] = "2.1.1.1"; char router_id[80]; - char remote_server_ip[80]; + char remote_server_ip[80]; char remote_vm_ip[80]; strcpy(router_id, agent_->router_id().to_string().c_str()); @@ -301,12 +301,12 @@ TEST_F(RemoteEcmpTest, Fabric_NonEcmpToEcmp_1) { FlowEntry *entry = FlowGet(VrfGet("vrf2")->vrf_id(), remote_vm_ip, vm_ip, 1, 0, 0, nh_id); EXPECT_TRUE(entry != NULL); - EXPECT_TRUE(entry->data().component_nh_idx != + EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); //Reverse flow should be set and should also be ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); } @@ -317,7 +317,7 @@ TEST_F(RemoteEcmpTest, Fabric_DstFip_NonEcmpToEcmp_1) { //FIP of vrf3 interfaces char vm_ip[80] = "4.1.1.100"; char router_id[80]; - char remote_server_ip[80]; + char remote_server_ip[80]; char remote_vm_ip[80]; strcpy(router_id, agent_->router_id().to_string().c_str()); @@ -332,12 +332,12 @@ TEST_F(RemoteEcmpTest, Fabric_DstFip_NonEcmpToEcmp_1) { FlowEntry *entry = FlowGet(VrfGet("default-project:vn4:vn4")->vrf_id(), remote_vm_ip, vm_ip, 1, 0, 0, nh_id); EXPECT_TRUE(entry != NULL); - EXPECT_TRUE(entry->data().component_nh_idx != + EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->is_flags_set(FlowEntry::NatFlow) == true); FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); } @@ -417,7 +417,7 @@ TEST_F(RemoteEcmpTest, Fabric_DstFip_EcmpToNonEcmp_1) { //VIP of vrf2 interfaces char vm_ip[80] = "1.1.1.1"; char router_id[80]; - char remote_server_ip[80]; + char remote_server_ip[80]; char remote_vm_ip[80]; strcpy(router_id, agent_->router_id().to_string().c_str()); @@ -679,7 +679,7 @@ TEST_F(RemoteEcmpTest, Vmi_EcmpTest_13) { DelIPAM("vn9"); } -//Add a test case to check if rpf NH of flow using floating IP +//Add a test case to check if rpf NH of flow using floating IP //gets properly upon nexthop change from ecmp to unicast TEST_F(RemoteEcmpTest, EcmpTest_14) { struct PortInfo input1[] = { @@ -945,7 +945,7 @@ TEST_F(RemoteEcmpTest, DISABLED_EcmpReEval_1) { uint32_t ecmp_index = entry->data().component_nh_idx; //Delete VM corresponding to index component_nh_idx - IntfCfgDel(input2, ecmp_index); + IntfCfgDel(input2, ecmp_index); client->WaitForIdle(); //Enqueue a re-evaluate request TxIpPacket(VmPortGetId(1), "1.1.1.1", "2.1.1.1", 1); @@ -953,7 +953,7 @@ TEST_F(RemoteEcmpTest, DISABLED_EcmpReEval_1) { //Upon interface deletion flow would have been deleted, get flow again FlowEntry *entry2 = FlowGet(VrfGet("vrf2")->vrf_id(), "1.1.1.1", "2.1.1.1", 1, 0, 0, GetFlowKeyNH(1)); - + //Verify compoennt NH index is different EXPECT_TRUE(entry2->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); @@ -968,7 +968,7 @@ TEST_F(RemoteEcmpTest, EcmpReEval_2) { //Add a remote VM route for 3.1.1.10 Ip4Address remote_vm_ip = Ip4Address::from_string("3.1.1.10"); Ip4Address remote_server_ip = Ip4Address::from_string("10.10.10.10"); - Inet4TunnelRouteAdd(bgp_peer, "vrf2",remote_vm_ip, 32, + Inet4TunnelRouteAdd(bgp_peer, "vrf2",remote_vm_ip, 32, remote_server_ip, TunnelType::GREType(), 16, "vn2", SecurityGroupList(), TagList(), PathPreference()); client->WaitForIdle(); @@ -1122,7 +1122,7 @@ TEST_F(RemoteEcmpTest, DISABLE_VgwFlag) { // Send packet from ECMP VM to ECMP MX // Verify component index is set and correspnding rpf nexthop TEST_F(RemoteEcmpTest, DISABLED_EcmpTest_1) { - AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4, ComponentNHKeyList()); + AddRemoteEcmpRoute("vrf1", "0.0.0.0", 0, "vn1", 4, ComponentNHKeyList()); AddRemoteEcmpRoute("vrf1", "1.1.1.1", 32, "vn1", 4, ComponentNHKeyList()); TxIpPacket(VmPortGetId(1), "1.1.1.1", "2.1.1.1", 1); @@ -1141,7 +1141,7 @@ TEST_F(RemoteEcmpTest, DISABLED_EcmpTest_1) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); diff --git a/src/vnsw/agent/pkt/test/test_ecmp_service_vlan.cc b/src/vnsw/agent/pkt/test/test_ecmp_service_vlan.cc index 40ef56d660f..8191d4d8177 100644 --- a/src/vnsw/agent/pkt/test/test_ecmp_service_vlan.cc +++ b/src/vnsw/agent/pkt/test/test_ecmp_service_vlan.cc @@ -357,7 +357,7 @@ TEST_F(EcmpTest, ServiceVlanTest_1) { DelIPAM("vn11"); } -//Service VM with ECMP instantiated in two +//Service VM with ECMP instantiated in two //different remote server //Packet sent from a VM instance to service VM instance TEST_F(EcmpTest, ServiceVlanTest_2) { @@ -392,7 +392,7 @@ TEST_F(EcmpTest, ServiceVlanTest_2) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().vrf == vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == vrf_id); @@ -440,7 +440,7 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { client->WaitForIdle(); //Leak aggregarete route to vrf10 - Ip4Address service_vm_ip = Ip4Address::from_string("10.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("10.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); ComponentNHKeyList comp_nh_list; EXPECT_TRUE(rt != NULL); @@ -457,7 +457,7 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { client->WaitForIdle(); uint32_t vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("vrf10")->vrf_id(); - uint32_t service_vrf_id = + uint32_t service_vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); //Choose some random source and destination port @@ -465,7 +465,7 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(10), "10.1.1.1", "11.1.1.252", sport, dport, + TxTcpPacket(VmPortGetId(10), "10.1.1.1", "11.1.1.252", sport, dport, false, hash_id); client->WaitForIdle(); @@ -495,7 +495,7 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); if (entry->data().component_nh_idx == 1) { //Reverse flow originates remote server, hence @@ -526,8 +526,8 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { strcpy(router_id, Agent::GetInstance()->router_id().to_string().c_str()); uint32_t hash_id = i + 200; - TxTcpMplsPacket(eth_intf_id_, "10.11.11.1", router_id, - vlan_label, "10.1.1.3", "11.1.1.252", + TxTcpMplsPacket(eth_intf_id_, "10.11.11.1", router_id, + vlan_label, "10.1.1.3", "11.1.1.252", sport, dport, false, hash_id); client->WaitForIdle(); @@ -536,7 +536,7 @@ TEST_F(EcmpTest, ServiceVlanTest_3) { FlowEntry *entry = FlowGet(VrfGet("service-vrf1")->vrf_id(), "10.1.1.3", "11.1.1.252", IPPROTO_TCP, sport, dport, nh_id); EXPECT_TRUE(entry != NULL); - //No ECMP as packet came with explicit mpls label + //No ECMP as packet came with explicit mpls label //pointing to vlan NH EXPECT_TRUE(entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); @@ -604,7 +604,7 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { agent_->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); //Leak aggregarete route to vrf10 - Ip4Address service_vm_ip = Ip4Address::from_string("10.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("10.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); EXPECT_TRUE(rt != NULL); @@ -634,7 +634,7 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(10), "10.1.1.1", "11.1.1.252", sport, dport, + TxTcpPacket(VmPortGetId(10), "10.1.1.1", "11.1.1.252", sport, dport, false, hash_id); client->WaitForIdle(); @@ -645,7 +645,7 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().vrf == vrf_id); - //Packet destined to service interface, vrf has to be + //Packet destined to service interface, vrf has to be //service vlan VRF EXPECT_TRUE(entry->data().dest_vrf == service_vrf_id); @@ -656,9 +656,9 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet from service interface, vrf has to be + //Packet from service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == service_vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == vrf_id); @@ -680,8 +680,8 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { strcpy(router_id, Agent::GetInstance()->router_id().to_string().c_str()); uint32_t hash_id = i + 200; - TxTcpMplsPacket(eth_intf_id_, "10.11.11.1", router_id, - label, "10.1.1.3", "11.1.1.252", + TxTcpMplsPacket(eth_intf_id_, "10.11.11.1", router_id, + label, "10.1.1.3", "11.1.1.252", sport, dport, false, hash_id); client->WaitForIdle(); @@ -692,7 +692,7 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().vrf == service_vrf_id); - //Packet destined to service interface, vrf has to be + //Packet destined to service interface, vrf has to be //service vlan VRF LOG(DEBUG, "Vrf" << entry->data().dest_vrf << ":" << service_vrf_id); EXPECT_TRUE(entry->data().dest_vrf == service_vrf_id); @@ -704,9 +704,9 @@ TEST_F(EcmpTest, ServiceVlanTest_4) { //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet from service interface, vrf has to be + //Packet from service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == service_vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); @@ -773,10 +773,10 @@ TEST_F(EcmpTest, ServiceVlanTest_5) { EXPECT_TRUE(L2RouteFind("service-vrf1",mac)); uint32_t vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("vrf11")->vrf_id(); - uint32_t service_vrf_id = + uint32_t service_vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); - Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); EXPECT_TRUE(rt != NULL); @@ -804,7 +804,7 @@ TEST_F(EcmpTest, ServiceVlanTest_5) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -826,7 +826,7 @@ TEST_F(EcmpTest, ServiceVlanTest_5) { FlowEntry *rev_entry = entry->reverse_flow_entry(); EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet to service interface, vrf has to be + //Packet to service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); @@ -839,7 +839,7 @@ TEST_F(EcmpTest, ServiceVlanTest_5) { //Send traffice from second service interface and expect things to be fine for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 200; - TxTcpPacket(VmPortGetId(14), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(14), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -863,7 +863,7 @@ TEST_F(EcmpTest, ServiceVlanTest_5) { EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet from vm11 to service vrf + //Packet from vm11 to service vrf EXPECT_TRUE(rev_entry->data().vrf == vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); EXPECT_TRUE(VnMatch(rev_entry->data().source_vn_list, vn_name_11)); @@ -927,10 +927,10 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { std::string vn_name_10("vn10"); std::string vn_name_11("vn11"); - uint32_t service_vrf_id = + uint32_t service_vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); - Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); EXPECT_TRUE(rt != NULL); uint32_t mpls_label = rt->GetActiveLabel(); @@ -959,7 +959,7 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 10; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -979,7 +979,7 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { FlowEntry *rev_entry = entry->reverse_flow_entry(); EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet to service interface, vrf has to be + //Packet to service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == service_vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); @@ -992,7 +992,7 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { //Send traffic from second service interface for (uint32_t i = 0; i < 10; i++) { uint32_t hash_id = i + 200; - TxTcpPacket(VmPortGetId(14), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(14), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -1027,8 +1027,8 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { //Send traffic from remote VM service for (uint32_t i = 0; i < 10; i++) { uint32_t hash_id = i + 100; - TxTcpMplsPacket(eth_intf_id_, "10.10.10.10", router_id, - mpls_label, "11.1.1.1", "10.1.1.1", + TxTcpMplsPacket(eth_intf_id_, "10.10.10.10", router_id, + mpls_label, "11.1.1.1", "10.1.1.1", sport, dport, false, hash_id); client->WaitForIdle(); @@ -1055,12 +1055,12 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { sport++; dport++; } - + //Send traffic from remote VM which is also ecmp for (uint32_t i = 0; i < 10; i++) { uint32_t hash_id = i + 200; - TxTcpMplsPacket(eth_intf_id_, "10.10.10.10", router_id, - mpls_label, "11.1.1.3", "10.1.1.1", + TxTcpMplsPacket(eth_intf_id_, "10.10.10.10", router_id, + mpls_label, "11.1.1.3", "10.1.1.1", sport, dport, false, hash_id); client->WaitForIdle(); @@ -1091,8 +1091,8 @@ TEST_F(EcmpTest, ServiceVlanTest_6) { //Send traffic from remote VM which is also ecmp for (uint32_t i = 0; i < 10; i++) { uint32_t hash_id = i + 100; - TxTcpMplsPacket(eth_intf_id_, "10.10.10.11", router_id, - mpls_label, "11.1.1.3", "10.1.1.1", + TxTcpMplsPacket(eth_intf_id_, "10.10.10.11", router_id, + mpls_label, "11.1.1.3", "10.1.1.1", sport, dport, false, hash_id); client->WaitForIdle(); int nh_id = @@ -1169,10 +1169,10 @@ TEST_F(EcmpTest, ServiceVlanTest_7) { client->WaitForIdle(); uint32_t vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("vrf11")->vrf_id(); - uint32_t service_vrf_id = + uint32_t service_vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); - Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); EXPECT_TRUE(rt != NULL); @@ -1196,7 +1196,7 @@ TEST_F(EcmpTest, ServiceVlanTest_7) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -1218,7 +1218,7 @@ TEST_F(EcmpTest, ServiceVlanTest_7) { FlowEntry *rev_entry = entry->reverse_flow_entry(); EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet to service interface, vrf has to be + //Packet to service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); @@ -1266,10 +1266,10 @@ TEST_F(EcmpTest,ServiceVlanTest_8) { "virtual-machine-interface", "vnet13"); client->WaitForIdle(); - uint32_t service_vrf_id = + uint32_t service_vrf_id = Agent::GetInstance()->vrf_table()->FindVrfFromName("service-vrf1")->vrf_id(); - Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); + Ip4Address service_vm_ip = Ip4Address::from_string("11.1.1.2"); InetUnicastRouteEntry *rt = RouteGet("service-vrf1", service_vm_ip, 32); EXPECT_TRUE(rt != NULL); @@ -1292,7 +1292,7 @@ TEST_F(EcmpTest,ServiceVlanTest_8) { uint32_t dport = rand() % 65535; for (uint32_t i = 0; i < 32; i++) { uint32_t hash_id = i + 100; - TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, + TxTcpPacket(VmPortGetId(13), "10.1.1.1", "11.1.1.1", sport, dport, false, hash_id, service_vrf_id); client->WaitForIdle(); @@ -1314,7 +1314,7 @@ TEST_F(EcmpTest,ServiceVlanTest_8) { FlowEntry *rev_entry = entry->reverse_flow_entry(); EXPECT_TRUE(entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); - //Packet to service interface, vrf has to be + //Packet to service interface, vrf has to be //service vlan VRF EXPECT_TRUE(rev_entry->data().vrf == service_vrf_id); EXPECT_TRUE(rev_entry->data().dest_vrf == service_vrf_id); diff --git a/src/vnsw/agent/pkt/test/test_fip_src_ecmp.cc b/src/vnsw/agent/pkt/test/test_fip_src_ecmp.cc index 90a52455601..79795460f11 100644 --- a/src/vnsw/agent/pkt/test/test_fip_src_ecmp.cc +++ b/src/vnsw/agent/pkt/test/test_fip_src_ecmp.cc @@ -63,7 +63,7 @@ class FipEcmpTest : public ::testing::Test { vm1_mac = vmi->vm_mac(); eth_intf_id = EthInterfaceGet("vnet0")->id(); } - + virtual void TearDown() { DelLink("virtual-network", VN2, "routing-instance", VRF2); @@ -202,24 +202,24 @@ TEST_F(FipEcmpTest, Test_1) { InetUnicastRouteEntry *rt = static_cast( RouteGet(VRF2, Ip4Address::from_string("2.1.1.1"), 32)); - + EXPECT_TRUE(entry != NULL); EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().rpf_nh.get() == EcmpData::GetLocalNextHop(rt)); - rt = static_cast( + rt = static_cast( RouteGet(VRF2, Ip4Address::from_string("0.0.0.0"), 0)); //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); DeleteRoute(VRF2, "0.0.0.0", 0, bgp_peer); DeleteRemoteEcmpFip(); - client->WaitForIdle(); + client->WaitForIdle(); WAIT_FOR(1000, 1000, (get_flow_proto()->FlowCount() == 0)); } @@ -243,11 +243,11 @@ TEST_F(FipEcmpTest, Test_2) { CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().rpf_nh.get() == EcmpData::GetLocalNextHop(rt)); - rt = static_cast( + rt = static_cast( RouteGet(VRF2, Ip4Address::from_string("0.0.0.0"), 0)); FlowEntry *rev_entry = entry->reverse_flow_entry(); - EXPECT_TRUE(rev_entry->data().component_nh_idx == + EXPECT_TRUE(rev_entry->data().component_nh_idx == CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(rev_entry->data().rpf_nh.get() == rt->GetActiveNextHop()); @@ -272,13 +272,13 @@ TEST_F(FipEcmpTest, Test_3) { InetUnicastRouteEntry *rt = static_cast( RouteGet("vrf1", Ip4Address::from_string("1.1.1.1"), 32)); - + EXPECT_TRUE(entry != NULL); EXPECT_TRUE(entry->data().component_nh_idx != CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().rpf_nh.get() == EcmpData::GetLocalNextHop(rt)); - rt = static_cast( + rt = static_cast( RouteGet(VRF2, Ip4Address::from_string("0.0.0.0"), 0)); //Reverse flow is no ECMP FlowEntry *rev_entry = entry->reverse_flow_entry(); @@ -288,7 +288,7 @@ TEST_F(FipEcmpTest, Test_3) { DeleteRoute(VRF2, "0.0.0.0", 32, bgp_peer); DeleteLocalEcmpFip(); - client->WaitForIdle(); + client->WaitForIdle(); WAIT_FOR(1000, 1000, (get_flow_proto()->FlowCount() == 0)); } @@ -315,7 +315,7 @@ TEST_F(FipEcmpTest, Test_4) { CompositeNH::kInvalidComponentNHIdx); EXPECT_TRUE(entry->data().rpf_nh.get() == EcmpData::GetLocalNextHop(rt)); - rt = static_cast( + rt = static_cast( RouteGet(VRF2, Ip4Address::from_string("0.0.0.0"), 0)); FlowEntry *rev_entry = entry->reverse_flow_entry(); diff --git a/src/vnsw/agent/pkt/test/test_flow_add.cc b/src/vnsw/agent/pkt/test/test_flow_add.cc index 19adc60f850..c26e8548182 100644 --- a/src/vnsw/agent/pkt/test/test_flow_add.cc +++ b/src/vnsw/agent/pkt/test/test_flow_add.cc @@ -106,7 +106,7 @@ TEST_F(FlowTest, FlowAdd_2) { { TestFlowPkt(Address::INET, remote_vm1_ip, vm1_ip, 1, 0, 0, "vrf5", remote_router_ip, flow0->label()), - { + { new VerifyVn("vn5", "vn5"), new VerifyVrf("vrf5", "vrf5") } @@ -237,7 +237,7 @@ TEST_F(FlowTest, FlowAdd_4) { { TestFlowPkt(Address::INET, remote_vm4_ip, vm1_ip, 1, 0, 0, "vrf5", remote_router_ip, flow0->label()), - { + { new VerifyVn("vn3", "vn5"), } }, @@ -267,7 +267,7 @@ TEST_F(FlowTest, FlowAdd_4) { } }; - CreateFlow(flow, 4); + CreateFlow(flow, 4); client->WaitForIdle(); //Verify ingress and egress flow count of VN "vn5" uint32_t in_count, out_count; @@ -297,7 +297,7 @@ TEST_F(FlowTest, FlowAdd_5) { { TestFlowPkt(Address::INET, vm1_ip, vm2_ip, 1, 0, 0, "vrf5", flow0->id()), - { + { new VerifyVn("vn5", "vn5"), } } @@ -334,7 +334,7 @@ TEST_F(FlowTest, FlowAdd_6) { { TestFlowPkt(Address::INET, vm1_ip, vm2_ip, IPPROTO_TCP, 1000, 200, "vrf5", flow0->id()), - { + { new VerifyVn("vn5", "vn5"), } } @@ -344,7 +344,7 @@ TEST_F(FlowTest, FlowAdd_6) { { TestFlowPkt(Address::INET, vm2_ip, vm1_ip, IPPROTO_TCP, 200, 1000, "vrf5", flow1->id()), - { + { new VerifyVn("vn5", "vn5"), } } @@ -366,7 +366,7 @@ TEST_F(FlowTest, FlowAdd_6) { CreateFlow(rev_flow, 1); //Send request for reverse flow again CreateFlow(rev_flow, 1); - //Send request for forward flow again + //Send request for forward flow again EXPECT_EQ(2U, get_flow_proto()->FlowCount()); //Verify ingress and egress flow count for VN "vn5" does not change @@ -533,10 +533,10 @@ TEST_F(FlowTest, DISABLED_Flow_entry_reuse) { flow0->id(), 1002), {} } - }; + }; CreateFlow(flow, 1); EXPECT_TRUE(FlowTableWait(2)); - FlowEntry *fe = + FlowEntry *fe = FlowGet(VrfGet("vrf5")->vrf_id(), vm1_ip, remote_vm1_ip, 1, 0, 0, GetFlowKeyNH(input[0].intf_id)); EXPECT_TRUE(fe->flow_handle() == 1001); @@ -646,7 +646,7 @@ TEST_F(FlowTest, WaitForTraffic) { int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_age.cc b/src/vnsw/agent/pkt/test/test_flow_age.cc index c46c2f4a958..79bd23314b0 100644 --- a/src/vnsw/agent/pkt/test/test_flow_age.cc +++ b/src/vnsw/agent/pkt/test/test_flow_age.cc @@ -24,14 +24,14 @@ TEST_F(FlowTest, FlowAge_1) { { TestFlowPkt(Address::INET, vm1_ip, vm2_ip, 1, 0, 0, "vrf5", flow0->id(), 1), - { + { new VerifyVn("vn5", "vn5"), } }, { TestFlowPkt(Address::INET, vm2_ip, vm1_ip, 1, 0, 0, "vrf5", flow1->id(), 2), - { + { new VerifyVn("vn5", "vn5"), } } @@ -45,7 +45,7 @@ TEST_F(FlowTest, FlowAge_1) { // Sleep for age-time usleep(tmp_age_time + 10); - //Trigger flow-aging and make sure they are not removed because + //Trigger flow-aging and make sure they are not removed because //of difference in stats between oper flow and Kernel flow client->EnqueueFlowAge(); client->WaitForIdle(); @@ -111,7 +111,7 @@ TEST_F(FlowTest, FlowAge_3) { CreateFlow(flow, 4); EXPECT_EQ(8U, get_flow_proto()->FlowCount()); - // Flow entries are created with #pkts = 1. + // Flow entries are created with #pkts = 1. // Do first sleep for aging to work correctly below client->EnqueueFlowAge(); client->WaitForIdle(); @@ -194,7 +194,7 @@ TEST_F(FlowTest, Flow_introspect_delete_all) { int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_base.cc b/src/vnsw/agent/pkt/test/test_flow_base.cc index 6ab80009f99..7b1e68f3e0e 100644 --- a/src/vnsw/agent/pkt/test/test_flow_base.cc +++ b/src/vnsw/agent/pkt/test/test_flow_base.cc @@ -176,7 +176,7 @@ class FlowTest : public ::testing::Test { void DeleteRemoteRoute(const char *vrf, const char *ip, uint8_t plen) { Ip4Address addr = Ip4Address::from_string(ip); - agent()->fabric_inet4_unicast_table()->DeleteReq(peer_, + agent()->fabric_inet4_unicast_table()->DeleteReq(peer_, vrf, addr, plen, new ControllerVmRoute(static_cast(peer_))); client->WaitForIdle(); @@ -241,7 +241,7 @@ class FlowTest : public ::testing::Test { flow_info->Add(pkt, &in, &out); client->WaitForIdle(); } - + static int GetFlowPassCount(int total_flows, int age_time_usecs) { return 0; } diff --git a/src/vnsw/agent/pkt/test/test_flow_error.cc b/src/vnsw/agent/pkt/test/test_flow_error.cc index bb5f0257ea3..56399cd9cd0 100644 --- a/src/vnsw/agent/pkt/test/test_flow_error.cc +++ b/src/vnsw/agent/pkt/test/test_flow_error.cc @@ -202,9 +202,9 @@ TEST_F(FlowTest, Subnet_broadcast_Flow) { const FlowEntry *rev_fe = fe->reverse_flow_entry(); EXPECT_TRUE(fe->is_flags_set(FlowEntry::Multicast)); EXPECT_TRUE(rev_fe->is_flags_set(FlowEntry::Multicast)); - EXPECT_TRUE(fe->data().match_p.action_info.action == + EXPECT_TRUE(fe->data().match_p.action_info.action == (1 << TrafficAction::PASS)); - EXPECT_TRUE(rev_fe->data().match_p.action_info.action == + EXPECT_TRUE(rev_fe->data().match_p.action_info.action == (1 << TrafficAction::PASS)); //fe->data.match_p.flow_action.action @@ -305,7 +305,7 @@ TEST_F(FlowTest, Flow_Deleted_Interace_nh) { int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_mgr_instances.cc b/src/vnsw/agent/pkt/test/test_flow_mgr_instances.cc index c98e10e02f8..950b42512b8 100644 --- a/src/vnsw/agent/pkt/test/test_flow_mgr_instances.cc +++ b/src/vnsw/agent/pkt/test/test_flow_mgr_instances.cc @@ -51,7 +51,7 @@ bool FlowModuleDbEventCompleted(Agent *agent) { return true; } -//Test flow deletion on interface deletion and make sure +//Test flow deletion on interface deletion and make sure //interface DB Entry is not deleted while FlowMgr Instance has reference. TEST_F(FlowTest, FlowDeleteInterface) { KSyncSockTypeMap *sock = static_cast(KSyncSock::Get(0)); @@ -129,7 +129,7 @@ int main(int argc, char *argv[]) { // use config with large flow tokens to avoid task delays because of token // unavailability strcpy(init_file, "controller/src/vnsw/agent/pkt/test/flow-table-tokens.ini"); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_nat.cc b/src/vnsw/agent/pkt/test/test_flow_nat.cc index a94ad8ec4d6..2e0d2b7325b 100644 --- a/src/vnsw/agent/pkt/test/test_flow_nat.cc +++ b/src/vnsw/agent/pkt/test/test_flow_nat.cc @@ -23,7 +23,7 @@ TEST_F(FlowTest, Nat_FlowAge_1) { { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), - { + { new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } @@ -39,7 +39,7 @@ TEST_F(FlowTest, Nat_FlowAge_1) { client->WaitForIdle(); EXPECT_EQ(2U, get_flow_proto()->FlowCount()); - EXPECT_TRUE(FlowGet(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, 0, 0, + EXPECT_TRUE(FlowGet(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, 0, 0, false, -1, -1, GetFlowKeyNH(input[0].intf_id))); EXPECT_TRUE(FlowGet(VrfGet("default-project:vn4:vn4")->vrf_id(), vm5_ip, vm1_fip, 1, 0, 0, false, -1, -1, @@ -67,7 +67,7 @@ TEST_F(FlowTest, NonNatFlowAdd_1) { TestFlowPkt(Address::INET, vm2_ip, vm1_ip, 1, 0, 0, "vrf5", flow1->id()), {} - } + } }; CreateFlow(flow, 1); @@ -107,11 +107,11 @@ TEST_F(FlowTest, NonNatDupFlowAdd_1) { TestFlowPkt(Address::INET, vm2_ip, vm1_ip, 1, 0, 0, "vrf5", flow1->id()), {} - } + } }; // Add forward and reverse flow - CreateFlow(flow, 2); + CreateFlow(flow, 2); // Add duplicate forward and reverse flow CreateFlow(flow, 2); @@ -131,7 +131,7 @@ TEST_F(FlowTest, NonNatAddOldNat_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id()), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; @@ -148,9 +148,9 @@ TEST_F(FlowTest, NonNatAddOldNat_1) { CreateFlow(nat_flow, 1); //Disassociate fip - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); client->WaitForIdle(); - + // Add Non-NAT forward flow CreateFlow(non_nat_flow, 1); //Make sure NAT reverse flow is also deleted @@ -158,7 +158,7 @@ TEST_F(FlowTest, NonNatAddOldNat_1) { vm5_ip, vm1_fip, 1, 0, 0, GetFlowKeyNH(input[0].intf_id))); - DeleteFlow(non_nat_flow, 1); + DeleteFlow(non_nat_flow, 1); EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm5_ip, vm1_ip, 1, 0, 0, GetFlowKeyNH(input[0].intf_id))); @@ -171,18 +171,18 @@ TEST_F(FlowTest, NonNatAddOldNat_2) { #if 0 TestFlow nat_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id()), { - new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) + new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) } } }; TestFlow non_nat_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "vn4:vn4", - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "vn4:vn4", + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id()), { new VerifyVn(unknown_vn_, unknown_vn_) @@ -194,18 +194,18 @@ TEST_F(FlowTest, NonNatAddOldNat_2) { CreateFlow(nat_flow, 1); //Disassociate fip - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); client->WaitForIdle(); //Make sure NAT reverse flow is deleted - EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, + EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, 0, 0)); EXPECT_TRUE(FlowFail(VrfGet("default-project:vn4:vn4")->vrf_id(), vm5_ip, vm1_fip, 1, 0, 0)); // Add Non-NAT reverse flow CreateFlow(non_nat_flow, 1); - DeleteFlow(non_nat_flow, 1); - EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, + DeleteFlow(non_nat_flow, 1); + EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, 0, 0)); client->EnqueueFlowAge(); @@ -217,10 +217,10 @@ TEST_F(FlowTest, NonNatAddOldNat_2) { TEST_F(FlowTest, NonNatAddOldNat_3) { TestFlow nat_flow[] = { { - TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", + TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id()), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; @@ -239,7 +239,7 @@ TEST_F(FlowTest, NonNatAddOldNat_3) { CreateFlow(nat_flow, 1); //Disassociate fip - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); client->WaitForIdle(); client->EnqueueFlowAge(); client->WaitForIdle(); @@ -252,8 +252,8 @@ TEST_F(FlowTest, NonNatAddOldNat_3) { // Add Non-NAT forward flow CreateFlow(non_nat_flow, 1); - DeleteFlow(non_nat_flow, 1); - EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm5_ip, vm1_ip, 1, + DeleteFlow(non_nat_flow, 1); + EXPECT_TRUE(FlowFail(VrfGet("vrf5")->vrf_id(), vm5_ip, vm1_ip, 1, 0, 0, GetFlowKeyNH(input3[0].intf_id))); //Make sure NAT reverse flow is not present EXPECT_TRUE(FlowFail(VrfGet("default-project:vn4:vn4")->vrf_id(), @@ -271,7 +271,7 @@ TEST_F(FlowTest, NatFlowAdd_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; @@ -279,7 +279,7 @@ TEST_F(FlowTest, NatFlowAdd_1) { CreateFlow(nat_flow, 1); //Add duplicate flow CreateFlow(nat_flow, 1); - + //Send a reverse nat flow packet TestFlow nat_rev_flow[] = { { @@ -298,7 +298,7 @@ TEST_F(FlowTest, NatFlowAdd_1) { WAIT_FOR(1000, 1000, (FlowFail(VrfGet("default-project:vn4:vn4")->vrf_id(), vm5_ip, vm1_fip, 1, 0, 0, GetFlowKeyNH(input3[0].intf_id))));; - CreateFlow(nat_flow, 1); + CreateFlow(nat_flow, 1); DeleteFlow(nat_rev_flow, 1); client->WaitForIdle(); WAIT_FOR(1000, 1000, @@ -324,7 +324,7 @@ TEST_F(FlowTest, NatFlowAdd_2) { //Send a reverse nat flow packet TestFlow nat_rev_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id(), 2), { new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) @@ -343,7 +343,7 @@ TEST_F(FlowTest, NatFlowAdd_2) { TEST_F(FlowTest, NatAddOldNonNat_1) { //Disassociate fip - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); client->WaitForIdle(); TestFlow non_nat_flow[] = { @@ -351,7 +351,7 @@ TEST_F(FlowTest, NatAddOldNonNat_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyVn("vn5", unknown_vn_) + new VerifyVn("vn5", unknown_vn_) } } }; @@ -365,7 +365,7 @@ TEST_F(FlowTest, NatAddOldNonNat_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; @@ -390,7 +390,7 @@ TEST_F(FlowTest, NatAddOldNonNat_2) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyVn("vn5", unknown_vn_) + new VerifyVn("vn5", unknown_vn_) } } }; @@ -401,17 +401,17 @@ TEST_F(FlowTest, NatAddOldNonNat_2) { client->WaitForIdle(); TestFlow nat_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id(), 2), { - new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) + new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) } } }; CreateFlow(nat_flow, 1); DeleteFlow(nat_flow, 1); - EXPECT_TRUE(FlowGet(VrfGet("vrf5")->vrf_id(), vm1_ip, + EXPECT_TRUE(FlowGet(VrfGet("vrf5")->vrf_id(), vm1_ip, vm5_ip, 1, 0, 0, GetFlowKeyNH(input3[0].intf_id)) == NULL); client->EnqueueFlowAge(); @@ -425,15 +425,15 @@ TEST_F(FlowTest, NatAddOldNat_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; CreateFlow(nat_flow, 1); - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); - AddLink("virtual-machine-interface", "flow0", "floating-ip", "fip2"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + AddLink("virtual-machine-interface", "flow0", "floating-ip", "fip2"); client->WaitForIdle(); TestFlow new_nat_flow[] = { @@ -441,13 +441,13 @@ TEST_F(FlowTest, NatAddOldNat_1) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip2, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip2, 1, 0, 0) } } }; CreateFlow(new_nat_flow, 1); DeleteFlow(new_nat_flow, 1); - + client->EnqueueFlowAge(); client->WaitForIdle(); WAIT_FOR(1000, 1000, (get_flow_proto()->FlowCount() == 0U)); @@ -459,15 +459,15 @@ TEST_F(FlowTest, NatAddOldNat_2) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; CreateFlow(nat_flow, 1); - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); - AddLink("virtual-machine-interface", "flow1", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + AddLink("virtual-machine-interface", "flow1", "floating-ip", "fip1"); client->WaitForIdle(); TestFlow new_nat_flow[] = { @@ -493,20 +493,20 @@ TEST_F(FlowTest, NatAddOldNat_3) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; CreateFlow(nat_flow, 1); - DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); - AddLink("virtual-machine-interface", "flow1", "floating-ip", "fip1"); + DelLink("virtual-machine-interface", "flow0", "floating-ip", "fip1"); + AddLink("virtual-machine-interface", "flow1", "floating-ip", "fip1"); client->WaitForIdle(); TestFlow new_nat_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id(), 2), { new VerifyNat(vm2_ip, vm5_ip, 1, 0, 0) @@ -529,7 +529,7 @@ TEST_F(FlowTest, TwoNatFlow) { TestFlowPkt(Address::INET, vm1_ip, vm5_ip, 1, 0, 0, "vrf5", flow0->id(), 1), { - new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) + new VerifyNat(vm5_ip, vm1_fip, 1, 0, 0) } } }; @@ -537,7 +537,7 @@ TEST_F(FlowTest, TwoNatFlow) { CreateFlow(nat_flow, 1); TestFlow nat_rev_flow[] = { { - TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, + TestFlowPkt(Address::INET, vm5_ip, vm1_fip, 1, 0, 0, "default-project:vn4:vn4", flow4->id(), 2), { new VerifyNat(vm1_ip, vm5_ip, 1, 0, 0) @@ -546,14 +546,14 @@ TEST_F(FlowTest, TwoNatFlow) { }; CreateFlow(nat_rev_flow, 1); - DeleteFlow(nat_flow, 1); + DeleteFlow(nat_flow, 1); EXPECT_TRUE(FlowTableWait(0)); } int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_policy.cc b/src/vnsw/agent/pkt/test/test_flow_policy.cc index 6a3fb4872e6..3521330f6bd 100644 --- a/src/vnsw/agent/pkt/test/test_flow_policy.cc +++ b/src/vnsw/agent/pkt/test/test_flow_policy.cc @@ -939,7 +939,7 @@ TEST_F(FlowTest, FlowPolicyUuid_16) { return; } TestFlow flow[] = { - { TestFlowPkt(Address::INET, vm1_ip, "11.1.1.255", 1, 0, 0, "vrf5", + { TestFlowPkt(Address::INET, vm1_ip, "11.1.1.255", 1, 0, 0, "vrf5", flow0->id()), {} } @@ -1200,7 +1200,7 @@ TEST_F(FlowTest, FlowPolicyUuid_20) { AddSgEntry("sg_e", "sg_acl_e", 10, 6, "deny", EGRESS, "fe6a4dcb-dde4-48e6-8957-856a7aacb2d2", "0"); AddLink("virtual-machine-interface", "flow5", "security-group", "sg_e"); - + AddSgEntry("sg_i", "sg_acl_i", 13, 6, "pass", INGRESS, "fe6a4dcb-dde4-48e6-8957-856a7aacb2e3", "0"); AddLink("virtual-machine-interface", "flow5", "security-group", "sg_i"); @@ -1812,7 +1812,7 @@ TEST_F(FlowTest, FlowPolicyUuid_Subnet_8) { int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { eth_itf = Agent::GetInstance()->fabric_interface_name(); diff --git a/src/vnsw/agent/pkt/test/test_flow_qos.cc b/src/vnsw/agent/pkt/test/test_flow_qos.cc index 7dd63333c39..29a1eeef558 100644 --- a/src/vnsw/agent/pkt/test/test_flow_qos.cc +++ b/src/vnsw/agent/pkt/test/test_flow_qos.cc @@ -77,10 +77,10 @@ class FlowQosTest : public ::testing::Test { TEST_F(FlowQosTest, Test_1) { TestFlow flow[] = { //Send an ICMP flow from VM1 to VM2 - { + { TestFlowPkt(Address::INET, "1.1.1.1", "1.1.1.2", 1, 0, 0, "vrf1", intf1->id()), - { + { new VerifyVn("vn1", "vn1"), new VerifyQosAction("qos_config1", "qos_config1") } @@ -100,10 +100,10 @@ TEST_F(FlowQosTest, Test_2) { TestFlow flow[] = { //Send an ICMP flow from remote VM in vn3 to local VM in vn5 - { + { TestFlowPkt(Address::INET, "1.1.1.3", "1.1.1.1", 1, 0, 0, "vrf1", "10.1.1.1", intf1->label()), - { + { new VerifyVn("vn1", "vn1"), new VerifyQosAction("qos_config1", "qos_config1") } @@ -120,10 +120,10 @@ TEST_F(FlowQosTest, Test_2) { TEST_F(FlowQosTest, Test_3) { TestFlow tflow[] = { //Send an ICMP flow from VM1 to VM2 - { + { TestFlowPkt(Address::INET, "1.1.1.1", "1.1.1.2", 1, 0, 0, "vrf1", intf1->id()), - { + { new VerifyVn("vn1", "vn1"), new VerifyQosAction("qos_config1", "qos_config1") } @@ -147,10 +147,10 @@ TEST_F(FlowQosTest, Test_3) { TEST_F(FlowQosTest, Test_4) { TestFlow tflow[] = { //Send an ICMP flow from VM1 to VM2 - { + { TestFlowPkt(Address::INET, "1.1.1.1", "1.1.1.2", 1, 0, 0, "vrf1", intf1->id()), - { + { new VerifyVn("vn1", "vn1"), new VerifyQosAction("qos_config1", "qos_config1") } @@ -161,7 +161,7 @@ TEST_F(FlowQosTest, Test_4) { DelLink("virtual-network", "vn1", "access-control-list", "acl1"); client->WaitForIdle(); - FlowEntry *flow = FlowGet(0, "1.1.1.1", "1.1.1.2", 1, 0, 0, + FlowEntry *flow = FlowGet(0, "1.1.1.1", "1.1.1.2", 1, 0, 0, intf1->flow_key_nh()->id()); EXPECT_TRUE(flow->data().qos_config_idx == AgentQosConfigTable::kInvalidIndex); EXPECT_TRUE(flow->data().qos_config_idx == AgentQosConfigTable::kInvalidIndex); diff --git a/src/vnsw/agent/pkt/test/test_flow_scale.cc b/src/vnsw/agent/pkt/test/test_flow_scale.cc index 57e00eae752..1c54463e59b 100644 --- a/src/vnsw/agent/pkt/test/test_flow_scale.cc +++ b/src/vnsw/agent/pkt/test/test_flow_scale.cc @@ -28,7 +28,7 @@ class FlowTest : public ::testing::Test { strcpy(vnet_addr, vnet->primary_ip_addr().to_string().c_str()); boost::system::error_code ec; - Inet4TunnelRouteAdd(NULL, "vrf1", + Inet4TunnelRouteAdd(NULL, "vrf1", Ip4Address::from_string("5.0.0.0", ec), 8, Ip4Address::from_string("1.1.1.2", ec), TunnelType::AllType(), 16, "TestVn", @@ -41,7 +41,7 @@ class FlowTest : public ::testing::Test { virtual void TearDown() { int count = flow_proto_->FlowCount(); - + client->EnqueueFlowFlush(); WAIT_FOR(count, 10000, (0 == flow_proto_->FlowCount())); int a = count / 500; diff --git a/src/vnsw/agent/pkt/test/test_flow_table.cc b/src/vnsw/agent/pkt/test/test_flow_table.cc index 5a349f1c7be..b3399c3fe7c 100644 --- a/src/vnsw/agent/pkt/test/test_flow_table.cc +++ b/src/vnsw/agent/pkt/test/test_flow_table.cc @@ -258,7 +258,7 @@ TEST_F(TestFlowTable, EvictPktTrapBeforeReverseFlowResp) { remote_vm1_ip, vm1_ip, 1000, 200, 1, 1); FlowEntry *flow = NULL; - + WAIT_FOR(1000, 1000, ((flow = FlowGet(remote_vm1_ip, vm1_ip, IPPROTO_TCP, 1000, 200, vif0->flow_key_nh()->id(), 1)) != NULL)); FlowEntry *rflow = flow->reverse_flow_entry(); diff --git a/src/vnsw/agent/pkt/test/test_flow_update.cc b/src/vnsw/agent/pkt/test/test_flow_update.cc index c61ee97fb39..359654b4ff9 100644 --- a/src/vnsw/agent/pkt/test/test_flow_update.cc +++ b/src/vnsw/agent/pkt/test/test_flow_update.cc @@ -70,7 +70,7 @@ class FlowUpdateTest : public FlowTest { DeleteFlowEventQueue *delete_queue_; }; -// Validate SG rule. This is basic test to ensure SG and and ACL rules +// Validate SG rule. This is basic test to ensure SG and and ACL rules // Subsequent tests are based on this TEST_F(FlowUpdateTest, sg_basic_1) { AclDBEntry *acl = AclGet(10); @@ -320,14 +320,14 @@ TEST_F(FlowTest, Flow_with_encap_change) { TestFlowPkt(Address::INET, remote_vm1_ip, vm1_ip, 1, 0, 0, "vrf5", remote_router_ip, flow0->label()), {} - } + } }; CreateFlow(flow, 1); // Add reverse flow CreateFlow(flow + 1, 1); - FlowEntry *fe = + FlowEntry *fe = FlowGet(VrfGet("vrf5")->vrf_id(), remote_vm1_ip, vm1_ip, 1, 0, 0, GetFlowKeyNH(input[0].intf_id)); const NextHop *nh = fe->data().rpf_nh.get(); @@ -434,7 +434,7 @@ TEST_F(FlowTest, Layer2PrefixManipulation) { int main(int argc, char *argv[]) { GETUSERARGS(); - client = + client = TestInit(init_file, ksync_init, true, true, true, (1000000 * 60 * 10), (3 * 60 * 1000)); if (vm.count("config")) { diff --git a/src/vnsw/agent/pkt/test/test_flow_util.h b/src/vnsw/agent/pkt/test/test_flow_util.h index 80106c0171a..9f9ed6c9a11 100644 --- a/src/vnsw/agent/pkt/test/test_flow_util.h +++ b/src/vnsw/agent/pkt/test/test_flow_util.h @@ -15,7 +15,7 @@ class TestFlowPkt { family_(family), sip_(sip), dip_(dip), proto_(proto), sport_(sport), dport_(dport), ifindex_(ifindex), mpls_(0), hash_(0), allow_wait_for_idle_(true) { - vrf_ = + vrf_ = Agent::GetInstance()->vrf_table()->FindVrfFromName(vrf)->vrf_id(); if (ifindex_) { nh_id_ = @@ -34,7 +34,7 @@ class TestFlowPkt { family_(family), sip_(sip), dip_(dip), proto_(proto),sport_(sport), dport_(dport), ifindex_(ifindex), mpls_(0), hash_(hash), allow_wait_for_idle_(true) { - vrf_ = + vrf_ = Agent::GetInstance()->vrf_table()->FindVrfFromName(vrf)->vrf_id(); if (ifindex_) { nh_id_ = @@ -53,7 +53,7 @@ class TestFlowPkt { family_(family), sip_(sip), dip_(dip), proto_(proto), sport_(sport), dport_(dport), ifindex_(0), mpls_(mpls), outer_sip_(osip), hash_(0), allow_wait_for_idle_(true) { - vrf_ = + vrf_ = Agent::GetInstance()->vrf_table()->FindVrfFromName(vrf)->vrf_id(); if (ifindex_) { nh_id_ = @@ -72,7 +72,7 @@ class TestFlowPkt { family_(family), sip_(sip), dip_(dip), proto_(proto), sport_(sport), dport_(dport), ifindex_(0), mpls_(mpls), hash_(hash), allow_wait_for_idle_(true) { - vrf_ = + vrf_ = Agent::GetInstance()->vrf_table()->FindVrfFromName(vrf)->vrf_id(); if (ifindex_) { nh_id_ = @@ -135,7 +135,7 @@ class TestFlowPkt { std::string self_server = Agent::GetInstance()->router_id().to_string(); //Populate ethernet interface id - uint32_t eth_intf_id = + uint32_t eth_intf_id = EthInterfaceGet(Agent::GetInstance()-> fabric_interface_name().c_str())->id(); switch(proto_) { @@ -145,7 +145,7 @@ class TestFlowPkt { self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), sport_, dport_, false, hash_); } else { - TxTcp6MplsPacket(eth_intf_id, outer_sip_.c_str(), + TxTcp6MplsPacket(eth_intf_id, outer_sip_.c_str(), self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), sport_, dport_, false, hash_); } @@ -154,11 +154,11 @@ class TestFlowPkt { case IPPROTO_UDP: if (family_ == Address::INET) { TxUdpMplsPacket(eth_intf_id, outer_sip_.c_str(), - self_server.c_str(), mpls_, sip_.c_str(), + self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), sport_, dport_, hash_); } else { - TxUdp6MplsPacket(eth_intf_id, outer_sip_.c_str(), - self_server.c_str(), mpls_, sip_.c_str(), + TxUdp6MplsPacket(eth_intf_id, outer_sip_.c_str(), + self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), sport_, dport_, hash_); } break; @@ -166,11 +166,11 @@ class TestFlowPkt { default: if (family_ == Address::INET) { TxIpMplsPacket(eth_intf_id, outer_sip_.c_str(), - self_server.c_str(), mpls_, sip_.c_str(), + self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), proto_, hash_); } else { TxIp6MplsPacket(eth_intf_id, outer_sip_.c_str(), - self_server.c_str(), mpls_, sip_.c_str(), + self_server.c_str(), mpls_, sip_.c_str(), dip_.c_str(), proto_, hash_); } break; @@ -200,7 +200,7 @@ class TestFlowPkt { WAIT_FOR(1000, 3000, FlowStatus(true)); - //Get flow + //Get flow FlowEntry * fe = FlowFetch(); EXPECT_TRUE(fe != NULL); return fe; @@ -263,7 +263,7 @@ class TestFlowPkt { uint32_t ifindex_; uint32_t mpls_; std::string outer_sip_; - uint32_t hash_; + uint32_t hash_; bool allow_wait_for_idle_; uint32_t nh_id_; }; @@ -396,11 +396,11 @@ class VerifyVrf : public FlowVerify { virtual ~VerifyVrf() {}; void Verify(FlowEntry *fe) { - const VrfEntry *src_vrf = + const VrfEntry *src_vrf = Agent::GetInstance()->vrf_table()->FindVrfFromName(src_vrf_); EXPECT_TRUE(src_vrf != NULL); - const VrfEntry *dest_vrf = + const VrfEntry *dest_vrf = Agent::GetInstance()->vrf_table()->FindVrfFromName(dest_vrf_); EXPECT_TRUE(dest_vrf != NULL); diff --git a/src/vnsw/agent/pkt/test/test_flow_vhost.cc b/src/vnsw/agent/pkt/test/test_flow_vhost.cc index d93f1868ee8..7eeb02b53dc 100644 --- a/src/vnsw/agent/pkt/test/test_flow_vhost.cc +++ b/src/vnsw/agent/pkt/test/test_flow_vhost.cc @@ -56,7 +56,7 @@ class VhostVmi : public ::testing::Test { str << "" << "vhost0" << ""; AddNode("virtual-machine-interface", "vhost0", 10, str.str().c_str()); - AddLink("virtual-machine-interface", "vhost0", + AddLink("virtual-machine-interface", "vhost0", "virtual-network", DEFAULT_VN); AddAcl("Acl", 1, DEFAULT_VN, "vn1", "pass"); AddLink("virtual-network", DEFAULT_VN, "access-control-list", "Acl"); @@ -90,7 +90,7 @@ class VhostVmi : public ::testing::Test { TEST_F(VhostVmi, VhostToRemoteVhost) { //Add a route to destination Vhost - AddArp("10.1.1.10", "00:00:01:01:01:01", + AddArp("10.1.1.10", "00:00:01:01:01:01", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -106,7 +106,7 @@ TEST_F(VhostVmi, VhostToRemoteVhost) { TEST_F(VhostVmi, RemoteVhostToVhost) { //Add a route to destination Vhost - AddArp("10.1.1.10", "00:00:01:01:01:01", + AddArp("10.1.1.10", "00:00:01:01:01:01", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -169,8 +169,8 @@ TEST_F(VhostVmi, RemoteVhostToVhostWithDenyAcl) { FlowEntry *fe = FlowGet(0, "10.1.1.10", "10.1.1.1", 6, 10000, 20, vnet0_->flow_key_nh()->id()); - WAIT_FOR(1000, 10000, - fe->match_p().action_info.action == + WAIT_FOR(1000, 10000, + fe->match_p().action_info.action == (1 << TrafficAction::IMPLICIT_DENY | 1 << TrafficAction::DENY)); DeleteRoute(DEFAULT_POLICY_VRF, "10.1.1.10", 32, peer); @@ -229,14 +229,14 @@ TEST_F(VhostVmi, VmiToLocalVhost) { client->WaitForIdle(); Ip4Address sip = Ip4Address::from_string("10.1.1.1"); - VmInterfaceKey vmi_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), "vhost0"); + VmInterfaceKey vmi_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), "vhost0"); - InetUnicastAgentRouteTable *table = - static_cast( - agent_->fabric_vrf()->GetInet4UnicastRouteTable()); - table->AddVHostRecvRoute(peer, "vrf1", vmi_key, sip, - 32, agent_->fabric_vn_name(), - false); + InetUnicastAgentRouteTable *table = + static_cast( + agent_->fabric_vrf()->GetInet4UnicastRouteTable()); + table->AddVHostRecvRoute(peer, "vrf1", vmi_key, sip, + 32, agent_->fabric_vn_name(), + false); client->WaitForIdle(); const Interface *vm_intf = VmPortGet(1); @@ -256,8 +256,8 @@ TEST_F(VhostVmi, VmiToLocalVhost) { //Packet VRF doesnt change hence VRF change also doenst happen //EXPECT_TRUE(fe->data().dest_vrf == vm_intf->vrf()->vrf_id()); - DeleteRoute("vrf1", "10.1.1.1", 32, peer); - client->WaitForIdle(); + DeleteRoute("vrf1", "10.1.1.1", 32, peer); + client->WaitForIdle(); } #endif diff --git a/src/vnsw/agent/pkt/test/test_flowtable.cc b/src/vnsw/agent/pkt/test/test_flowtable.cc index 406b1f5a6bc..d03f618c9f8 100644 --- a/src/vnsw/agent/pkt/test/test_flowtable.cc +++ b/src/vnsw/agent/pkt/test/test_flowtable.cc @@ -136,7 +136,7 @@ class FlowTableTest : public ::testing::Test { EXPECT_TRUE(RouteFind(vrf, addr, 32)); } - void CreateRemoteRoute(const char *vrf, const char *remote_vm, + void CreateRemoteRoute(const char *vrf, const char *remote_vm, const char *serv, int label, const char *vn) { Ip4Address addr = Ip4Address::from_string(remote_vm); Ip4Address gw = Ip4Address::from_string(serv); @@ -228,7 +228,7 @@ class FlowTableTest : public ::testing::Test { WAIT_FOR(1000, 100, (flow->match_p().m_out_acl_l.size() == 0U)); WAIT_FOR(1000, 100, (flow->match_p().sg_policy.m_out_acl_l.size() == 0U)); - if ((flow->match_p().m_out_acl_l.size() != 0) || + if ((flow->match_p().m_out_acl_l.size() != 0) || (flow->match_p().sg_policy.m_out_acl_l.size() != 0)) { ret = false; } @@ -354,7 +354,7 @@ class FlowTableTest : public ::testing::Test { EXPECT_FALSE(VmPortFind(tap2, 0)); EXPECT_FALSE(VmPortFind(tap3, 0)); - WAIT_FOR(1000, 100, + WAIT_FOR(1000, 100, (Agent::GetInstance()->interface_table()->Size() == 3)); WAIT_FOR(1000, 100, (PortSubscribeSize(Agent::GetInstance()) == 0)); WAIT_FOR(1000, 100, (Agent::GetInstance()->vm_table()->Size() == 0)); diff --git a/src/vnsw/agent/pkt/test/test_pkt.cc b/src/vnsw/agent/pkt/test/test_pkt.cc index 2e26e569325..2537c32c058 100644 --- a/src/vnsw/agent/pkt/test/test_pkt.cc +++ b/src/vnsw/agent/pkt/test/test_pkt.cc @@ -91,7 +91,7 @@ static void MakeIpPacket(PktGen *pkt, int ifindex, const char *sip, return; } -static void TxIpPacket(int ifindex, const char *sip, const char *dip, +static void TxIpPacket(int ifindex, const char *sip, const char *dip, int proto) { PktGen *pkt = new PktGen(); MakeIpPacket(pkt, ifindex, sip, dip, proto); @@ -103,8 +103,8 @@ static void TxIpPacket(int ifindex, const char *sip, const char *dip, } static void MakeMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, + const char *out_dip, uint32_t label, + const char *sip, const char *dip, int proto) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AgentHdr::TRAP_FLOW_MISS); @@ -116,8 +116,8 @@ static void MakeMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, } static void TxMplsPacket(int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, + const char *out_dip, uint32_t label, + const char *sip, const char *dip, int proto) { PktGen *pkt = new PktGen(); MakeMplsPacket(pkt, ifindex, out_sip, out_dip, label, sip, dip, proto); @@ -157,7 +157,7 @@ TEST_F(PktTest, FlowAdd_1) { Ip4Address(0), Interface::TRANSPORT_ETHERNET); client->WaitForIdle(); TxMplsPacket(2, "1.1.1.2", "10.1.1.1", 0, "2.2.2.2", "3.3.3.3", 1); - + TxMplsPacket(2, "1.1.1.3", "10.1.1.1", 0, "2.2.2.3", "3.3.3.4", 1); TxMplsPacket(2, "1.1.1.4", "10.1.1.1", 0, "2.2.2.4", "3.3.3.5", 1); TxMplsPacket(2, "1.1.1.5", "10.1.1.1", 0, "2.2.2.5", "3.3.3.6", 1); diff --git a/src/vnsw/agent/pkt/test/test_pkt_fip.cc b/src/vnsw/agent/pkt/test/test_pkt_fip.cc index e63fb47f6f2..371d00d2c17 100644 --- a/src/vnsw/agent/pkt/test/test_pkt_fip.cc +++ b/src/vnsw/agent/pkt/test/test_pkt_fip.cc @@ -46,11 +46,11 @@ class FlowTest : public ::testing::Test { } virtual void TearDown() { - DelIPAM(DEFAULT_VN); - DelVn(DEFAULT_VN); - DelLink("virtual-machine-interface", "vhost0", - "virtual-network", DEFAULT_VN); - client->WaitForIdle(); + DelIPAM(DEFAULT_VN); + DelVn(DEFAULT_VN); + DelLink("virtual-machine-interface", "vhost0", + "virtual-network", DEFAULT_VN); + client->WaitForIdle(); client->agent()->flow_stats_manager()->set_delete_short_flow(true); client->EnqueueFlowFlush(); @@ -487,7 +487,7 @@ void Teardown() { DelNode("routing-instance", "vrf1"); DelNode("access-control-list", "acl1"); client->WaitForIdle(); - + DeleteRoute("vrf1", "1.1.1.10", 32, bgp_peer_); client->WaitForIdle(); @@ -535,7 +535,7 @@ static bool NatValidateFlow(int flow_id, const char *vrf, const char *sip, TEST_F(FlowTest, Mdata_FabricToVm_1) { // Packet from fabric to VM using private addresses // No route for dst-ip. Pkt to be dropped - TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), "1.1.1.2", vnet[1]->mdata_ip_addr().to_string().c_str(), 1); client->WaitForIdle(); @@ -558,7 +558,7 @@ TEST_F(FlowTest, Mdata_FabricToServer_1) { // Packet from fabric to Server using MData service addresses SetupMetadataService(); client->WaitForIdle(); - TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), "1.1.1.10", "169.254.169.254", 1); client->WaitForIdle(); EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), "1.1.1.10", @@ -573,12 +573,12 @@ TEST_F(FlowTest, Mdata_FabricToServer_1) { "169.254.169.254", 1, 0, 0, vnet[1]->flow_key_nh()->id())); - TxTcpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxTcpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), "1.1.1.10", "169.254.169.254", 1001, 80, false); client->WaitForIdle(); EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), "1.1.1.10", - "169.254.169.254", IPPROTO_TCP, 1001, 80, false, + "169.254.169.254", IPPROTO_TCP, 1001, 80, false, "", "", 1, true, false, vnet[1]->flow_key_nh()->id())); EXPECT_TRUE(FlowDelete(vnet[1]->vrf()->GetName(), "1.1.1.10", @@ -649,7 +649,7 @@ TEST_F(FlowTest, ServerToVm_1) { // Packet with no route for IP-DA TxIpPacketUtil(vhost->id(), vhost_addr, "80.80.80.80", 1, 1); client->WaitForIdle(); - EXPECT_TRUE(FlowGet(forwarding_vrf->GetName(), vhost_addr, "80.80.80.80", + EXPECT_TRUE(FlowGet(forwarding_vrf->GetName(), vhost_addr, "80.80.80.80", 1, 0, 0, false, agent_->fabric_vn_name().c_str(), "__UNKNOWN__", 1, true, false, vhost->flow_key_nh()->id())); @@ -658,7 +658,7 @@ TEST_F(FlowTest, ServerToVm_1) { 1, 0, 0, vhost->flow_key_nh()->id())); client->WaitForIdle(); - EXPECT_TRUE(FlowFail(forwarding_vrf->GetName(), vhost_addr, "80.80.80.80", + EXPECT_TRUE(FlowFail(forwarding_vrf->GetName(), vhost_addr, "80.80.80.80", 1, 0, 0, vhost->flow_key_nh()->id())); // Ping from server to vnet1 @@ -777,7 +777,7 @@ TEST_F(FlowTest, VmToServer_1) { EXPECT_TRUE(NatValidateFlow(1, vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], "169.254.169.254", - IPPROTO_TCP, 10000, 80, 1, + IPPROTO_TCP, 10000, 80, 1, forwarding_vrf->GetName().c_str(), vnet[1]->mdata_ip_addr().to_string().c_str(), vhost_addr, 10000, MEDATA_NAT_DPORT, @@ -790,7 +790,7 @@ TEST_F(FlowTest, VmToServer_1) { TxUdpPacket(vnet[1]->id(), vnet_addr[1], "169.254.169.254", 10, 20, 1); client->WaitForIdle(); - EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), vnet_addr[1], + EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), vnet_addr[1], "169.254.169.254", IPPROTO_UDP, 10, 20, false, unknown_vn_.c_str(), unknown_vn_.c_str(), 1, false, false, vnet[1]->flow_key_nh()->id())); @@ -806,7 +806,7 @@ TEST_F(FlowTest, VmToServer_1) { TxTcpPacket(vnet[1]->id(), vnet_addr[1], "169.254.169.254", 10, 20, false); client->WaitForIdle(); - EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), vnet_addr[1], + EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName(), vnet_addr[1], "169.254.169.254", IPPROTO_TCP, 10, 20, false, unknown_vn_.c_str(), unknown_vn_.c_str(), 1, false, false, vnet[1]->flow_key_nh()->id())); @@ -974,7 +974,7 @@ TEST_F(FlowTest, LocalVmToFipVm_1) { TxTcpPacket(vnet[3]->id(), vnet_addr[3], "2.1.1.100", 1000, 80, false); EXPECT_TRUE(NatValidateFlow(1, vnet[3]->vrf()->GetName().c_str(), - vnet_addr[3], "2.1.1.100", IPPROTO_TCP, 1000, + vnet_addr[3], "2.1.1.100", IPPROTO_TCP, 1000, 80, 1, vnet[1]->vrf()->GetName().c_str(), vnet_addr[3], vnet_addr[1], 1000, 80, "default-project:vn2", "default-project:vn2", @@ -983,7 +983,7 @@ TEST_F(FlowTest, LocalVmToFipVm_1) { TxUdpPacket(vnet[3]->id(), vnet_addr[3], "2.1.1.100", 1000, 80); EXPECT_TRUE(NatValidateFlow(1, vnet[3]->vrf()->GetName().c_str(), - vnet_addr[3], "2.1.1.100", IPPROTO_UDP, 1000, + vnet_addr[3], "2.1.1.100", IPPROTO_UDP, 1000, 80, 1, vnet[1]->vrf()->GetName().c_str(), vnet_addr[3], vnet_addr[1], 1000, 80, "default-project:vn2", "default-project:vn2", @@ -993,7 +993,7 @@ TEST_F(FlowTest, LocalVmToFipVm_1) { // FloatingIP test for traffic from VM to local VM TEST_F(FlowTest, FipFabricToVm_1) { - TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxIpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), vnet_addr[3], "2.1.1.100", 1); EXPECT_TRUE(NatValidateFlow(1, vnet[1]->vrf()->GetName().c_str(), @@ -1004,7 +1004,7 @@ TEST_F(FlowTest, FipFabricToVm_1) { vnet[1]->flow_key_nh()->id(), vnet[1]->flow_key_nh()->id())); - TxTcpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxTcpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), vnet_addr[3], "2.1.1.100", 1000, 80, false); @@ -1016,7 +1016,7 @@ TEST_F(FlowTest, FipFabricToVm_1) { vnet[1]->flow_key_nh()->id(), vnet[1]->flow_key_nh()->id())); - TxUdpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, + TxUdpMplsPacket(eth->id(), "10.1.1.2", vhost_addr, vnet[1]->label(), vnet_addr[3], "2.1.1.100", 1000, 80); EXPECT_TRUE(NatValidateFlow(1, vnet[1]->vrf()->GetName().c_str(), @@ -1056,7 +1056,7 @@ TEST_F(FlowTest, FlowAging_1) { agent_->flow_stats_manager()-> default_flow_stats_collector_obj()->SetFlowAgeTime(10 * AGE_TIME); - + TxIpPacket(vnet[1]->id(), vnet_addr[1], vnet_addr[3], 1, 2); client->WaitForIdle(); TxTcpPacket(vnet[1]->id(), vnet_addr[1], vnet_addr[3], 10, 20, false, 5); @@ -1089,7 +1089,7 @@ TEST_F(FlowTest, FlowAging_1) { default_flow_stats_collector_obj()->SetFlowAgeTime(AGE_TIME); } -// Duplicate Nat-Flow test +// Duplicate Nat-Flow test TEST_F(FlowTest, DuplicateFlow_1) { TxIpPacket(vnet[1]->id(), vnet_addr[1], "2.1.1.10", 1); client->WaitForIdle(); @@ -1112,7 +1112,7 @@ TEST_F(FlowTest, Nat2NonNat) { client->WaitForIdle(); //Verify Nat Flow creation - if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, "default-project:vn2", "default-project:vn2", 1, vnet[3]->vrf()->GetName().c_str(), "2.1.1.100", vnet_addr[3], 0, 0, vnet[1]->flow_key_nh()->id(), @@ -1135,12 +1135,12 @@ TEST_F(FlowTest, Nat2NonNat) { client->WaitForIdle(); EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], - vnet_addr[3], 1, 0, 0, true, "vn1", + vnet_addr[3], 1, 0, 0, true, "vn1", unknown_vn_.c_str(), 1, false, false, vnet[1]->flow_key_nh()->id(), vnet[1]->flow_key_nh()->id())); //Delete the flow - if (FlowDelete(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowDelete(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, vnet[1]->flow_key_nh()->id()) == false) { client->WaitForIdle(); @@ -1149,7 +1149,7 @@ TEST_F(FlowTest, Nat2NonNat) { //Verify flow deletion client->WaitForIdle(); - if (FlowFail(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowFail(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, vnet[1]->flow_key_nh()->id()) == false) { EXPECT_STREQ("", "Error deleting forward flow"); @@ -1187,7 +1187,7 @@ TEST_F(FlowTest, NonNat2Nat) { TxIpPacket(vnet[1]->id(), vnet_addr[1], vnet_addr[3], 1); client->WaitForIdle(); - EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + EXPECT_TRUE(FlowGet(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, false, "vn1", "default-project:vn2", 1, true, false, vnet[1]->flow_key_nh()->id())); @@ -1236,10 +1236,10 @@ TEST_F(FlowTest, TwoFloatingIp) { client->WaitForIdle(); //Verify Nat Flow creation - if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, "default-project:vn2", "default-project:vn2", 1, - vnet[3]->vrf()->GetName().c_str(), + vnet[3]->vrf()->GetName().c_str(), "2.1.1.100", vnet_addr[3], 0, 0, vnet[1]->flow_key_nh()->id(), vnet[3]->flow_key_nh()->id()) == false) { EXPECT_STREQ("", "Error quering flow"); @@ -1259,10 +1259,10 @@ TEST_F(FlowTest, TwoFloatingIp) { EXPECT_EQ(3U, list2.list_.size()); //Verify that Nat-flow still exists - if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, "default-project:vn2", "default-project:vn2", 1, - vnet[3]->vrf()->GetName().c_str(), + vnet[3]->vrf()->GetName().c_str(), "2.1.1.100", vnet_addr[3], 0, 0, vnet[1]->flow_key_nh()->id(), vnet[3]->flow_key_nh()->id()) == false) { EXPECT_STREQ("", "Error quering flow"); @@ -1275,10 +1275,10 @@ TEST_F(FlowTest, TwoFloatingIp) { client->WaitForIdle(); //Verify that Nat-flow still exists - if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], + if (FlowGetNat(vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[3], 1, 0, 0, "default-project:vn2", "default-project:vn2", -1, - vnet[3]->vrf()->GetName().c_str(), + vnet[3]->vrf()->GetName().c_str(), "2.1.1.103", vnet_addr[3], 0, 0, vnet[1]->flow_key_nh()->id(), vnet[3]->flow_key_nh()->id()) == false) { @@ -1307,7 +1307,7 @@ TEST_F(FlowTest, FlowCleanup_on_intf_del_1) { SetupMetadataService(); client->WaitForIdle(); //Add a flow from vhost interface to VM metadata address - TxTcpPacket(vhost->id(), vhost_addr, + TxTcpPacket(vhost->id(), vhost_addr, vnet[7]->mdata_ip_addr().to_string().c_str(), 100, 100, false, 2); client->WaitForIdle(); EXPECT_TRUE(FlowGetNat(forwarding_vrf->GetName(), vhost_addr, @@ -1317,14 +1317,14 @@ TEST_F(FlowTest, FlowCleanup_on_intf_del_1) { "7.1.1.10", vnet_addr[7], 100, 100, vhost->flow_key_nh()->id(), vnet[7]->flow_key_nh()->id())); - TxTcpPacket(vnet[7]->id(), vnet_addr[7], + TxTcpPacket(vnet[7]->id(), vnet_addr[7], "169.254.169.254", 10, 80, false, 3); client->WaitForIdle(); EXPECT_TRUE(FlowGetNat(vnet[7]->vrf()->GetName(), vnet_addr[7], "169.254.169.254", 6, 10, 80, - "vn7", agent_->fabric_vn_name(), 3, + "vn7", agent_->fabric_vn_name(), 3, forwarding_vrf->GetName().c_str(), - vnet[7]->mdata_ip_addr().to_string().c_str(), vhost_addr, 10, + vnet[7]->mdata_ip_addr().to_string().c_str(), vhost_addr, 10, MEDATA_NAT_DPORT, vnet[7]->flow_key_nh()->id(), vhost->flow_key_nh()->id())); char mdata_ip[32]; @@ -1359,7 +1359,7 @@ TEST_F(FlowTest, FlowCleanup_on_intf_del_2) { char mdata_ip[32]; strcpy(mdata_ip, vnet[8]->mdata_ip_addr().to_string().c_str()); - TxTcpPacket(vhost->id(), vhost_addr, + TxTcpPacket(vhost->id(), vhost_addr, vnet[8]->mdata_ip_addr().to_string().c_str(), 100, 100, false, 2); client->WaitForIdle(); EXPECT_TRUE(FlowGetNat(forwarding_vrf->GetName(), vhost_addr, mdata_ip, @@ -1368,7 +1368,7 @@ TEST_F(FlowTest, FlowCleanup_on_intf_del_2) { vhost->flow_key_nh()->id(), vnet[8]->flow_key_nh()->id())); - TxTcpPacket(vnet[8]->id(), vnet_addr[8], + TxTcpPacket(vnet[8]->id(), vnet_addr[8], "169.254.169.254", 10, 80, false, 3); client->WaitForIdle(); EXPECT_TRUE(FlowGetNat("vrf8", vnet_addr[8], "169.254.169.254", 6, 10, 80, @@ -1393,7 +1393,7 @@ TEST_F(FlowTest, FlowCleanup_on_intf_del_2) { client->WaitForIdle(); } -//Ping from floating IP to local interface route, +//Ping from floating IP to local interface route, //which was leaked due to policy TEST_F(FlowTest, FIP_traffic_to_leaked_routes) { //Leak a route from default-project:vn3:vn3 to default-project:vn2:vn2 @@ -1401,7 +1401,7 @@ TEST_F(FlowTest, FIP_traffic_to_leaked_routes) { vn_list.insert(vnet[5]->vn()->GetName()); vnet_table[2]->AddLocalVmRouteReq(bgp_peer_, "default-project:vn2:vn2", vnet[5]->primary_ip_addr(), 32, - vnet[5]->GetUuid(), + vnet[5]->GetUuid(), vn_list, vnet[5]->label(), SecurityGroupList(), TagList(), CommunityList(), 0, @@ -1415,7 +1415,7 @@ TEST_F(FlowTest, FIP_traffic_to_leaked_routes) { client->WaitForIdle(); EXPECT_TRUE(NatValidateFlow(1, vnet[1]->vrf()->GetName().c_str(), vnet_addr[1], vnet_addr[5], IPPROTO_TCP, 10000, - 80, 1, vnet[5]->vrf()->GetName().c_str(), + 80, 1, vnet[5]->vrf()->GetName().c_str(), "2.1.1.100", vnet_addr[5], 10000, 80, "default-project:vn2", "default-project:vn3", diff --git a/src/vnsw/agent/pkt/test/test_pkt_flow_mock.cc b/src/vnsw/agent/pkt/test/test_pkt_flow_mock.cc index b7510cddd52..8fc31808150 100644 --- a/src/vnsw/agent/pkt/test/test_pkt_flow_mock.cc +++ b/src/vnsw/agent/pkt/test/test_pkt_flow_mock.cc @@ -24,7 +24,7 @@ class AclFlowTest : public ::testing::Test { }; static void TxIpPacket(int ifindex, const char *sip, const char *dip, - int proto, int hash_id) { + int proto, int hash_id) { PktGen *pkt = new PktGen(); pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AgentHdr::TRAP_FLOW_MISS, hash_id); @@ -57,25 +57,25 @@ void ProcessExceptionPackets() { int hash_id = 10; for (it = excep_p_l.begin(); it != excep_p_l.end(); ++it) { ExceptionPacket ep = *it; - Vn *vn = FindVn(ep.vn); - if (vn == NULL) { - LOG(ERROR, "Vn doesn't exist"); - return; - } - Vm *vm = FindVm(*vn, ep.vm); - if (vm == NULL) { - LOG(ERROR, "Vm:" << ep.vm << " doesn't exist in the Vn:" << vn->name); - return; - } - - VmInterface *intf = VmInterfaceGet(vm->pinfo.intf_id); - if (intf == NULL) { - LOG(ERROR, "Interface is not found"); - return; - } - LOG(DEBUG, "Interface ID:" << intf->id()); - TxIpPacket(intf->id(), ep.sip.c_str(), ep.dip.c_str(), - strtoul((ep.proto).c_str(), NULL, 0), hash_id); + Vn *vn = FindVn(ep.vn); + if (vn == NULL) { + LOG(ERROR, "Vn doesn't exist"); + return; + } + Vm *vm = FindVm(*vn, ep.vm); + if (vm == NULL) { + LOG(ERROR, "Vm:" << ep.vm << " doesn't exist in the Vn:" << vn->name); + return; + } + + VmInterface *intf = VmInterfaceGet(vm->pinfo.intf_id); + if (intf == NULL) { + LOG(ERROR, "Interface is not found"); + return; + } + LOG(DEBUG, "Interface ID:" << intf->id()); + TxIpPacket(intf->id(), ep.sip.c_str(), ep.dip.c_str(), + strtoul((ep.proto).c_str(), NULL, 0), hash_id); client->WaitForIdle(); AclTable *table = Agent::GetInstance()->acl_table(); KSyncSockTypeMap *sock = KSyncSockTypeMap::GetKSyncSockTypeMap(); @@ -108,7 +108,7 @@ void CreateNodeNetwork(Vn &vn, bool del_op) { std::vector::iterator iter; for (iter = vn.vm_l.begin(); iter != vn.vm_l.end(); - ++iter) { + ++iter) { Vm vm = *iter; if (del_op) { DelVm(vm.name.c_str()); @@ -123,7 +123,7 @@ void CreateNodeNetwork(Vn &vn, bool del_op) { return; } for (iter = vn.vm_l.begin(); iter != vn.vm_l.end(); - ++iter) { + ++iter) { Vm vm = *iter; EXPECT_TRUE(VmPortActive(&(vm.pinfo), 0)); EXPECT_TRUE(VmPortPolicyEnable(&(vm.pinfo), 0)); @@ -136,8 +136,8 @@ void CreateNodeNetworks(bool del_op) { std::vector::iterator iter; for (iter = vn_l.begin(); iter !=vn_l.end(); ++iter) { Vn vn = *iter; - CreateNodeNetwork(vn, del_op); - } + CreateNodeNetwork(vn, del_op); + } } void LoadAcl() { @@ -145,7 +145,7 @@ void LoadAcl() { xdoc.load_file("data.xml"); Agent::GetInstance()->ifmap_parser()->ConfigParse(xdoc.first_child(), 0); } - + TEST_F(AclFlowTest, Setup) { string str; if (setup_file[0] == '\0') { @@ -194,7 +194,7 @@ int main (int argc, char **argv) { LOG(DEBUG, "Config File:" << config_file); client = TestInit(config_file, false, true, false, true); - Agent::GetInstance()->set_router_id(Ip4Address::from_string("10.1.1.1")); + Agent::GetInstance()->set_router_id(Ip4Address::from_string("10.1.1.1")); ::testing::InitGoogleTest(&argc, argv); int ret = RUN_ALL_TESTS(); diff --git a/src/vnsw/agent/pkt/test/test_pkt_parse.cc b/src/vnsw/agent/pkt/test/test_pkt_parse.cc index 669b06d53da..9ab448d95ad 100644 --- a/src/vnsw/agent/pkt/test/test_pkt_parse.cc +++ b/src/vnsw/agent/pkt/test/test_pkt_parse.cc @@ -429,7 +429,7 @@ TEST_F(PktParseTest, IP_On_Vnet_1) { PktInfo pkt_info3(Agent::GetInstance(), 100, PktHandler::FLOW, 0); TestPkt(&pkt_info3, pkt.get()); client->WaitForIdle(); - EXPECT_TRUE(ValidateIpPktInfo(&pkt_info3, "1.1.1.1", "1.1.1.2", IPPROTO_TCP, + EXPECT_TRUE(ValidateIpPktInfo(&pkt_info3, "1.1.1.1", "1.1.1.2", IPPROTO_TCP, 1, 2)); pkt->Reset(); @@ -620,7 +620,7 @@ TEST_F(PktParseTest, GRE_On_Enet_1) { pkt->Reset(); MakeTcpMplsPacket(pkt.get(), eth->id(), "1.1.1.1", "10.1.1.1", - vnet1->label(), "10.10.10.10", "11.11.11.11", 1, 2, + vnet1->label(), "10.10.10.10", "11.11.11.11", 1, 2, false, 1); PktInfo pkt_info3(Agent::GetInstance(), 100, PktHandler::FLOW, 0); TestPkt(&pkt_info3, pkt.get()); @@ -656,7 +656,7 @@ TEST_F(PktParseTest, IPv6_GRE_On_Enet_1) { pkt->Reset(); MakeTcp6MplsPacket(pkt, eth->id(), "1.1.1.1", "10.1.1.1", - vnet1->label(), "10::10", "11::11", 1, 2, + vnet1->label(), "10::10", "11::11", 1, 2, false, 1); TestPkt(&pkt_info, pkt); client->WaitForIdle(); @@ -872,8 +872,8 @@ TEST_F(PktParseTest, MulticastControlWord) { EXPECT_TRUE(ValidateIpPktInfo(&pkt_info, "10.10.10.10", "10.10.10.11", 1, 0, 0)); - DeleteBgpPeer(bgp_peer_ptr); - client->WaitForIdle(); + DeleteBgpPeer(bgp_peer_ptr); + client->WaitForIdle(); client->WaitForIdle(); } diff --git a/src/vnsw/agent/pkt/test/test_pkt_util.cc b/src/vnsw/agent/pkt/test/test_pkt_util.cc index 0fc2310e362..fb2e8dcc18e 100644 --- a/src/vnsw/agent/pkt/test/test_pkt_util.cc +++ b/src/vnsw/agent/pkt/test/test_pkt_util.cc @@ -12,8 +12,8 @@ #include void MakeIpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, int proto, int hash_id, int cmd, int vrf, - bool fragment) { + const char *dip, int proto, int hash_id, int cmd, int vrf, + bool fragment) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, cmd, hash_id, vrf) ; pkt->AddEthHdr("00:00:5E:00:01:00", "00:00:00:00:00:01", 0x800); @@ -23,10 +23,10 @@ void MakeIpPacket(PktGen *pkt, int ifindex, const char *sip, } } -void TxIpPacket(int ifindex, const char *sip, const char *dip, - int proto, int hash_id, int vrf) { +void TxIpPacket(int ifindex, const char *sip, const char *dip, + int proto, int hash_id, int vrf) { PktGen *pkt = new PktGen(); - MakeIpPacket(pkt, ifindex, sip, dip, proto, hash_id, AgentHdr::TRAP_FLOW_MISS, + MakeIpPacket(pkt, ifindex, sip, dip, proto, hash_id, AgentHdr::TRAP_FLOW_MISS, vrf); uint8_t *ptr(new uint8_t[pkt->GetBuffLen()]); memcpy(ptr, pkt->GetBuff(), pkt->GetBuffLen()); @@ -37,7 +37,7 @@ void TxIpPacket(int ifindex, const char *sip, const char *dip, void TxL2Packet(int ifindex, const char *smac, const char *dmac, const char *sip, const char *dip, - int proto, int hash_id, int vrf, + int proto, int hash_id, int vrf, uint16_t sport, uint16_t dport) { PktGen *pkt = new PktGen(); @@ -60,8 +60,8 @@ void TxL2Packet(int ifindex, const char *smac, const char *dmac, } void MakeUdpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, uint16_t sport, uint16_t dport, - int hash_id, uint32_t vrf_id) { + const char *dip, uint16_t sport, uint16_t dport, + int hash_id, uint32_t vrf_id) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AgentHdr::TRAP_FLOW_MISS, hash_id, vrf_id); pkt->AddEthHdr("00:00:5E:00:01:00", "00:00:00:00:00:01", 0x800); @@ -69,8 +69,8 @@ void MakeUdpPacket(PktGen *pkt, int ifindex, const char *sip, pkt->AddUdpHdr(sport, dport, 64); } -void TxUdpPacket(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, int hash_id, uint32_t vrf_id) { +void TxUdpPacket(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, int hash_id, uint32_t vrf_id) { PktGen *pkt = new PktGen(); MakeUdpPacket(pkt, ifindex, sip, dip, sport, dport, hash_id, vrf_id); uint8_t *ptr(new uint8_t[pkt->GetBuffLen()]); @@ -91,8 +91,8 @@ void MakeSctpPacket(PktGen *pkt, int ifindex, const char *sip, } void MakeTcpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, uint16_t sport, uint16_t dport, bool ack, - int hash_id, uint32_t vrf_id, int ttl) { + const char *dip, uint16_t sport, uint16_t dport, bool ack, + int hash_id, uint32_t vrf_id, int ttl) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AgentHdr::TRAP_FLOW_MISS, hash_id, vrf_id); pkt->AddEthHdr("00:00:5E:00:01:00", "00:00:00:00:00:01", 0x800); @@ -101,8 +101,8 @@ void MakeTcpPacket(PktGen *pkt, int ifindex, const char *sip, } -void TxTcpPacket(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, bool ack, int hash_id, +void TxTcpPacket(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, bool ack, int hash_id, uint32_t vrf_id, int ttl) { PktGen *pkt = new PktGen(); MakeTcpPacket(pkt, ifindex, sip, dip, sport, dport, ack, hash_id, vrf_id, @@ -115,9 +115,9 @@ void TxTcpPacket(int ifindex, const char *sip, const char *dip, } void MakeIpMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint8_t proto, - int hash_id) { + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint8_t proto, + int hash_id) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AgentHdr::TRAP_FLOW_MISS, hash_id, MplsToVrfId(label), label); @@ -280,7 +280,7 @@ void MakeIp6Packet(PktGen *pkt, int ifindex, const char *sip, const char *dip, void TxIp6Packet(int ifindex, const char *sip, const char *dip, int proto, int hash_id, int vrf) { PktGen *pkt = new PktGen(); - MakeIp6Packet(pkt, ifindex, sip, dip, proto, hash_id, AGENT_TRAP_FLOW_MISS, + MakeIp6Packet(pkt, ifindex, sip, dip, proto, hash_id, AGENT_TRAP_FLOW_MISS, vrf); uint8_t *ptr(new uint8_t[pkt->GetBuffLen()]); memcpy(ptr, pkt->GetBuff(), pkt->GetBuffLen()); @@ -290,8 +290,8 @@ void TxIp6Packet(int ifindex, const char *sip, const char *dip, int proto, } void MakeUdp6Packet(PktGen *pkt, int ifindex, const char *sip, - const char *dip, uint16_t sport, uint16_t dport, - int hash_id, uint32_t vrf_id) { + const char *dip, uint16_t sport, uint16_t dport, + int hash_id, uint32_t vrf_id) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AGENT_TRAP_FLOW_MISS, hash_id, vrf_id); pkt->AddEthHdr("00:00:5E:00:01:00", "00:00:00:00:00:01", ETHERTYPE_IPV6); @@ -299,8 +299,8 @@ void MakeUdp6Packet(PktGen *pkt, int ifindex, const char *sip, pkt->AddUdpHdr(sport, dport, 64); } -void TxUdp6Packet(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, int hash_id, uint32_t vrf_id) { +void TxUdp6Packet(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, int hash_id, uint32_t vrf_id) { PktGen *pkt = new PktGen(); MakeUdp6Packet(pkt, ifindex, sip, dip, sport, dport, hash_id, vrf_id); uint8_t *ptr(new uint8_t[pkt->GetBuffLen()]); @@ -321,8 +321,8 @@ void MakeTcp6Packet(PktGen *pkt, int ifindex, const char *sip, } -void TxTcp6Packet(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, bool ack, int hash_id, +void TxTcp6Packet(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, bool ack, int hash_id, uint32_t vrf_id) { PktGen *pkt = new PktGen(); MakeTcp6Packet(pkt, ifindex, sip, dip, sport, dport, ack, hash_id, vrf_id); @@ -334,9 +334,9 @@ void TxTcp6Packet(int ifindex, const char *sip, const char *dip, } void MakeIp6MplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint8_t proto, - int hash_id) { + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint8_t proto, + int hash_id) { pkt->AddEthHdr("00:00:00:00:00:01", "00:00:00:00:00:02", 0x800); pkt->AddAgentHdr(ifindex, AGENT_TRAP_FLOW_MISS, hash_id, MplsToVrfId(label), label); @@ -425,7 +425,7 @@ void TxTcp6MplsPacket(int ifindex, const char *out_sip, void TxL2Ip6Packet(int ifindex, const char *smac, const char *dmac, const char *sip, const char *dip, - int proto, int hash_id, int vrf, + int proto, int hash_id, int vrf, uint16_t sport, uint16_t dport) { PktGen *pkt = new PktGen(); diff --git a/src/vnsw/agent/pkt/test/test_pkt_util.h b/src/vnsw/agent/pkt/test/test_pkt_util.h index a8509e0c5ab..1c45f229666 100644 --- a/src/vnsw/agent/pkt/test/test_pkt_util.h +++ b/src/vnsw/agent/pkt/test/test_pkt_util.h @@ -8,12 +8,12 @@ #include "test/pkt_gen.h" extern void MakeIpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, int proto, int hash_id, + const char *dip, int proto, int hash_id, int cmd = AgentHdr::TRAP_FLOW_MISS, int vrf = -1, bool fragment = false); extern void TxIpPacket(int ifindex, const char *sip, const char *dip, - int proto, int hash_id = 1, int vrf = -1); + int proto, int hash_id = 1, int vrf = -1); extern void TxL2Packet(int ifindex, const char *smac, const char *dmac, const char *sip, const char *dip, int proto, @@ -21,28 +21,28 @@ extern void TxL2Packet(int ifindex, const char *smac, const char *dmac, uint16_t dport = 0); extern void MakeUdpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, uint16_t sport, uint16_t dport, - int hash_id, uint32_t vrf_id); -extern void TxUdpPacket(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, int hash_id = 1, + const char *dip, uint16_t sport, uint16_t dport, + int hash_id, uint32_t vrf_id); +extern void TxUdpPacket(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, int hash_id = 1, uint32_t vrf_id = -1); extern void MakeTcpPacket(PktGen *pkt, int ifindex, const char *sip, - const char *dip, uint16_t sport, uint16_t dport, - bool ack, int hash_id, uint32_t vrf_id, int ttl = 0); + const char *dip, uint16_t sport, uint16_t dport, + bool ack, int hash_id, uint32_t vrf_id, int ttl = 0); extern void MakeSctpPacket(PktGen *pkt, int ifindex, const char *sip, const char *dip, uint16_t sport, uint16_t dport, int hash_id, uint32_t vrf_id); -extern void TxTcpPacket(int ifindex, const char *sip, const char *dip, - uint16_t sport, uint16_t dport, bool ack, int hash_id = 1, +extern void TxTcpPacket(int ifindex, const char *sip, const char *dip, + uint16_t sport, uint16_t dport, bool ack, int hash_id = 1, uint32_t vrf_id = -1, int ttl = 0); extern void MakeIpMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint8_t proto, - int hash_id); + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint8_t proto, + int hash_id); extern void TxIpMplsPacket(int ifindex, const char *out_sip, const char *out_dip, uint32_t label, const char *sip, const char *dip, uint8_t proto, @@ -53,17 +53,17 @@ extern void TxL2IpMplsPacket(int ifindex, const char *out_sip, const char *sip, const char *dip, uint8_t proto, int hash_id = 1); extern void MakeUdpMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint16_t sport, - uint16_t dport, int hash_id); + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint16_t sport, + uint16_t dport, int hash_id); extern void TxUdpMplsPacket(int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint16_t sport, - uint16_t dport, int hash_id = 1); + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint16_t sport, + uint16_t dport, int hash_id = 1); extern void MakeTcpMplsPacket(PktGen *pkt, int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, uint16_t sport, - uint16_t dport, bool ack, int hash_id, uint8_t gen_id = 0); + const char *out_dip, uint32_t label, + const char *sip, const char *dip, uint16_t sport, + uint16_t dport, bool ack, int hash_id, uint8_t gen_id = 0); extern void TxTcpMplsPacket(int ifindex, const char *out_sip, const char *out_dip, uint32_t label, const char *sip, const char *dip, uint16_t sport, diff --git a/src/vnsw/agent/pkt/test/test_port_allocator.cc b/src/vnsw/agent/pkt/test/test_port_allocator.cc index 144927165b1..aa73dde5dc1 100644 --- a/src/vnsw/agent/pkt/test/test_port_allocator.cc +++ b/src/vnsw/agent/pkt/test/test_port_allocator.cc @@ -99,8 +99,8 @@ TEST_F(PortAllocationTest, Test3) { EXPECT_TRUE(port != port2); port_table_->Free(key1, port, true); - port_table_->Free(key2, port, true); - port_table_->Free(key3, port2, true); + port_table_->Free(key2, port, true); + port_table_->Free(key3, port2, true); } TEST_F(PortAllocationTest, Range) { @@ -117,7 +117,7 @@ TEST_F(PortAllocationTest, Range) { uint16_t port = port_table_->Allocate(key1); EXPECT_TRUE(port == 50000 || port == 50001); - + port_table_->Free(key1, port, false); } @@ -203,15 +203,15 @@ TEST_F(PortAllocationTest, UdpFlow) { pm->UpdatePortConfig(IPPROTO_UDP, &pc); client->WaitForIdle(); - TxUdpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100); - client->WaitForIdle(); + TxUdpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100); + client->WaitForIdle(); - //No port config hence short flow - FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", - 17, 100, 100, GetFlowKeyNH(1)); - EXPECT_TRUE(flow != NULL); - EXPECT_TRUE(flow->IsShortFlow() == false); - EXPECT_TRUE(flow->IsNatFlow() == true); + //No port config hence short flow + FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", + 17, 100, 100, GetFlowKeyNH(1)); + EXPECT_TRUE(flow != NULL); + EXPECT_TRUE(flow->IsShortFlow() == false); + EXPECT_TRUE(flow->IsNatFlow() == true); } TEST_F(PortAllocationTest, ShortTcpFlow) { @@ -224,31 +224,31 @@ TEST_F(PortAllocationTest, ShortTcpFlow) { pm->UpdatePortConfig(IPPROTO_TCP, &pc); client->WaitForIdle(); - TxTcpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100, false); - client->WaitForIdle(); + TxTcpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100, false); + client->WaitForIdle(); - //No port config hence short flow - FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", - 6, 100, 100, GetFlowKeyNH(1)); - EXPECT_TRUE(flow != NULL); - EXPECT_TRUE(flow->IsShortFlow() == true); + //No port config hence short flow + FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", + 6, 100, 100, GetFlowKeyNH(1)); + EXPECT_TRUE(flow != NULL); + EXPECT_TRUE(flow->IsShortFlow() == true); } TEST_F(PortAllocationTest, TcpFlow) { PortTableManager *pm = agent_->pkt()->get_flow_proto()->port_table_manager(); PortConfig pc; pc.port_count = 10; - pm->UpdatePortConfig(IPPROTO_TCP, &pc); - client->WaitForIdle(); + pm->UpdatePortConfig(IPPROTO_TCP, &pc); + client->WaitForIdle(); - TxTcpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100, false); - client->WaitForIdle(); + TxTcpPacket(VmPortGetId(1), "1.1.1.10", "8.8.8.8", 100, 100, false); + client->WaitForIdle(); - //No port config hence short flow - FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", - 6, 100, 100, GetFlowKeyNH(1)); - EXPECT_TRUE(flow != NULL); - EXPECT_TRUE(flow->IsShortFlow() == false); + //No port config hence short flow + FlowEntry *flow = FlowGet(GetVrfId("vrf1"), "1.1.1.10", "8.8.8.8", + 6, 100, 100, GetFlowKeyNH(1)); + EXPECT_TRUE(flow != NULL); + EXPECT_TRUE(flow->IsShortFlow() == false); EXPECT_TRUE(flow->IsNatFlow() == true); } @@ -603,11 +603,11 @@ int main(int argc, char *argv[]) { TestInit(init_file, ksync_init, true, true, true); client->agent()->flow_stats_manager()->set_delete_short_flow(false); - + int ret = RUN_ALL_TESTS(); client->WaitForIdle(); - + TestShutdown(); delete client; return ret; diff --git a/src/vnsw/agent/pkt/test/test_sg_flow.cc b/src/vnsw/agent/pkt/test/test_sg_flow.cc index 2efc2768abd..174248fab29 100644 --- a/src/vnsw/agent/pkt/test/test_sg_flow.cc +++ b/src/vnsw/agent/pkt/test/test_sg_flow.cc @@ -220,7 +220,7 @@ static void AddAclEntry(const char *name, int id, int proto, } static void AddSgIdAcl(const char *name, int id, int proto, - int src_sg_id, int dest_sg_id, const char *action, + int src_sg_id, int dest_sg_id, const char *action, AclDirection direction) { char acl_name[1024]; uint16_t max_len = sizeof(acl_name) - 1; @@ -255,7 +255,7 @@ static void AddSgEntry(const char *sg_name, const char *name, int id, case EGRESS: AddAclEntry(name, id, proto, action, direction); strncat(acl_name, "egress-access-control-list", max_len); - AddLink("security-group", sg_name, "access-control-list", acl_name); + AddLink("security-group", sg_name, "access-control-list", acl_name); break; case BIDIRECTION: AddAclEntry(name, id, proto, action, EGRESS); @@ -271,7 +271,7 @@ static void AddSgEntry(const char *sg_name, const char *name, int id, } static void AddSgEntry(const char *sg_name, const char *name, int id, - int proto, const char *action, uint32_t sg_id, + int proto, const char *action, uint32_t sg_id, uint32_t dest_sg_id, AclDirection direction) { std::stringstream str; str << "" << sg_id << "" << endl; @@ -482,7 +482,7 @@ bool ValidateAction(uint32_t vrfid, char *sip, char *dip, int proto, int sport, } // Introspec checking -// Checks for the SG UUID and sg id, if sg_id is -1, then checks num entries +// Checks for the SG UUID and sg id, if sg_id is -1, then checks num entries bool sg_introspec_test = false; static void SgListResponse(Sandesh *sandesh, int id, int sg_id, int num_entries) { @@ -530,7 +530,7 @@ TEST_F(SgTest, Flow_Deny_1) { 6, 10, 20, vnet[1]->flow_key_nh()->id())); } -// Change ACL for forward flow +// Change ACL for forward flow TEST_F(SgTest, Fwd_Sg_Change_1) { TxIpPacket(vnet[1]->id(), vnet_addr[1], vnet_addr[2], 1); client->WaitForIdle(); @@ -808,7 +808,7 @@ TEST_F(SgTest, Sg_Introspec) { // Delete sg added for setup() DelLink("virtual-machine-interface", "vnet1", "security-group", "sg1"); - // Add a SG id acl to pass traffic between sg-id 1 and sg-id 2 + // Add a SG id acl to pass traffic between sg-id 1 and sg-id 2 // to vnet1 AddSgEntry("sg2", "ag2", 20, 1, "pass", 1, 2, BIDIRECTION); AddLink("virtual-machine-interface", "vnet1", "security-group", "sg2"); @@ -859,7 +859,7 @@ TEST_F(SgTest, Sg_Policy_1) { //Delete sg added for setup() DelLink("virtual-machine-interface", "vnet1", "security-group", "sg1"); - //Add a SG id acl to pass traffic between sg-id 1 and sg-id 2 + //Add a SG id acl to pass traffic between sg-id 1 and sg-id 2 //to vnet1 AddSgEntry("sg2", "ag2", 20, 1, "pass", 1, 2, BIDIRECTION); AddLink("virtual-machine-interface", "vnet1", "security-group", "sg2"); @@ -872,7 +872,7 @@ TEST_F(SgTest, Sg_Policy_1) { Ip4Address::from_string("10.10.10.0", ec), 24, Ip4Address::from_string("10.10.10.10", ec), - TunnelType::AllType(), + TunnelType::AllType(), 17, "vn1", sg_id_list, TagList(), PathPreference()); client->WaitForIdle(); diff --git a/src/vnsw/agent/pkt/test/test_sg_tcp_flow.cc b/src/vnsw/agent/pkt/test/test_sg_tcp_flow.cc index 588eb97da10..ca8388948d4 100644 --- a/src/vnsw/agent/pkt/test/test_sg_tcp_flow.cc +++ b/src/vnsw/agent/pkt/test/test_sg_tcp_flow.cc @@ -116,7 +116,7 @@ static char *AclName(const char *name, AclDirection direction) { } static void AddSgIdAcl(const char *name, int id, int proto, - int src_sg_id, int dest_sg_id, const char *action, + int src_sg_id, int dest_sg_id, const char *action, AclDirection direction) { std::string s = AddSgIdAclXmlString("access-control-list", AclName(name, direction), id, proto, @@ -134,7 +134,7 @@ static void DelAclEntry(const char *name, AclDirection direction) { } static void AddSgEntry(const char *sg_name, const char *name, int id, - int proto, const char *action, uint32_t sg_id, + int proto, const char *action, uint32_t sg_id, uint32_t src_sg_id, uint32_t dest_sg_id, AclDirection direction) { std::stringstream str; @@ -490,7 +490,7 @@ TEST_F(SgTcpAckTest, icmp_acl_2) { intf1->flow_key_nh()->id())); } -// Packet from fabric to VM. ACL : Ingress allow TCP +// Packet from fabric to VM. ACL : Ingress allow TCP TEST_F(SgTcpAckTest, ingress_tcp_acl_1) { // TCP Non-ACK from network to VM - PASS TxTcpMplsPacket(eth->id(), "10.1.1.10", vhost_addr, intf2->label(), @@ -563,7 +563,7 @@ TEST_F(SgTcpAckTest, ingress_tcp_acl_2) { EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), intf2_addr, "3.3.3.2", 6, 5, 6, TrafficAction::PASS, intf2->flow_key_nh()->id())); - EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", + EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", intf2_fip_addr, 6, 6, 5, TrafficAction::PASS, intf2->flow_key_nh()->id())); @@ -617,7 +617,7 @@ TEST_F(SgTcpAckTest, egress_tcp_acl_1) { intf2->flow_key_nh()->id())); } -// Packet from VM to fabric. ACL : Egress allow TCP +// Packet from VM to fabric. ACL : Egress allow TCP TEST_F(SgTcpAckTest, egress_tcp_acl_2) { DelLink("virtual-machine-interface", "vnet2", "security-group", "sg_tcp_i"); @@ -639,7 +639,7 @@ TEST_F(SgTcpAckTest, egress_tcp_acl_2) { EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), intf2_addr, "3.3.3.2", 6, 2, 3, TrafficAction::PASS, intf2->flow_key_nh()->id())); - EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", + EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", intf2_fip_addr, 6, 3, 2, TrafficAction::PASS, intf2->flow_key_nh()->id())); @@ -656,7 +656,7 @@ TEST_F(SgTcpAckTest, egress_tcp_acl_2) { EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), intf2_addr, "3.3.3.2", 6, 5, 6, TrafficAction::PASS, intf2->flow_key_nh()->id())); - EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", + EXPECT_TRUE(ValidateAction(intf2->vrf()->vrf_id(), "3.3.3.2", intf2_fip_addr, 6, 6, 5, TrafficAction::PASS, intf2->flow_key_nh()->id())); } @@ -858,8 +858,8 @@ TEST_F(SgTcpAckTest, fip_local_vm_egress_tcp_acl_1) { } // Local-VM Non-TCP-ACK Packet between VM1 and VM2. -// ACL : vnet1 - Ingress allow TCP -// : vnet2 - Engress allow TCP +// ACL : vnet1 - Ingress allow TCP +// : vnet2 - Engress allow TCP TEST_F(SgTcpAckTest, local_vm_ingress_egress_acl_1) { DelLink("virtual-machine-interface", "vnet1", "security-group", "sg_icmp_i"); @@ -889,8 +889,8 @@ TEST_F(SgTcpAckTest, local_vm_ingress_egress_acl_1) { } // Local-VM Non-TCP-ACK Packet between VM1 and VM2. -// ACL : vnet1 - Ingress allow TCP -// : vnet2 - Engress allow TCP +// ACL : vnet1 - Ingress allow TCP +// : vnet2 - Engress allow TCP TEST_F(SgTcpAckTest, fip_local_vm_ingress_egress_acl_1) { DelLink("virtual-machine-interface", "vnet2", "security-group", "sg_tcp_i"); @@ -924,8 +924,8 @@ TEST_F(SgTcpAckTest, fip_local_vm_ingress_egress_acl_1) { } // Local-VM TCP-ACK Packet between VM1 and VM2. -// ACL : vnet1 - Ingress allow TCP -// : vnet2 - Engress allow TCP +// ACL : vnet1 - Ingress allow TCP +// : vnet2 - Engress allow TCP TEST_F(SgTcpAckTest, local_vm_ingress_egress_acl_2) { DelLink("virtual-machine-interface", "vnet1", "security-group", "sg_icmp_i"); @@ -955,8 +955,8 @@ TEST_F(SgTcpAckTest, local_vm_ingress_egress_acl_2) { } // Local-VM TCP-ACK Packet between VM1 and VM2. -// ACL : vnet1 - Ingress allow TCP -// : vnet2 - Engress allow TCP +// ACL : vnet1 - Ingress allow TCP +// : vnet2 - Engress allow TCP TEST_F(SgTcpAckTest, fip_local_vm_ingress_egress_acl_2) { DelLink("virtual-machine-interface", "vnet2", "security-group", "sg_tcp_i"); diff --git a/src/vnsw/agent/pkt/test/test_vmi_underlay.cc b/src/vnsw/agent/pkt/test/test_vmi_underlay.cc index db6f8d0c737..fe6a0ef1d27 100644 --- a/src/vnsw/agent/pkt/test/test_vmi_underlay.cc +++ b/src/vnsw/agent/pkt/test/test_vmi_underlay.cc @@ -161,7 +161,7 @@ TEST_F(FlowTest, UnderlayFipToFip) { VrfEntry *vrf = VrfGet("default-project:vn4:vn4"); VrfEntry *vrf6 = VrfGet("vrf6"); - + VnListType vn_list; vn_list.insert("default-project:vn4"); diff --git a/src/vnsw/agent/pkt/test/test_vrf_assign_acl.cc b/src/vnsw/agent/pkt/test/test_vrf_assign_acl.cc index 3b355648fea..211824f12e8 100644 --- a/src/vnsw/agent/pkt/test/test_vrf_assign_acl.cc +++ b/src/vnsw/agent/pkt/test/test_vrf_assign_acl.cc @@ -188,7 +188,7 @@ TEST_F(TestVrfAssignAclFlow, VrfAssignAcl3) { client->agent()->flow_stats_manager()->set_delete_short_flow(true); } -//Add a VRF translate ACL to send all ssh traffic to "2.1.1.1" +//Add a VRF translate ACL to send all ssh traffic to "2.1.1.1" //via default-project:vn2 with ignore acl option set, add an ACL //to deny all traffic from default-project:vn1 to default-project:vn2 TEST_F(TestVrfAssignAclFlow, VrfAssignAcl4) { @@ -511,7 +511,7 @@ TEST_F(TestVrfAssignAclFlow, VrfAssignAclWithMirror2) { false, false, false); client->WaitForIdle(); - // pushing more DB Request so just before addin mirror entry + // pushing more DB Request so just before addin mirror entry // so its creation gets delayed for (int i =0; i<500; i++) { std::ostringstream stream; diff --git a/src/vnsw/agent/pkt/test/test_vrf_assign_acl_fip.cc b/src/vnsw/agent/pkt/test/test_vrf_assign_acl_fip.cc index f8e50276827..49f08e05a30 100644 --- a/src/vnsw/agent/pkt/test/test_vrf_assign_acl_fip.cc +++ b/src/vnsw/agent/pkt/test/test_vrf_assign_acl_fip.cc @@ -34,9 +34,9 @@ class TestVrfAssignAclFlowFip : public ::testing::Test { fip_dest_ip = Ip4Address::from_string("2.1.1.1"); remote_server = Ip4Address::from_string("10.10.10.10"); Ip4Address fip_src_ip = Ip4Address::from_string("2.1.1.100"); - + EXPECT_EQ(0U, flow_proto_->FlowCount()); - + CreateVmportFIpEnv(input, 1); CreateVmportFIpEnv(input1, 1); client->WaitForIdle(); @@ -48,7 +48,7 @@ class TestVrfAssignAclFlowFip : public ::testing::Test { EXPECT_TRUE(VmPortActive(1)); EXPECT_TRUE(VmPortActive(2)); client->WaitForIdle(); - + AddVrf("__internal__"); client->WaitForIdle(); @@ -57,7 +57,7 @@ class TestVrfAssignAclFlowFip : public ::testing::Test { VnListType vn_list; vn_list.insert("default-project:vn2"); agent_->fabric_inet4_unicast_table()->AddLocalVmRouteReq(vm_intf->peer(), - std::string("__internal__"), fip_src_ip, 32, vm_intf->GetUuid(), + std::string("__internal__"), fip_src_ip, 32, vm_intf->GetUuid(), vn_list, vm_intf->label(), SecurityGroupList(), TagList(), CommunityList(), false, PathPreference(), Ip4Address(0), EcmpLoadBalance(), @@ -79,7 +79,7 @@ class TestVrfAssignAclFlowFip : public ::testing::Test { AddLink("virtual-machine-interface", "intf1", "floating-ip", "fip1"); client->WaitForIdle(); - AddVrfAssignNetworkAcl("Acl", 10, "default-project:vn2", + AddVrfAssignNetworkAcl("Acl", 10, "default-project:vn2", "default-project:vn2", "pass", "__internal__"); AddLink("virtual-network", "default-project:vn2", "access-control-list", "Acl"); @@ -126,7 +126,7 @@ class TestVrfAssignAclFlowFip : public ::testing::Test { //Fwd flow from VM via floating-ip to external compute node destination TEST_F(TestVrfAssignAclFlowFip, VrfAssignAcl1) { TestFlow flow[] = { - { TestFlowPkt(Address::INET, "1.1.1.1", "2.1.1.1", IPPROTO_TCP, + { TestFlowPkt(Address::INET, "1.1.1.1", "2.1.1.1", IPPROTO_TCP, 10, 20, "default-project:vn1:vn1", VmPortGet(1)->id()), { new VerifyVn("default-project:vn2", "default-project:vn2"), @@ -167,7 +167,7 @@ TEST_F(TestVrfAssignAclFlowFip, VrfAssignAcl2) { CreateFlow(flow, 1); } -//Verify that interface VRF assign rule doesnt get +//Verify that interface VRF assign rule doesnt get //applied on floating-ip packets TEST_F(TestVrfAssignAclFlowFip, VrfAssignAcl3) { AddVrf("__invalid__"); diff --git a/src/vnsw/agent/pkt/test/test_xml_flow_agent_init.h b/src/vnsw/agent/pkt/test/test_xml_flow_agent_init.h index 5dc167df1fa..7223cedc4c5 100644 --- a/src/vnsw/agent/pkt/test/test_xml_flow_agent_init.h +++ b/src/vnsw/agent/pkt/test/test_xml_flow_agent_init.h @@ -16,7 +16,7 @@ class TestClient; TestClient *XmlPktParseTestInit(const char *init_file, bool ksync_init); -// The class to drive agent initialization. +// The class to drive agent initialization. // Defines control parameters used to enable/disable agent features class TestFlowXmlAgentInit : public TestAgentInit { public: diff --git a/src/vnsw/agent/port_ipc/port_ipc_handler.cc b/src/vnsw/agent/port_ipc/port_ipc_handler.cc index 91bab1f91f3..8147d1edc6a 100644 --- a/src/vnsw/agent/port_ipc/port_ipc_handler.cc +++ b/src/vnsw/agent/port_ipc/port_ipc_handler.cc @@ -158,7 +158,7 @@ void PortIpcHandler::ProcessFile(const string &file, bool check_port, tmp<ClearState(partition->parent(), vmi_config_listener_id_); delete state; return; - } + } // Allocate DBState if (state == NULL) { @@ -323,7 +323,7 @@ void PortSubscribeTable::Notify(DBTablePartBase *partition, DBEntryBase *e) { } boost::uuids::uuid u; - VirtualMachineInterface *cfg = + VirtualMachineInterface *cfg = static_cast (node->GetObject()); if (cfg != NULL) { autogen::IdPermsType id_perms = cfg->id_perms(); diff --git a/src/vnsw/agent/resource_manager/bgp_as_service_index.cc b/src/vnsw/agent/resource_manager/bgp_as_service_index.cc index d6f03c68aea..8fa6b8819d6 100644 --- a/src/vnsw/agent/resource_manager/bgp_as_service_index.cc +++ b/src/vnsw/agent/resource_manager/bgp_as_service_index.cc @@ -12,11 +12,11 @@ #include "bgp_as_service_index.h" #include "resource_manager/resource_manager_types.h" #include "resource_manager/resource_backup.h" - + BgpAsServiceIndexResourceKey::BgpAsServiceIndexResourceKey(ResourceManager *rm, const boost::uuids::uuid &uuid):IndexResourceKey(rm, Resource::BGP_AS_SERVICE_INDEX), uuid_(uuid) { - + } void BgpAsServiceIndexResourceKey::Backup(ResourceData *data, uint16_t op){ diff --git a/src/vnsw/agent/resource_manager/mirror_index.cc b/src/vnsw/agent/resource_manager/mirror_index.cc index d41a68bbb3a..d242b9fad9f 100644 --- a/src/vnsw/agent/resource_manager/mirror_index.cc +++ b/src/vnsw/agent/resource_manager/mirror_index.cc @@ -12,7 +12,7 @@ #include "mirror_index.h" #include "resource_manager/resource_manager_types.h" #include "resource_manager/resource_backup.h" - + MirrorIndexResourceKey::MirrorIndexResourceKey (ResourceManager *rm, const string& analyzer_name):IndexResourceKey(rm, Resource::MIRROR_INDEX), analyzer_name_(analyzer_name) { diff --git a/src/vnsw/agent/resource_manager/mirror_index.h b/src/vnsw/agent/resource_manager/mirror_index.h index 83b88f7269c..08d86716273 100644 --- a/src/vnsw/agent/resource_manager/mirror_index.h +++ b/src/vnsw/agent/resource_manager/mirror_index.h @@ -16,7 +16,7 @@ class ResourceKey; class MirrorIndexResourceKey : public IndexResourceKey { public: - MirrorIndexResourceKey(ResourceManager *rm, + MirrorIndexResourceKey(ResourceManager *rm, const string &analyzer_name); virtual ~MirrorIndexResourceKey() {}; virtual void Backup(ResourceData *data, uint16_t op); diff --git a/src/vnsw/agent/resource_manager/qos_index.cc b/src/vnsw/agent/resource_manager/qos_index.cc index bae475cb35a..d1781a5f2b4 100644 --- a/src/vnsw/agent/resource_manager/qos_index.cc +++ b/src/vnsw/agent/resource_manager/qos_index.cc @@ -16,7 +16,7 @@ QosIndexResourceKey::QosIndexResourceKey(ResourceManager *rm, const boost::uuids::uuid &uuid):IndexResourceKey(rm, Resource::QOS_INDEX), uuid_(uuid) { - + } void QosIndexResourceKey::Backup(ResourceData *data, uint16_t op){ diff --git a/src/vnsw/agent/resource_manager/resource_backup.h b/src/vnsw/agent/resource_manager/resource_backup.h index d2eae9a0d35..4bd44e2e839 100644 --- a/src/vnsw/agent/resource_manager/resource_backup.h +++ b/src/vnsw/agent/resource_manager/resource_backup.h @@ -54,7 +54,7 @@ class ResourceBackupManager { ResourceManager *resource_manager() {return resource_manager_;} bool WorkQueueBackUpProcess(ResourceBackupReqPtr backup_data); void BackupResource(ResourceManager::KeyPtr key, - ResourceManager::DataPtr data, + ResourceManager::DataPtr data, ResourceBackupReq::Op op); void AuditDone(); diff --git a/src/vnsw/agent/resource_manager/resource_manager.cc b/src/vnsw/agent/resource_manager/resource_manager.cc index 9fd4ac05ec1..3c2cb7af67c 100644 --- a/src/vnsw/agent/resource_manager/resource_manager.cc +++ b/src/vnsw/agent/resource_manager/resource_manager.cc @@ -98,7 +98,7 @@ ResourceManager::DataPtr ResourceManager::Allocate(KeyPtr key) { // Releases the resource table index and key. // Delete the data from file. void ResourceManager::Release(KeyPtr key) { - ResourceTable *resource_table = key.get()->resource_table(); + ResourceTable *resource_table = key.get()->resource_table(); ResourceManager::DataPtr data = resource_table->FindKeyPtr(key); if (data.get() == NULL) { return; diff --git a/src/vnsw/agent/resource_manager/test/test_resource_allocator.cc b/src/vnsw/agent/resource_manager/test/test_resource_allocator.cc index cbd101ed313..1cd0f2b7e23 100644 --- a/src/vnsw/agent/resource_manager/test/test_resource_allocator.cc +++ b/src/vnsw/agent/resource_manager/test/test_resource_allocator.cc @@ -56,9 +56,9 @@ class SandeshReadWriteUnitTest : public ::testing::Test { } // Restore the Data from file and delete it. void SandeshReadProcess() { - WAIT_FOR(200000, 1, BackUpResourceTable::FindFile("/tmp/backup", + WAIT_FOR(200000, 1, BackUpResourceTable::FindFile("/tmp/backup", "contrail_vrf_resource-").empty() != true); - agent->resource_manager()->backup_mgr()->Init(); + agent->resource_manager()->backup_mgr()->Init(); client->WaitForIdle(); NextHopKey *nh_key = new VrfNHKey("vrf1", false, false); ResourceManager::KeyPtr key @@ -126,7 +126,7 @@ TEST_F(SandeshReadWriteUnitTest, SandesMd5_verification) { "contrail_interface_resource-").empty() != true); std::string file_name = "/tmp/backup/" + BackUpResourceTable::FindFile("/tmp/backup", - "contrail_interface_resource-"); + "contrail_interface_resource-"); struct stat st; EXPECT_TRUE(stat(file_name.c_str(), &st) != -1); uint32_t size_with_port = (uint32_t)st.st_size; diff --git a/src/vnsw/agent/resource_manager/vm_interface_index.h b/src/vnsw/agent/resource_manager/vm_interface_index.h index fb92bd11a2c..e069bc5ecbc 100644 --- a/src/vnsw/agent/resource_manager/vm_interface_index.h +++ b/src/vnsw/agent/resource_manager/vm_interface_index.h @@ -17,8 +17,8 @@ class ResourceKey; // Vm interface backup. class VmInterfaceIndexResourceKey : public IndexResourceKey { public: - VmInterfaceIndexResourceKey(ResourceManager *rm, - const boost::uuids::uuid &uuid, + VmInterfaceIndexResourceKey(ResourceManager *rm, + const boost::uuids::uuid &uuid, const std::string &interface_name); virtual ~VmInterfaceIndexResourceKey() {}; virtual void Backup(ResourceData *data, uint16_t op); diff --git a/src/vnsw/agent/resource_manager/vrf_index.cc b/src/vnsw/agent/resource_manager/vrf_index.cc index 72b72dc135c..c0a9e3bd062 100644 --- a/src/vnsw/agent/resource_manager/vrf_index.cc +++ b/src/vnsw/agent/resource_manager/vrf_index.cc @@ -16,7 +16,7 @@ VrfIndexResourceKey::VrfIndexResourceKey (ResourceManager *rm, const string& vrf_name):IndexResourceKey(rm, Resource::VRF_INDEX), vrf_name_(vrf_name) { - + } void VrfIndexResourceKey::Backup(ResourceData *data, uint16_t op){ diff --git a/src/vnsw/agent/resource_manager/vrf_index.h b/src/vnsw/agent/resource_manager/vrf_index.h index 9641def49bc..f7d51cb8a45 100644 --- a/src/vnsw/agent/resource_manager/vrf_index.h +++ b/src/vnsw/agent/resource_manager/vrf_index.h @@ -17,7 +17,7 @@ class ResourceKey; class VrfIndexResourceKey : public IndexResourceKey { public: - VrfIndexResourceKey(ResourceManager *rm, + VrfIndexResourceKey(ResourceManager *rm, const string &vrf_name); virtual ~VrfIndexResourceKey() {}; virtual void Backup(ResourceData *data, uint16_t op); diff --git a/src/vnsw/agent/services/arp_entry.cc b/src/vnsw/agent/services/arp_entry.cc index 851efc1209d..978ff092387 100644 --- a/src/vnsw/agent/services/arp_entry.cc +++ b/src/vnsw/agent/services/arp_entry.cc @@ -96,7 +96,7 @@ bool ArpEntry::RetryExpiry() { SendArpRequest(); } else { Ip4Address ip(key_.ip); - ARP_TRACE(Trace, "Retry exceeded", ip.to_string(), + ARP_TRACE(Trace, "Retry exceeded", ip.to_string(), key_.vrf->GetName(), ""); arp_proto->IncrementStatsMaxRetries(); @@ -245,7 +245,7 @@ void ArpEntry::AddArpRoute(bool resolved) { } else { /* Return if the route is already existing */ InetUnicastRouteKey *rt_key = new InetUnicastRouteKey( - handler_->agent()->local_peer(), vrf_name, ip, 32); + handler_->agent()->local_peer(), vrf_name, ip, 32); AgentRoute *entry = key_.vrf->GetInet4UnicastRouteTable()-> FindActiveEntry(rt_key); delete rt_key; diff --git a/src/vnsw/agent/services/arp_handler.cc b/src/vnsw/agent/services/arp_handler.cc index 7c128870c7b..b8ad72710f0 100644 --- a/src/vnsw/agent/services/arp_handler.cc +++ b/src/vnsw/agent/services/arp_handler.cc @@ -70,7 +70,7 @@ bool ArpHandler::HandlePacket() { arp_tpa_ = tpa; else arp_tpa_ = spa; - + // if it is our own, ignore if (arp_tpa_ == agent()->router_id().to_ulong()) { arp_proto->IncrementStatsGratuitous(); @@ -119,7 +119,7 @@ bool ArpHandler::HandlePacket() { } //Look for subnet broadcast - AgentRoute *route = + AgentRoute *route = static_cast(vrf-> GetInet4UnicastRouteTable())->FindLPM(arp_addr); if (route) { @@ -190,7 +190,7 @@ bool ArpHandler::HandlePacket() { if(entry) { entry->HandleArpReply(MacAddress(arp_->arp_sha)); return true; - } else { + } else { entry = new ArpEntry(io_, this, key, nh_vrf, ArpEntry::INITING, itf); if (arp_proto->AddArpEntry(entry) == false) { diff --git a/src/vnsw/agent/services/arp_proto.cc b/src/vnsw/agent/services/arp_proto.cc index 377f0d682df..27c846b972a 100644 --- a/src/vnsw/agent/services/arp_proto.cc +++ b/src/vnsw/agent/services/arp_proto.cc @@ -361,7 +361,7 @@ void ArpDBState::Update(const AgentRoute *rt) { bool policy = ip_rt->GetActiveNextHop()->PolicyEnabled(); const SecurityGroupList sg = ip_rt->GetActivePath()->sg_list(); const TagList tag = ip_rt->GetActivePath()->tag_list(); - + if (policy_ != policy || sg != sg_list_ || tag != tag_list_ || vn_list_ != ip_rt->GetActivePath()->dest_vn_list()) { @@ -694,10 +694,10 @@ void ArpProto::NextHopNotify(DBEntryBase *entry) { ArpNH *arp_nh = (static_cast(nh)); if (arp_nh->IsDeleted()) { SendArpIpc(ArpProto::ARP_DELETE, arp_nh->GetIp()->to_ulong(), - arp_nh->GetVrf(), arp_nh->GetInterface()); + arp_nh->GetVrf(), arp_nh->GetInterface()); } else if (arp_nh->IsValid() == false && arp_nh->GetInterface()) { SendArpIpc(ArpProto::ARP_RESOLVE, arp_nh->GetIp()->to_ulong(), - arp_nh->GetVrf(), arp_nh->GetInterface()); + arp_nh->GetVrf(), arp_nh->GetInterface()); } break; } diff --git a/src/vnsw/agent/services/arp_proto.h b/src/vnsw/agent/services/arp_proto.h index b1ca91dc493..7fde73c5fb8 100644 --- a/src/vnsw/agent/services/arp_proto.h +++ b/src/vnsw/agent/services/arp_proto.h @@ -57,7 +57,7 @@ class ArpProto : public Proto { struct ArpStats { ArpStats() { Reset(); } void Reset() { - arp_req = arp_replies = arp_gratuitous = + arp_req = arp_replies = arp_gratuitous = resolved = max_retries_exceeded = errors = 0; arp_invalid_packets = arp_invalid_interface = arp_invalid_vrf = arp_invalid_address = vm_arp_req = vm_garp_req = 0; diff --git a/src/vnsw/agent/services/dhcp_handler.cc b/src/vnsw/agent/services/dhcp_handler.cc index 4cb4db3f52b..1772f22efb0 100644 --- a/src/vnsw/agent/services/dhcp_handler.cc +++ b/src/vnsw/agent/services/dhcp_handler.cc @@ -343,7 +343,7 @@ bool DhcpHandler::Run() { default: return HandleVmRequest(); } -} +} bool DhcpHandler::HandleVmRequest() { DhcpProto *dhcp_proto = agent()->GetDhcpProto(); @@ -429,7 +429,7 @@ bool DhcpHandler::HandleVmRequest() { case DHCP_DECLINE: dhcp_proto->IncrStatsDecline(); - DHCP_TRACE(Error, "DHCP Client declined the offer : vrf = " << + DHCP_TRACE(Error, "DHCP Client declined the offer : vrf = " << pkt_info_->vrf << " ifindex = " << GetInterfaceIndex() << " Mac : " << request_.mac_addr.ToString()); if (vm_itf_->vmi_type() == VmInterface::GATEWAY) { @@ -508,7 +508,7 @@ bool DhcpHandler::HandleDhcpFromFabric() { // read DHCP options in the incoming packet bool DhcpHandler::ReadOptions(int16_t opt_rem_len) { // verify magic cookie - if ((opt_rem_len < 4) || + if ((opt_rem_len < 4) || memcmp(dhcp_->options, DHCP_OPTIONS_COOKIE, 4)) { agent()->GetDhcpProto()->IncrStatsErrors(); DHCP_TRACE(Error, "DHCP options cookie missing; vrf = " << @@ -659,7 +659,7 @@ bool DhcpHandler::FindLeaseData() { if (!ipam[i].IsV4()) { continue; } - if (IsIp4SubnetMember(ip, ipam[i].ip_prefix.to_v4(), + if (IsIp4SubnetMember(ip, ipam[i].ip_prefix.to_v4(), ipam[i].plen)) { Ip4Address default_gw = ipam[i].default_gw.to_v4(); Ip4Address service_address = ipam[i].dns_server.to_v4(); @@ -972,7 +972,7 @@ uint16_t DhcpHandler::DhcpHdr(in_addr_t yiaddr, in_addr_t siaddr) { if (out_msg_type_ == DHCP_NAK) { option_->SetNextOptionPtr(opt_len); - option_->WriteData(DHCP_OPTION_MESSAGE, nak_msg_.size(), + option_->WriteData(DHCP_OPTION_MESSAGE, nak_msg_.size(), nak_msg_.data(), &opt_len); } else { @@ -1074,7 +1074,7 @@ void DhcpHandler::SendDhcpResponse() { // TODO: If giaddr is set, what to do ? // In TSN, the source address for DHCP response should be the address - // in the subnet reserved for service node. Otherwise, it will be the + // in the subnet reserved for service node. Otherwise, it will be the // GW address. dns_addr field has this address, use it as the source IP. in_addr_t src_ip = htonl(config_.dns_addr.to_v4().to_ulong()); in_addr_t dest_ip = 0xFFFFFFFF; @@ -1140,7 +1140,7 @@ bool DhcpHandler::IsRouterOptionNeeded() { void DhcpHandler::UpdateStats() { DhcpProto *dhcp_proto = agent()->GetDhcpProto(); (out_msg_type_ == DHCP_OFFER) ? dhcp_proto->IncrStatsOffers() : - ((out_msg_type_ == DHCP_ACK) ? dhcp_proto->IncrStatsAcks() : + ((out_msg_type_ == DHCP_ACK) ? dhcp_proto->IncrStatsAcks() : dhcp_proto->IncrStatsNacks()); } diff --git a/src/vnsw/agent/services/dhcp_handler.h b/src/vnsw/agent/services/dhcp_handler.h index 54366c51cf3..a2db0abafdb 100644 --- a/src/vnsw/agent/services/dhcp_handler.h +++ b/src/vnsw/agent/services/dhcp_handler.h @@ -9,7 +9,7 @@ #define DHCP_PKT_SIZE 1024 -// Magic cookie for DHCP Options +// Magic cookie for DHCP Options #define DHCP_OPTIONS_COOKIE "\143\202\123\143" // Supported DHCP options @@ -215,7 +215,7 @@ struct dhcphdr { uint8_t op; uint8_t htype; uint8_t hlen; - uint8_t hops; // # of relay agent hops + uint8_t hops; // # of relay agent hops uint32_t xid; uint16_t secs; uint16_t flags; @@ -232,7 +232,7 @@ struct dhcphdr { struct Dhcpv4Options { void WriteData(uint8_t c, uint8_t l, const void *d, uint16_t *optlen) { code = c; - len = l; + len = l; memcpy(data, (uint8_t *)d, l); *optlen += 2 + l; } diff --git a/src/vnsw/agent/services/dhcp_handler_base.cc b/src/vnsw/agent/services/dhcp_handler_base.cc index 9b2e7fa75e4..a8cf1bec551 100644 --- a/src/vnsw/agent/services/dhcp_handler_base.cc +++ b/src/vnsw/agent/services/dhcp_handler_base.cc @@ -695,7 +695,7 @@ void DhcpHandlerBase::FindDomainName(const IpAddress &vm_addr) { config_.valid_time != (uint32_t) -1) return; - if (!vm_itf_->vn() || + if (!vm_itf_->vn() || !vm_itf_->vn()->GetIpamData(vm_addr, &ipam_name_, &ipam_type_)) { DHCP_BASE_TRACE("Ipam data not found"); return; @@ -709,8 +709,8 @@ void DhcpHandlerBase::FindDomainName(const IpAddress &vm_addr) { if (config_.domain_name_.size() && config_.domain_name_ != vdns_type_.domain_name) { - DHCP_BASE_TRACE("Client domain " << config_.domain_name_ << - " doesnt match with configured domain " << + DHCP_BASE_TRACE("Client domain " << config_.domain_name_ << + " doesnt match with configured domain " << vdns_type_.domain_name); } std::size_t pos; @@ -718,7 +718,7 @@ void DhcpHandlerBase::FindDomainName(const IpAddress &vm_addr) { ((pos = config_.client_name_.find('.', 0)) != std::string::npos) && (config_.client_name_.substr(pos + 1) != vdns_type_.domain_name)) { DHCP_BASE_TRACE("Client domain doesnt match with configured domain " - << vdns_type_.domain_name << "; Client name = " + << vdns_type_.domain_name << "; Client name = " << config_.client_name_); config_.client_name_.replace(config_.client_name_.begin() + pos + 1, config_.client_name_.end(), diff --git a/src/vnsw/agent/services/dhcpv6_handler.cc b/src/vnsw/agent/services/dhcpv6_handler.cc index 6d693644ce6..5392f8bccdc 100644 --- a/src/vnsw/agent/services/dhcpv6_handler.cc +++ b/src/vnsw/agent/services/dhcpv6_handler.cc @@ -354,8 +354,8 @@ bool Dhcpv6Handler::Run() { if (FindLeaseData()) { SendDhcpResponse(); - DHCPV6_TRACE(Trace, "DHCP response sent; message = " << - ServicesSandesh::Dhcpv6MsgType(out_msg_type_) << + DHCPV6_TRACE(Trace, "DHCP response sent; message = " << + ServicesSandesh::Dhcpv6MsgType(out_msg_type_) << "; ip = " << config_.ip_addr.to_string()); } @@ -495,7 +495,7 @@ bool Dhcpv6Handler::FindLeaseData() { if (!ipam[i].IsV6()) { continue; } - if (IsIp6SubnetMember(ip, ipam[i].ip_prefix.to_v6(), + if (IsIp6SubnetMember(ip, ipam[i].ip_prefix.to_v6(), ipam[i].plen)) { Ip6Address default_gw; if (ipam[i].default_gw.is_v6()) { @@ -709,7 +709,7 @@ uint16_t Dhcpv6Handler::FillDhcpResponse(const MacAddress &dest_mac, void Dhcpv6Handler::SendDhcpResponse() { UpdateStats(); // In TSN, the source address for DHCP response should be the address - // in the subnet reserved for service node. Otherwise, it will be the + // in the subnet reserved for service node. Otherwise, it will be the // GW address. dns_addr field has this address, use it as the source IP. FillDhcpResponse(MacAddress(pkt_info_->eth->ether_shost), config_.dns_addr.to_v6(), diff --git a/src/vnsw/agent/services/dhcpv6_handler.h b/src/vnsw/agent/services/dhcpv6_handler.h index 620449065e6..baa26203ac2 100644 --- a/src/vnsw/agent/services/dhcpv6_handler.h +++ b/src/vnsw/agent/services/dhcpv6_handler.h @@ -143,7 +143,7 @@ struct Dhcpv6Options { void WriteData(uint16_t c, uint16_t l, const void *d, uint16_t *optlen) { code = htons(c); - len = htons(l); + len = htons(l); memcpy(data, (uint8_t *)d, l); *optlen += 4 + l; } diff --git a/src/vnsw/agent/services/dhcpv6_proto.h b/src/vnsw/agent/services/dhcpv6_proto.h index 3a11f38186f..c897dd5a4be 100644 --- a/src/vnsw/agent/services/dhcpv6_proto.h +++ b/src/vnsw/agent/services/dhcpv6_proto.h @@ -32,7 +32,7 @@ class Dhcpv6Proto : public Proto { struct DhcpStats { DhcpStats() { Reset(); } void Reset() { - solicit = advertise = request = confirm = renew = + solicit = advertise = request = confirm = renew = rebind = reply = release = decline = reconfigure = information_request = error = 0; } diff --git a/src/vnsw/agent/services/dns_handler.cc b/src/vnsw/agent/services/dns_handler.cc index 5e43cef29f7..05309fb2ab4 100644 --- a/src/vnsw/agent/services/dns_handler.cc +++ b/src/vnsw/agent/services/dns_handler.cc @@ -63,11 +63,11 @@ void DnsHandler::BuildDnsResolvers() { uint8_t count = 0; uint8_t resolvers_count = Agent::GetInstance()->GetDnslist().size(); dns_resolvers_.resize(resolvers_count); - + std::vectordns_servers; while (count < resolvers_count) { - - boost::split(dns_servers, Agent::GetInstance()->GetDnslist()[count], + + boost::split(dns_servers, Agent::GetInstance()->GetDnslist()[count], boost::is_any_of(":")); DnsResolverInfo *resolver = new DnsResolverInfo(); @@ -143,13 +143,13 @@ bool DnsHandler::HandleRequest() { const VmInterface *vmitf = static_cast(itf); if (!vmitf->layer3_forwarding()) { - DNS_BIND_TRACE(DnsBindError, "DNS request on VM port with disabled" + DNS_BIND_TRACE(DnsBindError, "DNS request on VM port with disabled" "ipv4 service: " << itf); dns_proto->IncrStatsDrop(); return true; } // Handle requests (req == 0), queries (op code == 0), updates, non auth - if ((dns_->flags.op && dns_->flags.op != DNS_OPCODE_UPDATE) || + if ((dns_->flags.op && dns_->flags.op != DNS_OPCODE_UPDATE) || (dns_->flags.cd)) { DNS_BIND_TRACE(DnsBindError, "Unimplemented DNS request" << "; flags.op = " << dns_->flags.op << "; flags.cd = " @@ -212,7 +212,7 @@ bool DnsHandler::HandleDefaultDnsRequest(const VmInterface *vmitf) { DnsProto *dns_proto = agent()->GetDnsProto(); rkey_ = new QueryKey(vmitf, dns_->xid); if (dns_proto->IsVmRequestDuplicate(rkey_)) { - DNS_BIND_TRACE(DnsBindTrace, + DNS_BIND_TRACE(DnsBindTrace, "Retry DNS query from VM - dropping; interface = " << vmitf->vm_name() << " xid = " << dns_->xid); dns_proto->IncrStatsRetransmitReq(); @@ -230,8 +230,8 @@ bool DnsHandler::HandleDefaultDnsRequest(const VmInterface *vmitf) { } resp_ptr_ = (uint8_t *)dns_ + dns_resp_size_; - BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, - DNS_OPCODE_QUERY, 0, 1, DNS_ERR_NO_ERROR, + BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, + DNS_OPCODE_QUERY, 0, 1, DNS_ERR_NO_ERROR, ntohs(dns_->ques_rrcount)); ResolveAllLinkLocalRequests(); if (!items_.size()) { @@ -251,7 +251,7 @@ bool DnsHandler::HandleDefaultDnsRequest(const VmInterface *vmitf) { } DNS_BIND_TRACE(DnsBindTrace, "Default DNS query received; " - "interface = " << vmitf->vm_name() << " xid = " << + "interface = " << vmitf->vm_name() << " xid = " << dns_->xid << " " << DnsItemsToString(items_)); action_ = DnsHandler::DNS_QUERY; @@ -276,7 +276,7 @@ bool DnsHandler::HandleDefaultDnsRequest(const VmInterface *vmitf) { void DnsHandler::DefaultDnsSendResponse() { agent()->GetDnsProto()->DelVmRequest(rkey_); if (dns_->flags.ret) { - DNS_BIND_TRACE(DnsBindError, "Query failed : " << + DNS_BIND_TRACE(DnsBindError, "Query failed : " << BindUtil::DnsResponseCode(dns_->flags.ret) << " xid = " << dns_->xid << " " << DnsItemsToString(items_) << @@ -318,8 +318,8 @@ bool DnsHandler::HandleVirtualDnsRequest(const VmInterface *vmitf) { break; } resp_ptr_ = (uint8_t *)dns_ + dns_resp_size_; - BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, - DNS_OPCODE_QUERY, 0, 1, ret, + BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, + DNS_OPCODE_QUERY, 0, 1, ret, ntohs(dns_->ques_rrcount)); // Check for linklocal service name resolution ResolveAllLinkLocalRequests(); @@ -356,7 +356,7 @@ bool DnsHandler::HandleVirtualDnsRequest(const VmInterface *vmitf) { if (vdns_type_.dynamic_records_from_client) { DnsUpdateData *update_data = new DnsUpdateData(); DnsProto::DnsUpdateIpc *update = - new DnsProto::DnsUpdateIpc(DnsAgentXmpp::Update, + new DnsProto::DnsUpdateIpc(DnsAgentXmpp::Update, update_data, vmitf, false); if (BindUtil::ParseDnsUpdate((uint8_t *)dns_, pkt_info_->GetUdpPayloadLength(), @@ -374,7 +374,7 @@ bool DnsHandler::HandleVirtualDnsRequest(const VmInterface *vmitf) { "update for " << DnsItemsToString(items_)); ret = DNS_ERR_NOT_AUTH; } - BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, + BindUtil::BuildDnsHeader(dns_, ntohs(dns_->xid), DNS_QUERY_RESPONSE, DNS_OPCODE_UPDATE, 0, 1, ret, ntohs(dns_->ques_rrcount)); SendDnsResponse(); @@ -400,7 +400,7 @@ bool DnsHandler::SendDnsQuery(DnsResolverInfo *resolver, bool in_progress = dns_proto->IsDnsQueryInProgress(xid); if (in_progress) { if (resolver->retries_ >= dns_proto->max_retries()) { - DNS_BIND_TRACE(DnsBindTrace, + DNS_BIND_TRACE(DnsBindTrace, "Max retries reached for query; xid = " << xid << " " << DnsItemsToString(items_)); goto cleanup; @@ -746,7 +746,7 @@ bool DnsHandler::HandleModifyVdns() { if (!ipc->itf && ipc->new_vdns == ipc->old_vdns) continue; - for (DnsItems::iterator item = (*it)->xmpp_data->items.begin(); + for (DnsItems::iterator item = (*it)->xmpp_data->items.begin(); item != (*it)->xmpp_data->items.end(); ++item) { // in case of delete, set the class to NONE and ttl to 0 (*item).eclass = DNS_CLASS_NONE; @@ -787,7 +787,7 @@ bool DnsHandler::UpdateAll() { static_cast(pkt_info_->ipc); const DnsProto::DnsUpdateSet &update_set = agent()->GetDnsProto()->update_set(); - for (DnsProto::DnsUpdateSet::const_iterator it = update_set.begin(); + for (DnsProto::DnsUpdateSet::const_iterator it = update_set.begin(); it != update_set.end(); ++it) { SendXmppUpdate(ipc->channel, (*it)->xmpp_data); } @@ -796,7 +796,7 @@ bool DnsHandler::UpdateAll() { return true; } -void DnsHandler::SendXmppUpdate(AgentDnsXmppChannel *channel, +void DnsHandler::SendXmppUpdate(AgentDnsXmppChannel *channel, DnsUpdateData *xmpp_data) { if (channel && agent_->is_dns_xmpp_channel(channel)) { // Split the request in case we have more data items @@ -819,9 +819,9 @@ void DnsHandler::SendXmppUpdate(AgentDnsXmppChannel *channel, uint8_t data[DnsAgentXmpp::max_dns_xmpp_msg_len]; xid_ = agent()->GetDnsProto()->GetTransId(); std::size_t len = 0; - if ((len = DnsAgentXmpp::DnsAgentXmppEncode(channel->GetXmppChannel(), + if ((len = DnsAgentXmpp::DnsAgentXmppEncode(channel->GetXmppChannel(), DnsAgentXmpp::Update, - xid_, 0, xmpp_data, + xid_, 0, xmpp_data, data)) > 0) { channel->SendMsg(data, len); } @@ -833,7 +833,7 @@ void DnsHandler::SendXmppUpdate(AgentDnsXmppChannel *channel, } } -void +void DnsHandler::Resolve(dns_flags flags, const DnsItems &ques, DnsItems &ans, DnsItems &auth, DnsItems &add) { for (DnsItems::iterator it = ans.begin(); it != ans.end(); ++it) { @@ -967,7 +967,7 @@ void DnsHandler::UpdateQueryNames() { } } -// In case we added domain name to the queries, the response to the VM +// In case we added domain name to the queries, the response to the VM // should not have the domain name. Update the offsets in the DnsItems // accordingly. void DnsHandler::UpdateOffsets(DnsItem &item, bool name_update_required) { @@ -1010,7 +1010,7 @@ void DnsHandler::Update(InterTaskMsg *msg) { DnsProto::DnsUpdateIpc *update_req = dns_proto->FindUpdateRequest(update); if (update_req) { DnsUpdateData *data = update_req->xmpp_data; - for (DnsItems::iterator item = update->xmpp_data->items.begin(); + for (DnsItems::iterator item = update->xmpp_data->items.begin(); item != update->xmpp_data->items.end();) { if ((*item).IsDelete()) { if (!data->DelItem(*item)) @@ -1050,14 +1050,14 @@ void DnsHandler::DelUpdate(InterTaskMsg *msg) { DnsProto *dns_proto = agent()->GetDnsProto(); DnsProto::DnsUpdateIpc *update_req = dns_proto->FindUpdateRequest(update); while (update_req) { - for (DnsItems::iterator item = update_req->xmpp_data->items.begin(); + for (DnsItems::iterator item = update_req->xmpp_data->items.begin(); item != update_req->xmpp_data->items.end(); ++item) { // in case of delete, set the class to NONE and ttl to 0 (*item).eclass = DNS_CLASS_NONE; (*item).ttl = 0; } for (int i = 0; i < MAX_XMPP_SERVERS; i++) { - AgentDnsXmppChannel *channel = + AgentDnsXmppChannel *channel = agent()->dns_xmpp_channel(i); SendXmppUpdate(channel, update_req->xmpp_data); } diff --git a/src/vnsw/agent/services/dns_handler.h b/src/vnsw/agent/services/dns_handler.h index 456ed7666dc..011b040a1d4 100644 --- a/src/vnsw/agent/services/dns_handler.h +++ b/src/vnsw/agent/services/dns_handler.h @@ -20,7 +20,7 @@ class Timer; class DnsHandler : public ProtoHandler { public: - typedef boost::function ResolveHandler; typedef std::vector ResolvList; static const uint32_t max_items_per_xmpp_msg = 20; diff --git a/src/vnsw/agent/services/dns_proto.cc b/src/vnsw/agent/services/dns_proto.cc index 47139bbbaf5..209b2ac7f20 100644 --- a/src/vnsw/agent/services/dns_proto.cc +++ b/src/vnsw/agent/services/dns_proto.cc @@ -658,7 +658,7 @@ void DnsProto::SendDnsUpdateIpc(AgentDnsXmppChannel *channel) { agent_->pkt()->pkt_handler()->SendMessage(PktHandler::DNS, ipc); } -void DnsProto::AddDnsQuery(uint16_t xid, DnsHandler *handler) { +void DnsProto::AddDnsQuery(uint16_t xid, DnsHandler *handler) { dns_query_map_.insert(DnsBindQueryPair(xid, handler)); } diff --git a/src/vnsw/agent/services/dns_proto.h b/src/vnsw/agent/services/dns_proto.h index dbd4024a076..a69abd623fd 100644 --- a/src/vnsw/agent/services/dns_proto.h +++ b/src/vnsw/agent/services/dns_proto.h @@ -93,7 +93,7 @@ class DnsProto : public Proto { }; struct DnsUpdateAllIpc : InterTaskMsg { - DnsUpdateAllIpc(AgentDnsXmppChannel *ch) + DnsUpdateAllIpc(AgentDnsXmppChannel *ch) : InterTaskMsg(DNS_XMPP_SEND_UPDATE_ALL), channel(ch) {} AgentDnsXmppChannel *channel; diff --git a/src/vnsw/agent/services/icmpv6_error_handler.cc b/src/vnsw/agent/services/icmpv6_error_handler.cc index d69e5411c95..bb0eb566266 100644 --- a/src/vnsw/agent/services/icmpv6_error_handler.cc +++ b/src/vnsw/agent/services/icmpv6_error_handler.cc @@ -15,7 +15,7 @@ #include -extern SandeshTraceBufferPtr Icmpv6TraceBuf; +extern SandeshTraceBufferPtr Icmpv6TraceBuf; Icmpv6ErrorHandler::Icmpv6ErrorHandler(Agent *agent, Icmpv6ErrorProto *proto, boost::shared_ptr info, @@ -51,9 +51,9 @@ bool Icmpv6ErrorHandler::Run() { // Generate ICMP error bool Icmpv6ErrorHandler::SendIcmpv6Error(VmInterface *intf) { - - char *buff = (char *)pkt_info_->pkt; - uint16_t buff_len = pkt_info_->packet_buffer()->data_len(); + + char *buff = (char *)pkt_info_->pkt; + uint16_t buff_len = pkt_info_->packet_buffer()->data_len(); char data[ICMPV6_PAYLOAD_LEN]; int len = ntohs(pkt_info_->ip6->ip6_plen); @@ -74,7 +74,7 @@ bool Icmpv6ErrorHandler::SendIcmpv6Error(VmInterface *intf) { if (source_address.is_unspecified()) source_address = Ip6Address::v4_mapped(agent()->router_id()); - uint32_t interface = + uint32_t interface = (pkt_info_->agent_hdr.cmd == AgentHdr::TRAP_TOR_CONTROL_PKT) ? pkt_info_->agent_hdr.cmd_param : GetInterfaceIndex(); @@ -84,16 +84,16 @@ bool Icmpv6ErrorHandler::SendIcmpv6Error(VmInterface *intf) { ETHERTYPE_IPV6); pkt_info_->ip6 = (struct ip6_hdr *)(buff + eth_len); - Ip6Hdr(pkt_info_->ip6, len+ICMP_UNREACH_HDR_LEN, IPV6_ICMP_NEXT_HEADER, + Ip6Hdr(pkt_info_->ip6, len+ICMP_UNREACH_HDR_LEN, IPV6_ICMP_NEXT_HEADER, 255, source_address.to_bytes().data(), pkt_info_->ip_saddr.to_v6().to_bytes().data()); - icmp6_hdr *icmp = pkt_info_->transp.icmp6 = - (icmp6_hdr *)(pkt_info_->pkt + eth_len + icmp6_hdr *icmp = pkt_info_->transp.icmp6 = + (icmp6_hdr *)(pkt_info_->pkt + eth_len + sizeof(ip6_hdr)); icmp->icmp6_type = ICMP6_PACKET_TOO_BIG; icmp->icmp6_code = 0; - icmp->icmp6_mtu = htonl(pkt_info_->agent_hdr.mtu); + icmp->icmp6_mtu = htonl(pkt_info_->agent_hdr.mtu); icmp->icmp6_cksum = 0; memcpy(buff + sizeof(ip6_hdr) + eth_len+ICMP_UNREACH_HDR_LEN, data, len); icmp->icmp6_cksum = @@ -101,11 +101,11 @@ bool Icmpv6ErrorHandler::SendIcmpv6Error(VmInterface *intf) { pkt_info_->ip_saddr.to_v6().to_bytes().data(), icmp, len + ICMP_UNREACH_HDR_LEN); pkt_info_->set_len(len + sizeof(ip6_hdr) + eth_len+ICMP_UNREACH_HDR_LEN); - + uint16_t command = (pkt_info_->agent_hdr.cmd == AgentHdr::TRAP_TOR_CONTROL_PKT) ? (uint16_t)AgentHdr::TX_ROUTE : AgentHdr::TX_SWITCH; - + Send(GetInterfaceIndex(), pkt_info_->vrf, command, PktHandler::ICMPV6); return true; diff --git a/src/vnsw/agent/services/metadata_proxy.cc b/src/vnsw/agent/services/metadata_proxy.cc index ef9892846e1..e6d112b7f31 100644 --- a/src/vnsw/agent/services/metadata_proxy.cc +++ b/src/vnsw/agent/services/metadata_proxy.cc @@ -55,7 +55,7 @@ std::map static std::string ErrorMessage(uint16_t ec) { std::map::iterator iter = g_http_error_map.find(ec); if (iter == g_http_error_map.end()) - return ""; + return ""; return iter->second; } @@ -125,7 +125,7 @@ MetadataProxy::Shutdown() { } } -void +void MetadataProxy::HandleMetadataRequest(HttpSession *session, const HttpRequest *request) { bool conn_close = false; std::vector header_options; @@ -271,7 +271,7 @@ MetadataProxy::HandleMetadataResponse(HttpConnection *conn, HttpSessionPtr sessi session->Send(reinterpret_cast(msg.c_str()), msg.length(), NULL); } else { - METADATA_TRACE(Trace, "Metadata for VM : " << vm_ip << " Error : " << + METADATA_TRACE(Trace, "Metadata for VM : " << vm_ip << " Error : " << boost::system::system_error(ec).what()); CloseClientSession(conn); ErrorClose(session.get(), 502); @@ -332,7 +332,7 @@ MetadataProxy::OnClientSessionEvent(HttpClientSession *session, TcpSession::Even switch (event) { case TcpSession::CLOSE: { { - ConnectionSessionMap::iterator it = + ConnectionSessionMap::iterator it = metadata_proxy_sessions_.find(session->Connection()); if (it == metadata_proxy_sessions_.end()) break; diff --git a/src/vnsw/agent/services/metadata_proxy.h b/src/vnsw/agent/services/metadata_proxy.h index 84d5edf061c..d5b2ddd2b0f 100644 --- a/src/vnsw/agent/services/metadata_proxy.h +++ b/src/vnsw/agent/services/metadata_proxy.h @@ -14,7 +14,7 @@ class MetadataClient; class MetadataProxy { public: struct SessionData { - SessionData(HttpConnection *c, bool conn_close) + SessionData(HttpConnection *c, bool conn_close) : conn(c), content_len(0), data_sent(0), close_req(conn_close), header_end(false) {} diff --git a/src/vnsw/agent/services/multicast/agent_map/bvx_environment.h b/src/vnsw/agent/services/multicast/agent_map/bvx_environment.h index 1b6bb752a4b..b6ac7d6399b 100644 --- a/src/vnsw/agent/services/multicast/agent_map/bvx_environment.h +++ b/src/vnsw/agent/services/multicast/agent_map/bvx_environment.h @@ -17,7 +17,7 @@ #define bvx_patricia_lookup_least patricia_lookup_least #define bvx_patricia_lookup_greatest patricia_lookup_greatest #define bvx_patroot_init(keylen, offset) \ - patricia_root_init(NULL, FALSE, (keylen), (offset)) + patricia_root_init(NULL, FALSE, (keylen), (offset)) #define BVX_PATRICIA_OFFSET STRUCT_OFFSET #define bvx_patricia_add patricia_add #define bvx_patroot_destroy patricia_root_delete @@ -41,11 +41,11 @@ /* * Define the bit vector entry size. */ -#define BV_BITSIZE_LOG2 5 /* 32 bits per entry for now */ +#define BV_BITSIZE_LOG2 5 /* 32 bits per entry for now */ /* * Define the size of a bit vector word. */ -typedef uint32_t bv_word_t; /* Bit vector word type */ +typedef uint32_t bv_word_t; /* Bit vector word type */ #endif diff --git a/src/vnsw/agent/services/multicast/agent_map/gmpx_environment.h b/src/vnsw/agent/services/multicast/agent_map/gmpx_environment.h index 4dffc1753f2..96cf26d95ba 100644 --- a/src/vnsw/agent/services/multicast/agent_map/gmpx_environment.h +++ b/src/vnsw/agent/services/multicast/agent_map/gmpx_environment.h @@ -15,7 +15,7 @@ #define gmpx_patricia_lookup_least patricia_lookup_least #define gmpx_patricia_lookup_geq patricia_lookup_geq #define gmpx_patroot_init(keylen, offset) \ - patricia_root_init(NULL, FALSE, (keylen), (offset)) + patricia_root_init(NULL, FALSE, (keylen), (offset)) #define GMPX_PATRICIA_OFFSET STRUCT_OFFSET #define gmpx_patricia_add patricia_add #define gmpx_patroot_destroy patricia_root_delete @@ -26,9 +26,9 @@ /* Interface index. */ typedef struct gmp_intf_handle_ *gmpx_intf_id; -#define GMPX_MANY_INTFS 50 /* Intf count before changing - * general query strategy - */ +#define GMPX_MANY_INTFS 50 /* Intf count before changing + * general query strategy + */ /* Memory stuff. */ @@ -47,13 +47,13 @@ typedef struct gmp_intf_handle_ *gmpx_intf_id; #define GMPX_UNUSED UNUSED -#define GMPX_MAX_RTR_CLIENTS 2 /* Should be enough */ +#define GMPX_MAX_RTR_CLIENTS 2 /* Should be enough */ /* * Packet attribute. For now it's just a boolean, with TRUE meaning that * the packet represents statically defined groups. */ -typedef boolean gmpx_packet_attr; /* Packet attribute */ +typedef boolean gmpx_packet_attr; /* Packet attribute */ /* Tracing */ @@ -80,26 +80,26 @@ typedef struct gmpx_timer_ gmpx_timer; typedef void (*gmpx_timer_callback)(gmpx_timer *timer, void *context); struct gmpx_timer_ { - task_timer *gmpxt_timer; /* rpd's timer */ - void *gmpxt_context; /* timer context */ - gmpx_timer_callback gmpxt_callback; /* Callback address */ - gmp_timer_group gmpxt_group; /* Timer group */ - gmp_proto gmpxt_proto; /* Associated protocol */ + task_timer *gmpxt_timer; /* rpd's timer */ + void *gmpxt_context; /* timer context */ + gmpx_timer_callback gmpxt_callback; /* Callback address */ + gmp_timer_group gmpxt_group; /* Timer group */ + gmp_proto gmpxt_proto; /* Associated protocol */ }; /* gmpx_environment.c */ extern void gmpx_start_timer(gmpx_timer *timer, uint32_t ivl, - uint32_t jitter_pct); + uint32_t jitter_pct); extern gmpx_timer *gmpx_create_timer(void *inst_context, const char *name, - gmpx_timer_callback callback, - void *timer_context); + gmpx_timer_callback callback, + void *timer_context); extern gmpx_timer *gmpx_create_grouped_timer(gmp_timer_group group, - void *inst_context, - const char *name, - gmpx_timer_callback callback, - void *timer_context); + void *inst_context, + const char *name, + gmpx_timer_callback callback, + void *timer_context); extern void gmpx_destroy_timer(gmpx_timer *timer); extern uint32_t gmpx_timer_time_remaining(gmpx_timer *timer); extern boolean gmpx_timer_running(gmpx_timer *timer); diff --git a/src/vnsw/agent/services/multicast/gmp_map/gmp_map.h b/src/vnsw/agent/services/multicast/gmp_map/gmp_map.h index 6fcf377cb35..db458fdecac 100644 --- a/src/vnsw/agent/services/multicast/gmp_map/gmp_map.h +++ b/src/vnsw/agent/services/multicast/gmp_map/gmp_map.h @@ -5,7 +5,7 @@ #ifndef vnsw_agent_gmp_map_h #define vnsw_agent_gmp_map_h -typedef enum { +typedef enum { MCAST_AF_IPV4, MCAST_AF_FIRST = MCAST_AF_IPV4, MCAST_AF_IPV6, diff --git a/src/vnsw/agent/services/multicast/gmp_map/gmp_proto.h b/src/vnsw/agent/services/multicast/gmp_map/gmp_proto.h index 8ea27d40b2a..c28bce43158 100644 --- a/src/vnsw/agent/services/multicast/gmp_map/gmp_proto.h +++ b/src/vnsw/agent/services/multicast/gmp_map/gmp_proto.h @@ -66,7 +66,7 @@ class GmpProto { uint32_t gmp_sgh_del_count_; }; - GmpProto(GmpType::Type type, Agent *agent, const std::string &task_name, + GmpProto(GmpType::Type type, Agent *agent, const std::string &task_name, int instance, boost::asio::io_service &io); ~GmpProto(); GmpIntf *CreateIntf(); diff --git a/src/vnsw/agent/services/multicast/gmp_map/igmp_private.h b/src/vnsw/agent/services/multicast/gmp_map/igmp_private.h index 42878e0e13e..42bc03b7861 100644 --- a/src/vnsw/agent/services/multicast/gmp_map/igmp_private.h +++ b/src/vnsw/agent/services/multicast/gmp_map/igmp_private.h @@ -11,7 +11,7 @@ #define IGMP_QUERY_LASTMEMBER_INTERVAL (1 * MSECS_PER_SEC) #define IGMP_VERSION_1 1 -#define IGMP_VERSION_2 2 +#define IGMP_VERSION_2 2 #define IGMP_VERSION_3 3 #endif /* vnsw_agent_igmp_private_hpp */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp.h index e25483821b5..736901a46ec 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp.h @@ -21,8 +21,8 @@ * This will never change, and we don't have to pull in a bunch of IP gorp * to use it. */ -#define IPV4_ADDR_LEN 4 /* Length of a v4 address */ -#define IPV6_ADDR_LEN 16 /* Length of a v6 address */ +#define IPV4_ADDR_LEN 4 /* Length of a v4 address */ +#define IPV6_ADDR_LEN 16 /* Length of a v6 address */ /* @@ -36,16 +36,16 @@ typedef void *gmp_instance_id; * Client ID. Used to identify clients of gmp_host and gmp_router. This * is actually a pointer to the associated client block. */ -typedef void *gmp_client_id; /* Client ID */ +typedef void *gmp_client_id; /* Client ID */ /* * Protocol. Used to identify which GMP protocol is in use. */ typedef enum { - GMP_PROTO_IGMP, /* IGMP */ - GMP_PROTO_MLD, /* MLD */ - GMP_NUM_PROTOS /* Number of protocols */ + GMP_PROTO_IGMP, /* IGMP */ + GMP_PROTO_MLD, /* MLD */ + GMP_NUM_PROTOS /* Number of protocols */ } gmp_proto; @@ -54,9 +54,9 @@ typedef enum { * same time. */ typedef enum { - GMP_ROLE_HOST, /* Host-side GMP */ - GMP_ROLE_ROUTER, /* Router-side GMP */ - GMP_NUM_ROLES /* Number of roles */ + GMP_ROLE_HOST, /* Host-side GMP */ + GMP_ROLE_ROUTER, /* Router-side GMP */ + GMP_NUM_ROLES /* Number of roles */ } gmp_role; @@ -69,14 +69,14 @@ typedef enum {GMP_FILTER_MODE_EXCLUDE, GMP_FILTER_MODE_INCLUDE} /* * Address string - * + * * This is an address, either IPv4 or IPv6, in network byte order. The * address type is contextualized by its environment (IGMP vs. MLD). */ typedef union gmp_addrstring_ { uint8_t gmp_v4_addr[IPV4_ADDR_LEN]; /* IPv4 address */ uint8_t gmp_v6_addr[IPV6_ADDR_LEN]; /* IPv6 address */ - uint8_t gmp_addr[1]; /* Generic address pointer */ + uint8_t gmp_addr[1]; /* Generic address pointer */ } gmp_addr_string; @@ -86,7 +86,7 @@ typedef union gmp_addrstring_ { * Passed via the gmph_set_intf_params call */ typedef struct gmph_intf_params_ { - uint8_t gmph_version; /* Protocol version */ + uint8_t gmph_version; /* Protocol version */ } gmph_intf_params; /* @@ -95,15 +95,15 @@ typedef struct gmph_intf_params_ { * Passed via the gmpr_set_intf_params call */ typedef struct gmpr_intf_params_ { - uint8_t gmpr_ifparm_version; /* Protocol version */ - uint8_t gmpr_ifparm_robustness; /* Robustness value */ - uint32_t gmpr_ifparm_qivl; /* Query interval */ - uint32_t gmpr_ifparm_qrivl; /* Query response interval */ - uint32_t gmpr_ifparm_lmqi; /* Last member query interval */ - uint32_t gmpr_ifparm_chan_limit; /* Channel limit */ + uint8_t gmpr_ifparm_version; /* Protocol version */ + uint8_t gmpr_ifparm_robustness; /* Robustness value */ + uint32_t gmpr_ifparm_qivl; /* Query interval */ + uint32_t gmpr_ifparm_qrivl; /* Query response interval */ + uint32_t gmpr_ifparm_lmqi; /* Last member query interval */ + uint32_t gmpr_ifparm_chan_limit; /* Channel limit */ uint32_t gmpr_ifparm_chan_threshold; /* Channel threshold */ uint32_t gmpr_ifparm_log_interval; /* Time between consecutive similar limit log events */ - boolean gmpr_ifparm_fast_leave; /* Fast leaves */ + boolean gmpr_ifparm_fast_leave; /* Fast leaves */ boolean gmpr_ifparm_querier_enabled; /* Allowed to be V1 querier */ boolean gmpr_ifparm_passive_receive; /* Passive receive */ boolean gmpr_ifparm_suppress_gen_query; /* Suppress general queries */ @@ -139,10 +139,10 @@ typedef enum { * as timer smearing. */ typedef enum { - GMP_TIMER_GROUP_DEFAULT, /* Default */ - GMP_TIMER_GROUP_GEN_QUERY, /* General query timers */ + GMP_TIMER_GROUP_DEFAULT, /* Default */ + GMP_TIMER_GROUP_GEN_QUERY, /* General query timers */ - GMP_NUM_TIMER_GROUPS /* Number of timer groups */ + GMP_NUM_TIMER_GROUPS /* Number of timer groups */ } gmp_timer_group; diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp_externs.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp_externs.h index 79a35c22a10..f531609eaec 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp_externs.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp_externs.h @@ -23,7 +23,7 @@ * I/O environment when a packet is ready to transmit. */ typedef void (*gmpp_xmit_ready_func) (gmp_role role, gmp_proto proto, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); /* @@ -33,8 +33,8 @@ typedef void (*gmpp_xmit_ready_func) (gmp_role role, gmp_proto proto, * when a generic packet has been received to be passed to the client. */ typedef void (*gmp_rcv_peek_callback_func)(gmpx_intf_id intf_id, - gmp_proto proto, - gmp_packet *gen_packet); + gmp_proto proto, + gmp_packet *gen_packet); /* @@ -44,8 +44,8 @@ typedef void (*gmp_rcv_peek_callback_func)(gmpx_intf_id intf_id, * when a generic packet has been formatted for transmission by the client. */ typedef void (*gmp_xmit_peek_callback_func)(gmpx_intf_id intf_id, - gmp_proto proto, - gmp_packet *gen_packet); + gmp_proto proto, + gmp_packet *gen_packet); /* Externals */ @@ -53,48 +53,48 @@ typedef void (*gmp_xmit_peek_callback_func)(gmpx_intf_id intf_id, /* igmp_proto.c */ extern uint32_t igmp_next_xmit_packet(gmp_role role, gmpx_intf_id intf_id, - void *packet, uint8_t *dest_addr, - uint32_t packet_len, void *trace_context, - uint32_t trace_flags); + void *packet, uint8_t *dest_addr, + uint32_t packet_len, void *trace_context, + uint32_t trace_flags); extern boolean igmp_process_pkt(void *rcv_pkt, const uint8_t *src_addr, - const uint8_t *dest_addr, - uint32_t packet_len, gmpx_intf_id intf_id, - gmpx_packet_attr attrib, void *trace_context, - uint32_t trace_flags); + const uint8_t *dest_addr, + uint32_t packet_len, gmpx_intf_id intf_id, + gmpx_packet_attr attrib, void *trace_context, + uint32_t trace_flags); extern void gmp_igmp_trace_pkt(void *pkt, uint32_t len, const uint8_t *addr, - gmpx_intf_id intf_id, boolean receive, - void *trace_context, uint32_t trace_flags); + gmpx_intf_id intf_id, boolean receive, + void *trace_context, uint32_t trace_flags); extern void gmp_igmp_trace_bad_pkt(uint32_t len, const uint8_t *addr, - gmpx_intf_id intf_id, void *trace_context, - uint32_t trace_flags); + gmpx_intf_id intf_id, void *trace_context, + uint32_t trace_flags); /* mld_proto.c */ extern uint32_t mld_next_xmit_packet(gmp_role role, gmpx_intf_id intf_id, - void *packet, uint8_t *dest_addr, - uint32_t packet_len, void *trace_context, - uint32_t trace_flags); + void *packet, uint8_t *dest_addr, + uint32_t packet_len, void *trace_context, + uint32_t trace_flags); extern boolean mld_process_pkt(void *rcv_pkt, const uint8_t *src_addr, - const uint8_t *dest_addr, uint32_t packet_len, - gmpx_intf_id intf_id, gmpx_packet_attr attrib, - void *trace_context, uint32_t trace_flags); + const uint8_t *dest_addr, uint32_t packet_len, + gmpx_intf_id intf_id, gmpx_packet_attr attrib, + void *trace_context, uint32_t trace_flags); extern void gmp_mld_trace_pkt(void *pkt, uint32_t len, const uint8_t *addr, - gmpx_intf_id intf_id, boolean receive, - void *trace_context, uint32_t trace_flags); + gmpx_intf_id intf_id, boolean receive, + void *trace_context, uint32_t trace_flags); extern void gmp_mld_trace_bad_pkt(uint32_t len, const uint8_t *addr, - gmpx_intf_id intf_id, void *trace_context, - uint32_t trace_flags); + gmpx_intf_id intf_id, void *trace_context, + uint32_t trace_flags); /* gmp_addrlist.c */ extern gmp_addr_thread *gmp_alloc_addr_thread(void); extern int gmp_enqueue_addr_thread_addr(gmp_addr_thread *addr_thread, - uint8_t *addr, uint32_t addr_len); + uint8_t *addr, uint32_t addr_len); extern gmp_addr_string *gmp_next_addr_thread_addr(gmp_addr_thread *addr_thread, - gmp_addr_thread_entry **entry_ptr); + gmp_addr_thread_entry **entry_ptr); extern void gmp_destroy_addr_thread(gmp_addr_thread *addr_thread); extern uint32_t gmp_addr_thread_count(gmp_addr_thread *addr_thread); @@ -102,12 +102,12 @@ extern uint32_t gmp_addr_thread_count(gmp_addr_thread *addr_thread); /* gmpp_proto.c */ extern void gmp_register_io(gmp_role role, gmp_proto proto, - gmpp_xmit_ready_func xmit_ready); + gmpp_xmit_ready_func xmit_ready); extern void gmp_register_io_exception(gmp_role role, gmp_proto proto, - gmpx_intf_id intf_id, - gmpp_xmit_ready_func xmit_ready); + gmpx_intf_id intf_id, + gmpp_xmit_ready_func xmit_ready); extern void gmp_register_peek_function(gmp_role role, - gmp_xmit_peek_callback_func xm_peek_cb, - gmp_rcv_peek_callback_func rc_peek_cb); + gmp_xmit_peek_callback_func xm_peek_cb, + gmp_rcv_peek_callback_func rc_peek_cb); #endif /* __GMP_EXTERNS_H__ */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp_host.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp_host.h index 5e158af7e46..78aad6567d1 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp_host.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp_host.h @@ -209,8 +209,8 @@ * after the callback is made. */ typedef void (*gmph_soft_detach_callback)(gmp_proto proto, - gmpx_intf_id intf_id, - void *context); + gmpx_intf_id intf_id, + void *context); /* * External references @@ -218,27 +218,27 @@ typedef void (*gmph_soft_detach_callback)(gmp_proto proto, extern gmp_client_id gmph_register(gmp_instance_id instance_id); extern void gmph_detach(gmp_client_id client_id); extern int gmph_listen(gmp_client_id client_id, gmpx_intf_id intf_id, - const u_int8_t *group, gmp_filter_mode filter_mode, - gmp_addr_thread *addr_thread); + const u_int8_t *group, gmp_filter_mode filter_mode, + gmp_addr_thread *addr_thread); extern gmp_instance_id gmph_create_instance(gmp_proto proto, void *context); extern void gmph_destroy_instance(gmp_instance_id instance_id); extern int gmph_set_intf_version(gmp_instance_id instance_id, - gmpx_intf_id intf_id, u_int version); + gmpx_intf_id intf_id, u_int version); extern int gmph_attach_intf(gmp_instance_id instance_id, gmpx_intf_id intf_id); extern int gmph_detach_intf(gmp_instance_id instance_id, gmpx_intf_id intf_id); extern int gmph_detach_intf_soft(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - gmph_soft_detach_callback callback, - void *context); + gmpx_intf_id intf_id, + gmph_soft_detach_callback callback, + void *context); extern int gmph_leave_all_groups(gmp_client_id client_id, gmpx_intf_id intf_id); extern void gmph_send_intf_groups(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmph_set_intf_passive(gmp_instance_id instance_id, - gmpx_intf_id intf_id, boolean passive); + gmpx_intf_id intf_id, boolean passive); extern boolean gmph_intf_has_channel(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - const u_int8_t *source_addr, - const u_int8_t *group_addr, - boolean exact); + gmpx_intf_id intf_id, + const u_int8_t *source_addr, + const u_int8_t *group_addr, + boolean exact); #endif /* __GMP_HOST_H__ */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp_private.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp_private.h index 320ec35cf90..b2a41e38e06 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp_private.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp_private.h @@ -28,10 +28,10 @@ #define EMBEDDED_STRUCT_TO_STRUCT(procname, outerstruct, innerstruct, field) \ static inline outerstruct * procname (innerstruct *ptr) \ { \ - if (ptr)\ - return ((outerstruct *) (((uint8_t *) ptr) - \ - offsetof(outerstruct, field))); \ - return NULL; \ + if (ptr)\ + return ((outerstruct *) (((uint8_t *) ptr) - \ + offsetof(outerstruct, field))); \ + return NULL; \ } /* @@ -40,18 +40,18 @@ * protocol version numbers that correspond to the same functionality. */ typedef enum { - GMP_VERSION_INVALID = 0, /* Invalid version */ - GMP_VERSION_BASIC, /* Joins only */ - GMP_VERSION_LEAVES, /* Joins and leaves */ - GMP_VERSION_SOURCES /* Source information */ + GMP_VERSION_INVALID = 0, /* Invalid version */ + GMP_VERSION_BASIC, /* Joins only */ + GMP_VERSION_LEAVES, /* Joins and leaves */ + GMP_VERSION_SOURCES /* Source information */ } gmp_version; -#define GMP_VERSION_DEFAULT GMP_VERSION_SOURCES /* Default version */ -#define GMP_ROBUSTNESS_DEFAULT 2 /* Retransmission count */ -#define GMP_UNSOL_RPT_IVL_DEFAULT 1000 /* Unsolicited report delay (msec) */ +#define GMP_VERSION_DEFAULT GMP_VERSION_SOURCES /* Default version */ +#define GMP_ROBUSTNESS_DEFAULT 2 /* Retransmission count */ +#define GMP_UNSOL_RPT_IVL_DEFAULT 1000 /* Unsolicited report delay (msec) */ #ifndef MSECS_PER_SEC -#define MSECS_PER_SEC 1000 /* Milliseconds per second */ +#define MSECS_PER_SEC 1000 /* Milliseconds per second */ #endif @@ -92,25 +92,25 @@ typedef void */ typedef struct gmp_addr_catalog_ { - gmpx_patroot *adcat_addr_root; /* Root of address tree */ - gmpx_patroot *adcat_ord_root; /* Root of ordinal tree */ - ordinal_handle adcat_ord_handle; /* Ordinal space handle */ - uint32_t adcat_addrlen; /* Address length */ + gmpx_patroot *adcat_addr_root; /* Root of address tree */ + gmpx_patroot *adcat_ord_root; /* Root of ordinal tree */ + ordinal_handle adcat_ord_handle; /* Ordinal space handle */ + uint32_t adcat_addrlen; /* Address length */ } gmp_addr_catalog; typedef struct gmp_addr_cat_entry_ { - gmpx_patnode adcat_ent_addr_node; /* Address tree node */ - gmpx_patnode adcat_ent_ord_node; /* Ordinal tree node */ - gmp_addr_string adcat_ent_addr; /* The address itself */ - ordinal_t adcat_ent_ord; /* Address ordinal */ - int32_t adcat_ent_refcount; /* Reference count */ + gmpx_patnode adcat_ent_addr_node; /* Address tree node */ + gmpx_patnode adcat_ent_ord_node; /* Ordinal tree node */ + gmp_addr_string adcat_ent_addr; /* The address itself */ + ordinal_t adcat_ent_ord; /* Address ordinal */ + int32_t adcat_ent_refcount; /* Reference count */ } gmp_addr_cat_entry; GMPX_PATNODE_TO_STRUCT(gmp_addr_patnode_to_addr_cat_entry, gmp_addr_cat_entry, - adcat_ent_addr_node); + adcat_ent_addr_node); GMPX_PATNODE_TO_STRUCT(gmp_ord_patnode_to_addr_cat_entry, gmp_addr_cat_entry, - adcat_ent_ord_node); + adcat_ent_ord_node); /* @@ -130,8 +130,8 @@ GMPX_PATNODE_TO_STRUCT(gmp_ord_patnode_to_addr_cat_entry, gmp_addr_cat_entry, */ typedef struct gmp_addr_vect_ { - bit_vector av_vector; /* Bit vector of addresses */ - gmp_addr_catalog *av_catalog; /* Address catalog */ + bit_vector av_vector; /* Bit vector of addresses */ + gmp_addr_catalog *av_catalog; /* Address catalog */ } gmp_addr_vect; @@ -145,7 +145,7 @@ static inline bit_vector * gmp_addr_vector (gmp_addr_vect *addr_vect) { if (addr_vect) - return &addr_vect->av_vector; + return &addr_vect->av_vector; return NULL; } @@ -191,32 +191,32 @@ gmp_addr_vector (gmp_addr_vect *addr_vect) typedef struct gmp_addr_list_ { gmp_addr_list_alloc_func addr_alloc; /* Allocation routine */ - gmp_addr_list_free_func addr_free; /* Free function */ - void *addr_context; /* Context for alloc/free */ - gmp_addr_vect addr_vect; /* Address vector */ - gmpx_patroot *addr_list_root; /* Root of patricia tree */ - thread addr_list_head; /* Head of address thread */ - int addr_count; /* Number of addresses in list */ - thread addr_list_xmit_head; /* Head of transmit list */ - int xmit_addr_count; /* Number of addresses in xmit list */ + gmp_addr_list_free_func addr_free; /* Free function */ + void *addr_context; /* Context for alloc/free */ + gmp_addr_vect addr_vect; /* Address vector */ + gmpx_patroot *addr_list_root; /* Root of patricia tree */ + thread addr_list_head; /* Head of address thread */ + int addr_count; /* Number of addresses in list */ + thread addr_list_xmit_head; /* Head of transmit list */ + int xmit_addr_count; /* Number of addresses in xmit list */ } gmp_addr_list; /* Address list entry */ typedef struct gmp_addr_list_entry_ { - gmp_addr_list *addr_ent_list; /* Pointer to owning address list */ - gmpx_patnode addr_ent_patnode; /* Patricia tree node */ - thread addr_ent_thread; /* Entry on list thread */ - thread addr_ent_xmit_thread; /* Entry on transmit thread */ - ordinal_t addr_ent_ord; /* Address ordinal */ + gmp_addr_list *addr_ent_list; /* Pointer to owning address list */ + gmpx_patnode addr_ent_patnode; /* Patricia tree node */ + thread addr_ent_thread; /* Entry on list thread */ + thread addr_ent_xmit_thread; /* Entry on transmit thread */ + ordinal_t addr_ent_ord; /* Address ordinal */ } gmp_addr_list_entry; GMPX_PATNODE_TO_STRUCT(gmp_patnode_to_addr_list_entry, gmp_addr_list_entry, - addr_ent_patnode); + addr_ent_patnode); THREAD_TO_STRUCT(gmp_thread_to_addr_list_entry, gmp_addr_list_entry, - addr_ent_thread); + addr_ent_thread); THREAD_TO_STRUCT(gmp_xmit_thread_to_addr_list_entry, gmp_addr_list_entry, - addr_ent_xmit_thread); + addr_ent_xmit_thread); /* @@ -245,14 +245,14 @@ THREAD_TO_STRUCT(gmp_xmit_thread_to_addr_list_entry, gmp_addr_list_entry, * as the associated address catalog necessarily belongs to the client. */ typedef struct gmp_query_packet_ { - uint32_t gmp_query_max_resp; /* Max resp value, in msec */ - gmp_addr_string gmp_query_group; /* Group address */ - void *gmp_query_group_id; /* Opaque group ID */ - boolean gmp_query_group_query; /* TRUE if a group query */ - boolean gmp_query_suppress; /* Suppress router-side processing */ - uint32_t gmp_query_qrv; /* Querier's robustness variable */ - uint32_t gmp_query_qqi; /* Querier's query interval (msec) */ - gmp_addr_list *gmp_query_xmit_srcs; /* List of sources (xmit) */ + uint32_t gmp_query_max_resp; /* Max resp value, in msec */ + gmp_addr_string gmp_query_group; /* Group address */ + void *gmp_query_group_id; /* Opaque group ID */ + boolean gmp_query_group_query; /* TRUE if a group query */ + boolean gmp_query_suppress; /* Suppress router-side processing */ + uint32_t gmp_query_qrv; /* Querier's robustness variable */ + uint32_t gmp_query_qqi; /* Querier's query interval (msec) */ + gmp_addr_list *gmp_query_xmit_srcs; /* List of sources (xmit) */ gmp_addr_thread *gmp_query_rcv_srcs; /* Sources (receive) */ } gmp_query_packet; @@ -265,8 +265,8 @@ typedef struct gmp_query_packet_ { * Each group record includes an address list of sources (if any.) */ typedef struct gmp_report_packet_ { - thread gmp_report_group_head; /* Head of thread of group records */ - uint32_t gmp_report_group_count; /* Number of group records */ + thread gmp_report_group_head; /* Head of thread of group records */ + uint32_t gmp_report_group_count; /* Number of group records */ } gmp_report_packet; @@ -277,15 +277,15 @@ typedef struct gmp_report_packet_ { * use those protocol values as our internal form as well. */ typedef enum { - GMP_RPT_INVALID = 0, /* Invalid type */ - GMP_RPT_IS_IN = 1, /* MODE_IS_INCLUDE */ - GMP_RPT_IS_EX = 2, /* MODE_IS_EXCLUDE */ - GMP_RPT_TO_IN = 3, /* CHANGE_TO_INCLUDE_MODE */ - GMP_RPT_TO_EX = 4, /* CHANGE_TO_EXCLUDE_MODE */ - GMP_RPT_ALLOW = 5, /* ALLOW_NEW_SOURCES */ - GMP_RPT_BLOCK = 6, /* BLOCK_OLD_SOURCES */ - GMP_RPT_MIN = GMP_RPT_IS_IN, /* Minimum value */ - GMP_RPT_MAX = GMP_RPT_BLOCK, /* Maximum value */ + GMP_RPT_INVALID = 0, /* Invalid type */ + GMP_RPT_IS_IN = 1, /* MODE_IS_INCLUDE */ + GMP_RPT_IS_EX = 2, /* MODE_IS_EXCLUDE */ + GMP_RPT_TO_IN = 3, /* CHANGE_TO_INCLUDE_MODE */ + GMP_RPT_TO_EX = 4, /* CHANGE_TO_EXCLUDE_MODE */ + GMP_RPT_ALLOW = 5, /* ALLOW_NEW_SOURCES */ + GMP_RPT_BLOCK = 6, /* BLOCK_OLD_SOURCES */ + GMP_RPT_MIN = GMP_RPT_IS_IN, /* Minimum value */ + GMP_RPT_MAX = GMP_RPT_BLOCK, /* Maximum value */ } gmp_report_rectype; @@ -296,21 +296,21 @@ typedef enum { * set of sources on transmit, and an address thread on receive. */ typedef struct gmp_report_group_record_ { - void *gmp_rpt_group_id; /* Opaque group ID */ - thread gmp_rpt_thread; /* Entry on thread */ - gmp_report_rectype gmp_rpt_type; /* Record type */ - gmp_addr_string gmp_rpt_group; /* Group address */ - gmp_addr_list *gmp_rpt_xmit_srcs; /* List of source addresses (xmit) */ - gmp_addr_thread *gmp_rpt_rcv_srcs; /* List of source addresses (rcv) */ + void *gmp_rpt_group_id; /* Opaque group ID */ + thread gmp_rpt_thread; /* Entry on thread */ + gmp_report_rectype gmp_rpt_type; /* Record type */ + gmp_addr_string gmp_rpt_group; /* Group address */ + gmp_addr_list *gmp_rpt_xmit_srcs; /* List of source addresses (xmit) */ + gmp_addr_thread *gmp_rpt_rcv_srcs; /* List of source addresses (rcv) */ } gmp_report_group_record; THREAD_TO_STRUCT(gmp_thread_to_report_group_record, gmp_report_group_record, - gmp_rpt_thread); + gmp_rpt_thread); typedef enum { - GMP_QUERY_PACKET, /* Query */ - GMP_REPORT_PACKET, /* Report */ + GMP_QUERY_PACKET, /* Query */ + GMP_REPORT_PACKET, /* Report */ GMP_NUM_PACKET_TYPES } gmp_message_type; @@ -321,15 +321,15 @@ typedef enum { * be determined by the message type. */ struct gmp_packet_ { - gmp_version gmp_packet_version; /* Packet version (generic) */ - gmp_message_type gmp_packet_type; /* Packet type */ + gmp_version gmp_packet_version; /* Packet version (generic) */ + gmp_message_type gmp_packet_type; /* Packet type */ gmp_addr_string gmp_packet_src_addr; /* Source address */ gmp_addr_string gmp_packet_dest_addr; /* Destination address */ - gmp_proto gmp_packet_proto; /* Protocol (IGMP/MLD) */ - gmpx_packet_attr gmp_packet_attr; /* Opaque attribute */ + gmp_proto gmp_packet_proto; /* Protocol (IGMP/MLD) */ + gmpx_packet_attr gmp_packet_attr; /* Opaque attribute */ union { - gmp_query_packet gmp_packet_query; /* Query packet */ - gmp_report_packet gmp_packet_report; /* Report packet */ + gmp_query_packet gmp_packet_query; /* Query packet */ + gmp_report_packet gmp_packet_report; /* Report packet */ } gmp_packet_contents; }; @@ -342,8 +342,8 @@ struct gmp_packet_ { * routines use it as well. */ struct gmp_addr_thread_ { - thread gmp_addr_thread_head; /* Head of address thread */ - uint32_t gmp_addr_thread_count; /* Count of entries */ + thread gmp_addr_thread_head; /* Head of address thread */ + uint32_t gmp_addr_thread_count; /* Count of entries */ }; @@ -353,11 +353,11 @@ struct gmp_addr_thread_ { * An entry in an address thread. */ struct gmp_addr_thread_entry_ { - thread gmp_adth_thread; /* Entry on address thread */ - gmp_addr_string gmp_adth_addr; /* Address */ + thread gmp_adth_thread; /* Entry on address thread */ + gmp_addr_string gmp_adth_addr; /* Address */ }; THREAD_TO_STRUCT(gmp_adth_thread_to_thread_entry, gmp_addr_thread_entry, - gmp_adth_thread); + gmp_adth_thread); /* @@ -375,8 +375,8 @@ THREAD_TO_STRUCT(gmp_adth_thread_to_thread_entry, gmp_addr_thread_entry, * unknown at that point.) */ typedef gmp_packet * (*gmp_xmit_callback_func)(gmpx_intf_id intf_id, - gmp_proto proto, - uint32_t buffer_len); + gmp_proto proto, + uint32_t buffer_len); /* @@ -423,29 +423,29 @@ gmp_translate_version (gmp_proto proto, uint32_t version) switch (proto) { case GMP_PROTO_IGMP: - switch (version) { - case GMP_IGMP_VERSION_1: - return GMP_VERSION_BASIC; - case GMP_IGMP_VERSION_2: - return GMP_VERSION_LEAVES; - case GMP_IGMP_VERSION_3: - return GMP_VERSION_SOURCES; - default: - return GMP_VERSION_INVALID; - } + switch (version) { + case GMP_IGMP_VERSION_1: + return GMP_VERSION_BASIC; + case GMP_IGMP_VERSION_2: + return GMP_VERSION_LEAVES; + case GMP_IGMP_VERSION_3: + return GMP_VERSION_SOURCES; + default: + return GMP_VERSION_INVALID; + } case GMP_PROTO_MLD: - switch (version) { - case GMP_MLD_VERSION_1: - return GMP_VERSION_LEAVES; - case GMP_MLD_VERSION_2: - return GMP_VERSION_SOURCES; - default: - return GMP_VERSION_INVALID; - } + switch (version) { + case GMP_MLD_VERSION_1: + return GMP_VERSION_LEAVES; + case GMP_MLD_VERSION_2: + return GMP_VERSION_SOURCES; + default: + return GMP_VERSION_INVALID; + } default: - return GMP_VERSION_INVALID; + return GMP_VERSION_INVALID; } } @@ -459,29 +459,29 @@ gmp_untranslate_version (gmp_proto proto, gmp_version version) { switch (proto) { case GMP_PROTO_IGMP: - switch (version) { - case GMP_VERSION_BASIC: - return GMP_IGMP_VERSION_1; - case GMP_VERSION_LEAVES: - return GMP_IGMP_VERSION_2; - case GMP_VERSION_SOURCES: - return GMP_IGMP_VERSION_3; - default: - return GMP_IGMP_VERSION_UNSPEC; - } - break; + switch (version) { + case GMP_VERSION_BASIC: + return GMP_IGMP_VERSION_1; + case GMP_VERSION_LEAVES: + return GMP_IGMP_VERSION_2; + case GMP_VERSION_SOURCES: + return GMP_IGMP_VERSION_3; + default: + return GMP_IGMP_VERSION_UNSPEC; + } + break; case GMP_PROTO_MLD: - switch (version) { - case GMP_VERSION_LEAVES: - return GMP_MLD_VERSION_1; - case GMP_VERSION_SOURCES: - return GMP_MLD_VERSION_2; - default: - return GMP_MLD_VERSION_UNSPEC; - } - break; + switch (version) { + case GMP_VERSION_LEAVES: + return GMP_MLD_VERSION_1; + case GMP_VERSION_SOURCES: + return GMP_MLD_VERSION_2; + default: + return GMP_MLD_VERSION_UNSPEC; + } + break; default: - break; + break; } /* Shouldn't reach here */ @@ -503,27 +503,27 @@ gmp_addr_in_list (gmp_addr_list *addr_list, ordinal_t ordinal) /* * Externals - */ + */ /* gmp_addrlist.c */ extern void gmp_common_init(void); extern int gmp_addr_vect_fill(gmp_addr_vect *addr_vect, - gmp_addr_thread *addr_thread); + gmp_addr_thread *addr_thread); extern void gmp_addr_list_clean(gmp_addr_list *addr_list); extern void gmp_free_generic_addr_list_entry(gmp_addr_list_entry *addr_entry); extern void gmp_flush_addr_list(gmp_addr_list *addr_list); extern int gmp_add_addr_list_entry(gmp_addr_list *addr_list, - gmp_addr_list_entry *addr_entry); + gmp_addr_list_entry *addr_entry); extern gmp_addr_list_entry *gmp_lookup_addr_entry(gmp_addr_list *addr_list, - ordinal_t ordinal); -extern gmp_addr_list_entry + ordinal_t ordinal); +extern gmp_addr_list_entry *gmp_addr_list_next_entry(gmp_addr_list *list, gmp_addr_list_entry *prev); extern void gmp_addr_list_init(gmp_addr_list *list, gmp_addr_catalog *catalog, - gmp_addr_list_alloc_func alloc_func, - gmp_addr_list_free_func free_func, - void *context); + gmp_addr_list_alloc_func alloc_func, + gmp_addr_list_free_func free_func, + void *context); extern void gmp_enqueue_xmit_addr_entry(gmp_addr_list_entry *addr_entry); extern void gmp_dequeue_xmit_addr_entry(gmp_addr_list_entry *addr_entry); extern gmp_addr_list_entry * @@ -536,71 +536,71 @@ extern boolean gmp_xmit_addr_list_empty(gmp_addr_list *list); extern int gmp_addr_vect_set(gmp_addr_vect *vector, gmp_addr_string *addr); extern void gmp_addr_vect_clean(gmp_addr_vect *vector); extern void gmp_init_addr_vector(gmp_addr_vect *vector, - gmp_addr_catalog *catalog); + gmp_addr_catalog *catalog); extern void gmp_destroy_addr_catalog(gmp_addr_catalog *catalog); extern int gmp_init_addr_catalog(gmp_addr_catalog *catalog, - uint32_t addr_len); + uint32_t addr_len); extern gmp_addr_cat_entry * gmp_get_addr_cat_by_ordinal(gmp_addr_catalog *catalog, ordinal_t ordinal); extern ordinal_t gmp_lookup_create_addr_cat_entry(gmp_addr_catalog *catalog, - uint8_t *addr); + uint8_t *addr); extern gmp_addr_cat_entry *gmp_lookup_addr_cat_entry(gmp_addr_catalog *catalog, - const uint8_t *addr); + const uint8_t *addr); extern void gmp_lock_adcat_entry(gmp_addr_catalog *catalog, ordinal_t ordinal); extern void gmp_unlock_adcat_entry(gmp_addr_catalog *catalog, - ordinal_t ordinal); + ordinal_t ordinal); extern int gmp_addr_vect_inter(gmp_addr_vect *src1, gmp_addr_vect *src2, - gmp_addr_vect *dest, bv_callback callback, - void *context, bv_callback_option cb_opt); + gmp_addr_vect *dest, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int gmp_addr_vect_union(gmp_addr_vect *src1, gmp_addr_vect *src2, - gmp_addr_vect *dest, bv_callback callback, - void *context, bv_callback_option cb_opt); + gmp_addr_vect *dest, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int gmp_addr_vect_minus(gmp_addr_vect *src1, gmp_addr_vect *src2, - gmp_addr_vect *dest, bv_callback callback, - void *context, bv_callback_option cb_opt); + gmp_addr_vect *dest, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int gmp_addr_vect_compare (gmp_addr_vect *src1, gmp_addr_vect *src2, - bv_callback callback, void *context); + bv_callback callback, void *context); extern int gmp_addr_vect_walk(gmp_addr_vect *vect, bv_callback callback, - void *context); + void *context); extern int gmp_build_addr_list(gmp_addr_list *addr_list, - gmp_addr_vect *vector); + gmp_addr_vect *vector); extern boolean gmp_addr_list_copy_cb(void *context, bv_bitnum_t bitnum, - boolean new_val, boolean old_val); + boolean new_val, boolean old_val); extern gmp_addr_list_entry *gmp_alloc_generic_addr_list_entry(void *context); extern gmp_addr_list_entry * gmp_create_addr_list_entry(gmp_addr_list *addr_list, ordinal_t ordinal); extern void gmp_move_addr_list_entry(gmp_addr_list *to_list, - gmp_addr_list_entry *addr_entry); + gmp_addr_list_entry *addr_entry); extern boolean gmp_addr_vect_empty(gmp_addr_vect *vector); extern boolean gmp_addr_is_zero(gmp_addr_string *addr, uint32_t addr_len); /* gmpp_proto.c */ extern void gmpp_start_xmit(gmp_role role, gmp_proto proto, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpp_register(gmp_role role, gmp_xmit_callback_func xmit_callback, - gmp_rcv_callback_func rcv_callback, - gmp_group_done_callback_func group_done_callback, - gmp_packet_free_callback_func packet_free_callback); + gmp_rcv_callback_func rcv_callback, + gmp_group_done_callback_func group_done_callback, + gmp_packet_free_callback_func packet_free_callback); extern void gmpp_deregister(gmp_role role); extern void gmpp_enab_disab_proto(gmp_role role, gmp_proto proto, - boolean enabled); + boolean enabled); extern gmp_packet *gmpp_create_packet_header(gmp_version version, - gmp_message_type message_type, - gmp_proto proto); + gmp_message_type message_type, + gmp_proto proto); extern void gmpp_destroy_packet(gmp_packet *packet); extern gmp_report_group_record * gmpp_create_group_record(gmp_report_packet *report_packet, void *group_id, - const uint8_t *group_addr, uint32_t addr_len); + const uint8_t *group_addr, uint32_t addr_len); extern void gmpp_init(void); extern gmp_packet *gmpp_next_xmit_packet(gmp_role role, gmp_proto proto, - gmpx_intf_id intf_id, - uint32_t buffer_len); + gmpx_intf_id intf_id, + uint32_t buffer_len); extern void gmpp_group_done(gmp_role role, gmp_proto proto, void *group_id); extern void gmpp_packet_done(gmp_role role, gmp_proto proto, - gmp_packet *packet); + gmp_packet *packet); extern void gmpp_process_rcv_packet(gmp_packet *packet, gmpx_intf_id intf_id); extern uint32_t gmpp_max_group_count(gmp_proto proto, gmp_version version, - gmp_message_type msg_type, uint32_t buffer_len); + gmp_message_type msg_type, uint32_t buffer_len); #endif /* __GMP_PRIVATE_H__ */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp_router.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp_router.h index f7b082c8c08..47b705f4f4e 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp_router.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp_router.h @@ -59,7 +59,7 @@ * sources for the group must be discarded. Once the mode is * established, ALLOW and BLOCK calls are used to modify the source * address set. - * + * * Note that an ADD_INCL notification is guaranteed to be followed by * at least one ALLOW; group deletions are handled by GROUP_DELETE, * and there are no null Includes. The client can create group state @@ -150,10 +150,10 @@ typedef void (*gmpr_notif_cb)(void *cli_context); * by policy.) */ typedef boolean (*gmpr_oif_map_cb)(void *inst_context, - gmpx_intf_id rcv_if, - uint8_t *group_addr, - uint8_t *source_addr, - gmpx_intf_id *output_if); + gmpx_intf_id rcv_if, + uint8_t *group_addr, + uint8_t *source_addr, + gmpx_intf_id *output_if); /* * Policy callback type @@ -163,10 +163,10 @@ typedef boolean (*gmpr_oif_map_cb)(void *inst_context, * report is allowed, or FALSE if not. */ typedef boolean (*gmpr_policy_cb)(void *inst_context, - gmpx_intf_id rcv_if, - uint8_t *group_addr, - uint8_t *source_addr, - gmpx_packet_attr attribute); + gmpx_intf_id rcv_if, + uint8_t *group_addr, + uint8_t *source_addr, + gmpx_packet_attr attribute); /* * SSM check callback type @@ -177,8 +177,8 @@ typedef boolean (*gmpr_policy_cb)(void *inst_context, * allowed, or FALSE if not. */ typedef boolean (*gmpr_ssm_check_cb)(void *inst_context, - gmpx_intf_id rcv_if, - uint8_t *group_addr); + gmpx_intf_id rcv_if, + uint8_t *group_addr); /* * Querier change callback type @@ -186,14 +186,14 @@ typedef boolean (*gmpr_ssm_check_cb)(void *inst_context, * This defines the callback to a client when the querier status changes. */ typedef void (*gmpr_querier_cb)(void *cli_context, gmpx_intf_id intf, - boolean querier, uint8_t *querier_addr); + boolean querier, uint8_t *querier_addr); /* * Router-side instance context block */ typedef struct gmpr_instance_context_ { - gmpr_oif_map_cb rctx_oif_map_cb; /* OIF mapping callback */ - gmpr_policy_cb rctx_policy_cb; /* Multicast policy callback */ + gmpr_oif_map_cb rctx_oif_map_cb; /* OIF mapping callback */ + gmpr_policy_cb rctx_policy_cb; /* Multicast policy callback */ gmpr_ssm_check_cb rctx_ssm_check_cb; /* SSM check callback */ } gmpr_instance_context; @@ -207,11 +207,11 @@ typedef struct gmpr_instance_context_ { * At least one of these must be set. */ typedef struct gmpr_client_context_ { - gmpr_notif_cb rctx_notif_cb; /* Notification callback */ - gmpr_notif_cb rctx_host_notif_cb; /* Host notification callback */ - gmpr_querier_cb rctx_querier_cb; /* Querier change callback */ - boolean rctx_delta_notifications; /* TRUE if client wants deltas */ - boolean rctx_full_notifications; /* TRUE if client wants full state */ + gmpr_notif_cb rctx_notif_cb; /* Notification callback */ + gmpr_notif_cb rctx_host_notif_cb; /* Host notification callback */ + gmpr_querier_cb rctx_querier_cb; /* Querier change callback */ + boolean rctx_delta_notifications; /* TRUE if client wants deltas */ + boolean rctx_full_notifications; /* TRUE if client wants full state */ } gmpr_client_context; @@ -229,22 +229,22 @@ typedef struct gmpr_client_context_ { * delvered in a GROUP_STATE notification. */ typedef enum { - GMPR_NOTIF_GROUP_DELETE, /* Delete group */ - GMPR_NOTIF_GROUP_ADD_EXCL, /* Add group in Exclude mode */ - GMPR_NOTIF_GROUP_ADD_INCL, /* Add group in Include mode */ - GMPR_NOTIF_ALLOW_SOURCE, /* Allow traffic for source */ - GMPR_NOTIF_BLOCK_SOURCE, /* Block traffic to source */ - GMPR_NOTIF_REFRESH_END, /* End of refresh stream */ - GMPR_NOTIF_GROUP_STATE, /* Complete group state */ + GMPR_NOTIF_GROUP_DELETE, /* Delete group */ + GMPR_NOTIF_GROUP_ADD_EXCL, /* Add group in Exclude mode */ + GMPR_NOTIF_GROUP_ADD_INCL, /* Add group in Include mode */ + GMPR_NOTIF_ALLOW_SOURCE, /* Allow traffic for source */ + GMPR_NOTIF_BLOCK_SOURCE, /* Block traffic to source */ + GMPR_NOTIF_REFRESH_END, /* End of refresh stream */ + GMPR_NOTIF_GROUP_STATE, /* Complete group state */ } gmpr_client_notification_type; typedef struct gmpr_client_notification_ { - gmpx_intf_id notif_intf_id; /* Interface ID */ - gmp_addr_string notif_group_addr; /* Group address */ - gmpr_client_notification_type notif_type; /* Notification type */ - gmp_addr_string notif_source_addr; /* Source address if applicable */ - gmp_filter_mode notif_filter_mode; /* Current group filter mode */ - gmp_addr_thread *notif_addr_thread; /* Address thread if GROUP_STATE */ + gmpx_intf_id notif_intf_id; /* Interface ID */ + gmp_addr_string notif_group_addr; /* Group address */ + gmpr_client_notification_type notif_type; /* Notification type */ + gmp_addr_string notif_source_addr; /* Source address if applicable */ + gmp_filter_mode notif_filter_mode; /* Current group filter mode */ + gmp_addr_thread *notif_addr_thread; /* Address thread if GROUP_STATE */ boolean notif_last_sg; /* Last (s,g) for the same group? */ } gmpr_client_notification; @@ -259,19 +259,19 @@ typedef struct gmpr_client_notification_ { * is enabled. */ typedef enum { - GMPR_NOTIF_HOST_UNKNOWN, /* We don't know yet */ - GMPR_NOTIF_HOST_JOIN, /* Join a *,G or S,G */ - GMPR_NOTIF_HOST_LEAVE, /* Leave a *,G or S,G */ - GMPR_NOTIF_HOST_TIMEOUT, /* Leave due to a host timeout */ - GMPR_NOTIF_HOST_IFDOWN, /* Leave due to interface down */ + GMPR_NOTIF_HOST_UNKNOWN, /* We don't know yet */ + GMPR_NOTIF_HOST_JOIN, /* Join a *,G or S,G */ + GMPR_NOTIF_HOST_LEAVE, /* Leave a *,G or S,G */ + GMPR_NOTIF_HOST_TIMEOUT, /* Leave due to a host timeout */ + GMPR_NOTIF_HOST_IFDOWN, /* Leave due to interface down */ } gmpr_client_host_notification_type; typedef struct gmpr_client_host_notification_ { gmpr_client_host_notification_type host_notif_type; /* Notification type */ - gmpx_intf_id host_notif_intf_id; /* Interface ID */ + gmpx_intf_id host_notif_intf_id; /* Interface ID */ gmp_addr_string host_notif_group_addr; /* Group address */ gmp_addr_string host_notif_source_addr; /* Source address or 0 */ - boolean host_notif_source_present; /* TRUE if source address present */ + boolean host_notif_source_present; /* TRUE if source address present */ gmp_addr_string host_notif_host_addr; /* Host address */ } gmpr_client_host_notification; @@ -283,11 +283,11 @@ typedef struct gmpr_client_host_notification_ { * by gmpr_free_intf_list() when it is processed. */ -#define GMPR_INTF_LIST_SIZE 10 /* Number of interfaces per entry */ +#define GMPR_INTF_LIST_SIZE 10 /* Number of interfaces per entry */ typedef struct gmpr_client_intf_list_ { struct gmpr_client_intf_list_ *gci_next; /* Next entry */ - uint32_t gci_intf_count; /* Number of entries */ + uint32_t gci_intf_count; /* Number of entries */ gmpx_intf_id gci_intfs[GMPR_INTF_LIST_SIZE]; /* Array of entries */ } gmpr_client_intf_list; @@ -303,9 +303,9 @@ typedef struct gmpr_client_intf_list_ { */ typedef struct gmpr_intf_group_entry_ { struct gmpr_intf_group_entry_ *gig_next; /* Next entry */ - gmp_addr_string gig_group_addr; /* Group address */ - gmp_filter_mode gig_filter_mode; /* Filter mode */ - gmp_addr_thread *gig_sources; /* Source list, or NULL */ + gmp_addr_string gig_group_addr; /* Group address */ + gmp_filter_mode gig_filter_mode; /* Filter mode */ + gmp_addr_thread *gig_sources; /* Source list, or NULL */ } gmpr_intf_group_entry; @@ -320,7 +320,7 @@ typedef struct gmpr_intf_group_entry_ { */ typedef struct gmpr_intf_host_entry_ { struct gmpr_intf_host_entry_ *gih_next; /* Next entry */ - gmp_addr_string gih_host_addr; /* Host address */ + gmp_addr_string gih_host_addr; /* Host address */ } gmpr_intf_host_entry; @@ -328,55 +328,55 @@ typedef struct gmpr_intf_host_entry_ { * External references */ extern gmp_instance_id gmpr_create_instance(gmp_proto proto, - void *inst_context, - gmpr_instance_context *context); + void *inst_context, + gmpr_instance_context *context); extern void gmpr_destroy_instance(gmp_instance_id instance_id); extern gmp_client_id gmpr_register(gmp_instance_id instance_id, - void *cli_context, - gmpr_client_context *context); + void *cli_context, + gmpr_client_context *context); extern void gmpr_detach(gmp_client_id client_id); extern void gmpr_refresh(gmp_client_id client_id, boolean flush); extern void gmpr_refresh_intf(gmp_client_id client_id, gmpx_intf_id intf_id, - boolean flush); + boolean flush); extern void gmpr_refresh_host_state(gmp_client_id client_id); extern int gmpr_attach_intf(gmp_instance_id instance_id, gmpx_intf_id intf_id); extern int gmpr_detach_intf(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern int gmpr_set_intf_params(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - gmpr_intf_params *params); -extern void gmpr_chk_grp_limit(gmp_instance_id instance_id, + gmpx_intf_id intf_id, + gmpr_intf_params *params); +extern void gmpr_chk_grp_limit(gmp_instance_id instance_id, gmpx_intf_id intf_id); extern int gmpr_disable_host_tracking(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern gmpr_client_notification * gmpr_get_notification(gmp_client_id client_id, - gmpr_client_notification *last_notification); + gmpr_client_notification *last_notification); extern void gmpr_return_notification(gmpr_client_notification *notification); extern gmpr_client_host_notification * gmpr_get_host_notification(gmp_client_id client_id, - gmpr_client_host_notification *last_notification); + gmpr_client_host_notification *last_notification); extern void gmpr_return_host_notification( - gmpr_client_host_notification *host_notif); + gmpr_client_host_notification *host_notif); extern boolean gmpr_notification_last_sg(gmpr_client_notification *notification); typedef enum {INTF_LIST_LOOSE, INTF_LIST_STRICT} gmpr_intf_list_match; extern gmpr_client_intf_list *gmpr_get_intf_list(gmp_instance_id instance_id, - uint8_t *group_addr, - uint8_t *source_addr, - gmpr_intf_list_match type); + uint8_t *group_addr, + uint8_t *source_addr, + gmpr_intf_list_match type); extern void gmpr_free_intf_list(gmpr_client_intf_list *intf_list); extern boolean gmpr_is_forwarding_channel(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - const uint8_t *source_addr, - const uint8_t *group_addr, boolean exact); + gmpx_intf_id intf_id, + const uint8_t *source_addr, + const uint8_t *group_addr, boolean exact); extern void gmpr_update_intf_state(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - const uint8_t *intf_addr); + gmpx_intf_id intf_id, + const uint8_t *intf_addr); extern gmpr_intf_group_entry *gmpr_get_intf_groups(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern gmpr_intf_group_entry *gmpr_get_host_groups(gmp_instance_id instance_id, gmpx_intf_id intf_id, const uint8_t *host_addr); @@ -386,23 +386,23 @@ extern void gmpr_destroy_intf_group(gmpr_intf_group_entry *group_list); extern void gmpr_destroy_intf_host(gmpr_intf_host_entry *host_list); extern boolean gmpr_is_initialized(void); extern void gmpr_timeout_group_range(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - const uint8_t *group_addr, - uint32_t pfx_len, boolean send_query); + gmpx_intf_id intf_id, + const uint8_t *group_addr, + uint32_t pfx_len, boolean send_query); extern boolean gmpr_sg_is_excluded(gmp_instance_id instance_id, - gmpx_intf_id intf_id, - const uint8_t *group_addr, - const uint8_t *source_addr); + gmpx_intf_id intf_id, + const uint8_t *group_addr, + const uint8_t *source_addr); extern void gmpr_update_trace_flags(gmp_instance_id instance_id, - uint32_t trace_flags); + uint32_t trace_flags); extern void gmpr_force_general_queries(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_request_general_queries(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_force_one_general_query(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_request_one_general_query(gmp_instance_id instance_id, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_notify_oif_map_change (gmp_proto proto, gmpx_intf_id intf_id); #endif /* __GMP_ROUTER_H__ */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmp_trace.h b/src/vnsw/agent/services/multicast/grpmgmt/gmp_trace.h index 47902c7c472..fa814418c8d 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmp_trace.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmp_trace.h @@ -10,18 +10,18 @@ /* Packet tracing flags */ -#define GMP_TRACE_QUERY 0x00000001 /* Query packets */ -#define GMP_TRACE_QUERY_DETAIL 0x00000002 /* Detailed query packets */ -#define GMP_TRACE_REPORT 0x00000004 /* Report packets */ +#define GMP_TRACE_QUERY 0x00000001 /* Query packets */ +#define GMP_TRACE_QUERY_DETAIL 0x00000002 /* Detailed query packets */ +#define GMP_TRACE_REPORT 0x00000004 /* Report packets */ #define GMP_TRACE_REPORT_DETAIL 0x00000008 /* Detailed report packets */ -#define GMP_TRACE_LEAVE 0x00000010 /* Leave packets */ -#define GMP_TRACE_LEAVE_DETAIL 0x00000020 /* Detailed leave packets */ -#define GMP_TRACE_PACKET_BAD 0x00000040 /* Bad packets */ +#define GMP_TRACE_LEAVE 0x00000010 /* Leave packets */ +#define GMP_TRACE_LEAVE_DETAIL 0x00000020 /* Detailed leave packets */ +#define GMP_TRACE_PACKET_BAD 0x00000040 /* Bad packets */ #define GMP_TRACE_PACKET (GMP_TRACE_QUERY | GMP_TRACE_REPORT | \ - GMP_TRACE_LEAVE) /* Packets */ + GMP_TRACE_LEAVE) /* Packets */ #define GMP_TRACE_PACKET_DETAIL (GMP_TRACE_QUERY_DETAIL | \ - GMP_TRACE_REPORT_DETAIL | \ - GMP_TRACE_LEAVE_DETAIL) /* Detail packets */ + GMP_TRACE_REPORT_DETAIL | \ + GMP_TRACE_LEAVE_DETAIL) /* Detail packets */ /* * gmp_trace_set @@ -36,12 +36,12 @@ gmp_trace_set (uint32_t traceflags, uint32_t tracebits) /* * gmp_trace - * + * * Conditionally trace. */ #define gmp_trace(context, traceflags, flag, ...) \ if (gmp_trace_set((traceflags), (flag))) \ - gmpx_trace((context), __VA_ARGS__) + gmpx_trace((context), __VA_ARGS__) extern const char *gmp_proto_string(gmp_proto proto); extern const char *gmp_filter_mode_string(gmp_filter_mode mode); diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmph_private.h b/src/vnsw/agent/services/multicast/grpmgmt/gmph_private.h index e1f9ac9d540..9aa5dfff236 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmph_private.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmph_private.h @@ -28,29 +28,29 @@ * by interface ID on little-endian machines. */ typedef struct gmph_instance_ { - u_int32_t hinst_magic; /* Magic number for robustness */ - thread hinst_thread; /* Link on global instance thread */ - thread hinst_client_thread; /* Head of client thread */ - gmp_addr_catalog hinst_addr_cat; /* Address catalog */ + u_int32_t hinst_magic; /* Magic number for robustness */ + thread hinst_thread; /* Link on global instance thread */ + thread hinst_client_thread; /* Head of client thread */ + gmp_addr_catalog hinst_addr_cat; /* Address catalog */ - void *hinst_context; /* External context */ + void *hinst_context; /* External context */ - gmpx_patroot *hinst_intfs; /* Tree of interfaces */ - gmp_proto hinst_proto; /* Protocol (IGMP/MLD) */ - u_int hinst_addrlen; /* Address length (v4 or v6) */ - gmpx_timer *hinst_master_clock; /* Timer for timekeeping */ + gmpx_patroot *hinst_intfs; /* Tree of interfaces */ + gmp_proto hinst_proto; /* Protocol (IGMP/MLD) */ + u_int hinst_addrlen; /* Address length (v4 or v6) */ + gmpx_timer *hinst_master_clock; /* Timer for timekeeping */ } gmph_instance; THREAD_TO_STRUCT(gmph_thread_to_instance, gmph_instance, hinst_thread); -#define GMPH_INSTANCE_MAGIC 0x48696E73 /* 'Hins' */ +#define GMPH_INSTANCE_MAGIC 0x48696E73 /* 'Hins' */ /* An enum to define report types. */ typedef enum { - GMP_CHANGE_RECORD, /* Change record */ - GMP_CURRENT_STATE /* Current state */ + GMP_CHANGE_RECORD, /* Change record */ + GMP_CURRENT_STATE /* Current state */ } gmph_report_type; @@ -79,45 +79,45 @@ typedef enum { * definition of gmph_group about how this works. */ typedef struct gmph_intf_ { - gmph_instance *hintf_instance; /* Owning instance */ - gmpx_patnode hintf_inst_patnode; /* Node on instance tree */ - gmpx_patnode hintf_global_patnode; /* Node on global tree */ - gmpx_intf_id hintf_id; /* Interface ID */ - gmp_addr_string hintf_local_addr; /* Local interface address */ + gmph_instance *hintf_instance; /* Owning instance */ + gmpx_patnode hintf_inst_patnode; /* Node on instance tree */ + gmpx_patnode hintf_global_patnode; /* Node on global tree */ + gmpx_intf_id hintf_id; /* Interface ID */ + gmp_addr_string hintf_local_addr; /* Local interface address */ - thread hintf_xmit_head; /* Head of xmit groups */ + thread hintf_xmit_head; /* Head of xmit groups */ gmph_report_type hintf_last_report_type; /* Last report type sent */ - gmp_version hintf_ver; /* GMP version running */ - gmp_version hintf_cfg_ver; /* Configured max version */ - u_int8_t hintf_robustness; /* Robustness variable */ + gmp_version hintf_ver; /* GMP version running */ + gmp_version hintf_cfg_ver; /* Configured max version */ + u_int8_t hintf_robustness; /* Robustness variable */ - u_int32_t hintf_unsol_rpt_ivl; /* Unsolicited report ivl (msec) */ + u_int32_t hintf_unsol_rpt_ivl; /* Unsolicited report ivl (msec) */ - gmpx_patroot *hintf_group_root; /* Root of aggregated group records */ + gmpx_patroot *hintf_group_root; /* Root of aggregated group records */ - gmpx_timer *hintf_gen_query_timer; /* General query response timer */ + gmpx_timer *hintf_gen_query_timer; /* General query response timer */ gmpx_timer *hintf_basic_querier; /* Basic version querier present */ gmpx_timer *hintf_leaves_querier; /* Leaves version querier present */ gmpx_timer *hintf_soft_detach_timer; /* Deferral for soft detach */ - u_int32_t hintf_last_query_time; /* Time of last query */ + u_int32_t hintf_last_query_time; /* Time of last query */ gmph_soft_detach_callback hintf_soft_detach_callback; - /* Callback after soft detach */ - void *hintf_soft_detach_context; /* User-supplied context */ + /* Callback after soft detach */ + void *hintf_soft_detach_context; /* User-supplied context */ - u_int32_t hintf_pending_xmit_count; /* # of groups and srcs pending xmit */ + u_int32_t hintf_pending_xmit_count; /* # of groups and srcs pending xmit */ - boolean hintf_suppress_reports; /* TRUE if report suppression is on */ - boolean hintf_xmit_pending; /* TRUE if we have a pending xmit */ - boolean hintf_passive; /* TRUE if passive (no xmits) */ + boolean hintf_suppress_reports; /* TRUE if report suppression is on */ + boolean hintf_xmit_pending; /* TRUE if we have a pending xmit */ + boolean hintf_passive; /* TRUE if passive (no xmits) */ } gmph_intf; GMPX_PATNODE_TO_STRUCT(gmph_inst_patnode_to_intf, gmph_intf, - hintf_inst_patnode); + hintf_inst_patnode); GMPX_PATNODE_TO_STRUCT(gmph_global_patnode_to_intf, gmph_intf, - hintf_global_patnode); + hintf_global_patnode); /* @@ -130,13 +130,13 @@ GMPX_PATNODE_TO_STRUCT(gmph_global_patnode_to_intf, gmph_intf, */ typedef struct gmph_rpt_msg_addr_entry_ { - gmp_addr_list_entry msg_addr_entry; /* Address entry */ - u_int msg_rexmit_count; /* Retransmission count */ + gmp_addr_list_entry msg_addr_entry; /* Address entry */ + u_int msg_rexmit_count; /* Retransmission count */ } gmph_rpt_msg_addr_entry; EMBEDDED_STRUCT_TO_STRUCT(gmph_addr_list_to_group_list, - gmph_rpt_msg_addr_entry, gmp_addr_list_entry, - msg_addr_entry); + gmph_rpt_msg_addr_entry, gmp_addr_list_entry, + msg_addr_entry); /* @@ -168,7 +168,7 @@ EMBEDDED_STRUCT_TO_STRUCT(gmph_addr_list_to_group_list, * hgroup_block_list * Same as hintf_allow_list, except for BLOCK or TO_EX records. * - * hgroup_query_list + * hgroup_query_list * The list of addresses being queried by the querier. The transmit * thread represents sources to be contained in replies to GSS * queries. The address entries are generic. @@ -176,13 +176,13 @@ EMBEDDED_STRUCT_TO_STRUCT(gmph_addr_list_to_group_list, * * Flags * - * hgroup_change_msg_due + * hgroup_change_msg_due * This flag indicates that a change message is due now for a * group. The flag is set when the change timer expires for the * group, and is cleared when all sources have been put into an * outgoing packet for the group (if there are many sources, they * may be split across multiple packets). - * + * * hgroup_reply_due * This flag indicates that a reply to a query is due now for a group. * The flag is set when the query response timer expires for the group, @@ -233,50 +233,50 @@ typedef struct gmph_group_ { /* Linkages */ - thread hgroup_client_thread; /* Head of thread of client groups */ - gmph_intf *hgroup_intf; /* Pointer back to interface */ - gmpx_patnode hgroup_intf_patnode; /* Node on interface tree of groups */ + thread hgroup_client_thread; /* Head of thread of client groups */ + gmph_intf *hgroup_intf; /* Pointer back to interface */ + gmpx_patnode hgroup_intf_patnode; /* Node on interface tree of groups */ /* Group state */ - gmp_addr_string hgroup_addr; /* Group address */ - gmp_filter_mode hgroup_filter_mode; /* Include/Exclude */ - gmp_addr_list hgroup_src_addr_list; /* Source address list */ + gmp_addr_string hgroup_addr; /* Group address */ + gmp_filter_mode hgroup_filter_mode; /* Include/Exclude */ + gmp_addr_list hgroup_src_addr_list; /* Source address list */ /* State-change report stuff */ - gmp_addr_list hgroup_allow_list; /* List of Allow entries to send */ - gmp_addr_list hgroup_block_list; /* List of Block entries to send */ + gmp_addr_list hgroup_allow_list; /* List of Allow entries to send */ + gmp_addr_list hgroup_block_list; /* List of Block entries to send */ gmpx_timer *hgroup_change_rpt_timer; /* Timer for sending change reports */ u_int hgroup_mode_change_rexmit_count; /* Mode change retransmit count */ /* Query reply stuff */ - gmpx_timer *hgroup_query_timer; /* For replying to group queries */ - gmp_addr_list hgroup_query_list; /* Addresses to which we must reply */ - boolean hgroup_last_reporter; /* TRUE if we were last to report */ + gmpx_timer *hgroup_query_timer; /* For replying to group queries */ + gmp_addr_list hgroup_query_list; /* Addresses to which we must reply */ + boolean hgroup_last_reporter; /* TRUE if we were last to report */ /* Transmission stuff */ - thread hgroup_xmit_thread; /* Entry on intf transmit list */ - boolean hgroup_change_msg_due; /* TRUE if we need to send chg msg */ - boolean hgroup_reply_due; /* TRUE if we need to send a reply */ - boolean hgroup_gss_reply_due; /* TRUE if sending a GSS reply */ - boolean hgroup_xmit_pending; /* TRUE if pending transmission */ + thread hgroup_xmit_thread; /* Entry on intf transmit list */ + boolean hgroup_change_msg_due; /* TRUE if we need to send chg msg */ + boolean hgroup_reply_due; /* TRUE if we need to send a reply */ + boolean hgroup_gss_reply_due; /* TRUE if sending a GSS reply */ + boolean hgroup_xmit_pending; /* TRUE if pending transmission */ /* Ref counting */ - boolean hgroup_is_deleted; /* Deleted, but locked */ - u_int8_t hgroup_lock_count; /* Lock count */ + boolean hgroup_is_deleted; /* Deleted, but locked */ + u_int8_t hgroup_lock_count; /* Lock count */ } gmph_group; GMPX_PATNODE_TO_STRUCT(gmph_intf_patnode_to_group, gmph_group, - hgroup_intf_patnode); + hgroup_intf_patnode); THREAD_TO_STRUCT(gmph_xmit_thread_to_group, gmph_group, hgroup_xmit_thread); -#define GMPH_INITIAL_REPORT_JITTER 0 /* Percent jitter for initial packet */ -#define GMPH_REPORT_REXMIT_JITTER 100 /* Percent jitter for retransmission */ -#define GMPH_QUERY_REPLY_JITTER 100 /* Percent jitter for replies */ +#define GMPH_INITIAL_REPORT_JITTER 0 /* Percent jitter for initial packet */ +#define GMPH_REPORT_REXMIT_JITTER 100 /* Percent jitter for retransmission */ +#define GMPH_QUERY_REPLY_JITTER 100 /* Percent jitter for replies */ /* @@ -285,9 +285,9 @@ THREAD_TO_STRUCT(gmph_xmit_thread_to_group, gmph_group, hgroup_xmit_thread); * This block contains the context for address list set operations. */ typedef struct gmph_group_set_context_ { - gmph_group *ctx_group; /* Group pointer */ - gmp_addr_list *ctx_add_list; /* List to add to */ - gmp_addr_list *ctx_del_list; /* List to delete from */ + gmph_group *ctx_group; /* Group pointer */ + gmp_addr_list *ctx_add_list; /* List to add to */ + gmp_addr_list *ctx_del_list; /* List to delete from */ } gmph_group_set_context; @@ -301,15 +301,15 @@ typedef struct gmph_group_set_context_ { * ID on little-endian machines. */ typedef struct gmph_client_ { - u_int32_t hclient_magic; /* Magic number for robustness */ - gmph_instance *hclient_instance; /* Owning instance */ - thread hclient_thread; /* Link on instance client thread */ - gmpx_patroot *hclient_group_root; /* Root of client group requests */ + u_int32_t hclient_magic; /* Magic number for robustness */ + gmph_instance *hclient_instance; /* Owning instance */ + thread hclient_thread; /* Link on instance client thread */ + gmpx_patroot *hclient_group_root; /* Root of client group requests */ } gmph_client; THREAD_TO_STRUCT(gmph_thread_to_client, gmph_client, hclient_thread); -#define GMPH_CLIENT_MAGIC 0x48636A69 /* 'Hcli' */ +#define GMPH_CLIENT_MAGIC 0x48636A69 /* 'Hcli' */ /* @@ -326,24 +326,24 @@ THREAD_TO_STRUCT(gmph_thread_to_client, gmph_client, hclient_thread); * The set of addresses is represented by a bit vector. */ typedef struct gmph_client_group_key_ { - gmpx_intf_id group_key_intf_id; /* Interface ID */ - gmp_addr_string group_key_addr; /* Group address */ + gmpx_intf_id group_key_intf_id; /* Interface ID */ + gmp_addr_string group_key_addr; /* Group address */ } gmph_client_group_key; typedef struct gmph_client_group_ { - gmph_client *client_group_client; /* Pointer back to owning client */ - gmph_group *client_group_group; /* Pointer to group entry */ - gmpx_patnode client_group_node; /* Node on client tree of groups */ - thread client_group_thread; /* Node on group thread of cli grps */ + gmph_client *client_group_client; /* Pointer back to owning client */ + gmph_group *client_group_group; /* Pointer to group entry */ + gmpx_patnode client_group_node; /* Node on client tree of groups */ + thread client_group_thread; /* Node on group thread of cli grps */ gmph_client_group_key client_group_key; /* Patricia key */ gmp_filter_mode client_filter_mode; /* Include/Exclude */ - gmp_addr_vect client_addr_vect; /* Source address vector */ + gmp_addr_vect client_addr_vect; /* Source address vector */ } gmph_client_group; GMPX_PATNODE_TO_STRUCT(gmph_patnode_to_client_group, gmph_client_group, - client_group_node); + client_group_node); THREAD_TO_STRUCT(gmph_thread_to_client_group, gmph_client_group, - client_group_thread); + client_group_thread); #define client_group_intf_id client_group_key.group_key_intf_id #define client_group_addr client_group_key.group_key_addr @@ -361,10 +361,10 @@ gmph_client_group_key_len (gmph_instance *instance) u_int length; if (instance->hinst_proto == GMP_PROTO_IGMP) - length = sizeof(gmph_client_group_key) - - (IPV6_ADDR_LEN - IPV4_ADDR_LEN); + length = sizeof(gmph_client_group_key) - + (IPV6_ADDR_LEN - IPV4_ADDR_LEN); else - length = sizeof(gmph_client_group_key); + length = sizeof(gmph_client_group_key); return length; } @@ -381,12 +381,12 @@ gmph_group_is_active (gmph_group *group) /* Active if in Exclude mode. */ if (group->hgroup_filter_mode == GMP_FILTER_MODE_EXCLUDE) - return TRUE; + return TRUE; /* Active if there are any sources. */ if (!gmp_addr_list_empty(&group->hgroup_src_addr_list)) - return TRUE; + return TRUE; return FALSE; } @@ -422,7 +422,7 @@ extern gmpx_patroot *gmph_global_intf_tree[]; /* gmph_instance.c */ extern gmph_instance *gmph_instance_create(gmp_proto proto, - void *inst_context); + void *inst_context); extern gmph_instance *gmph_get_instance(gmp_instance_id instance_id); extern void gmph_instance_destroy(gmph_instance *instance); @@ -432,17 +432,17 @@ extern gmph_client *gmph_create_client(gmph_instance *instance); extern gmph_client *gmph_get_client(gmp_client_id client_id); extern void gmph_destroy_client(gmph_client *client); extern gmph_client_group *gmph_lookup_client_group(gmph_client *client, - gmpx_intf_id intf_id, - const u_int8_t *group); + gmpx_intf_id intf_id, + const u_int8_t *group); extern void gmph_destroy_client_group(gmph_client_group *client_group, - boolean evaluate_group); + boolean evaluate_group); extern void gmph_destroy_intf_client_groups(gmph_client *client, - gmph_intf *intf); + gmph_intf *intf); extern gmph_client_group * gmph_create_client_group(gmph_intf *intf, gmph_client *client, - gmph_group *group, const u_int8_t *group_addr, - gmp_filter_mode filter_mode, - gmp_addr_thread *addr_thread); + gmph_group *group, const u_int8_t *group_addr, + gmp_filter_mode filter_mode, + gmp_addr_thread *addr_thread); extern void gmph_destroy_group_client_groups(gmph_group *group); extern void gmph_destroy_instance_clients(gmph_instance *instance); @@ -450,20 +450,20 @@ extern void gmph_destroy_instance_clients(gmph_instance *instance); extern void gmph_intf_evaluate_version(gmph_intf *intf); extern gmph_intf *gmph_intf_lookup(gmph_instance *instance, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern gmph_intf *gmph_intf_lookup_global(gmp_proto proto, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmph_kick_xmit(gmph_intf *intf); extern int gmph_attach_intf_internal(gmph_instance *instance, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern int gmph_detach_intf_internal(gmph_instance *instance, - gmpx_intf_id intf_id, - gmph_soft_detach_callback callback, - void *context); + gmpx_intf_id intf_id, + gmph_soft_detach_callback callback, + void *context); extern void gmph_attempt_intf_free(gmph_intf *intf); extern void gmph_destroy_instance_intfs(gmph_instance *instance); -extern void gmph_start_general_query_timer(gmph_intf *intf, u_int32_t ivl, - u_int jitter_pct); +extern void gmph_start_general_query_timer(gmph_intf *intf, u_int32_t ivl, + u_int jitter_pct); extern void gmph_intf_increment_pending_xmit_count(gmph_intf *); extern void gmph_intf_decrement_pending_xmit_count(gmph_intf *); @@ -471,7 +471,7 @@ extern void gmph_intf_decrement_pending_xmit_count(gmph_intf *); extern int gmph_reevaluate_group(gmph_group *group); extern gmph_group *gmph_group_lookup_create(gmph_intf *, - const u_int8_t *group); + const u_int8_t *group); extern gmph_group *gmph_group_lookup(gmph_intf *intf, const u_int8_t *group); extern gmph_group *gmph_group_lookup_first(gmph_intf *intf); extern gmph_group *gmph_group_create(gmph_intf *intf, const u_int8_t *group); @@ -485,15 +485,15 @@ extern void gmph_destroy_intf_groups(gmph_intf *intf); extern void gmph_enqueue_group_xmit(gmph_group *group); extern boolean gmph_group_xmit_pending(gmph_group *group); extern void gmph_set_report_entry_rexmit(gmph_group *group, - gmp_addr_list_entry *addr_entry); + gmp_addr_list_entry *addr_entry); extern boolean gmph_group_source_requested(gmph_group *group, - const u_int8_t *source_addr); + const u_int8_t *source_addr); extern void gmph_mark_pending_group_xmit(gmph_group *group); extern void gmph_unmark_pending_group_xmit(gmph_group *group, boolean force); extern void gmph_start_change_rpt_timer(gmph_group *group, u_int32_t ivl, - u_int jitter_pct); + u_int jitter_pct); extern void gmph_start_query_timer(gmph_group *group, u_int32_t ivl, - u_int jitter_pct); + u_int jitter_pct); extern void gmph_lock_group (gmph_group *group); extern boolean gmph_unlock_group (gmph_group *group); @@ -504,7 +504,7 @@ extern void gmph_register_packet_handler(void); extern void gmph_version_changed(gmph_instance *instance, gmph_intf *intf); extern void gmph_group_general_query_timer_expiry(gmph_group *group); extern void gmph_group_change_report_timer_expiry(gmpx_timer *timer, - void *context); + void *context); extern void gmph_group_query_timer_expiry(gmpx_timer *timer, void *context); #endif /* __GMPH_PRIVATE_H__ */ diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmpp_private.h b/src/vnsw/agent/services/multicast/grpmgmt/gmpp_private.h index 9f04ccd2fd0..ffe4e18af60 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmpp_private.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmpp_private.h @@ -18,11 +18,11 @@ * (host/router.) It tracks all necessary state for each client. */ typedef struct gmpp_context_ { - void *ctx_client_context; /* Client's context */ - gmp_xmit_callback_func ctx_xmit_cb; /* Transmit callback */ + void *ctx_client_context; /* Client's context */ + gmp_xmit_callback_func ctx_xmit_cb; /* Transmit callback */ gmp_xmit_peek_callback_func ctx_xmit_peek_cb; /* Transmit peek callback */ - gmp_rcv_peek_callback_func ctx_rcv_peek_cb; /* Receive peek callback */ - gmp_rcv_callback_func ctx_rcv_cb; /* Receive callback */ + gmp_rcv_peek_callback_func ctx_rcv_peek_cb; /* Receive peek callback */ + gmp_rcv_callback_func ctx_rcv_cb; /* Receive callback */ gmp_group_done_callback_func ctx_group_cb; /* Group-done callback */ gmp_packet_free_callback_func ctx_pkt_free_cb; /* Free-packet callback */ boolean ctx_proto_active[GMP_NUM_PROTOS]; /* True if protocol is active */ @@ -40,13 +40,13 @@ typedef struct gmpp_context_ { */ typedef struct gmpp_io_context_ { gmpp_xmit_ready_func io_ctx_xmitready_cb; /* Transmit-ready callback */ - gmpx_patroot *io_ctx_exceptions; /* Tree of exception interfaces */ + gmpx_patroot *io_ctx_exceptions; /* Tree of exception interfaces */ } gmpp_io_context; typedef struct gmpp_io_exception_ { - gmpx_patnode io_ctx_node; /* Node on context tree */ - gmpx_intf_id io_ctx_intf; /* Interface ID */ - gmpp_xmit_ready_func io_ctx_alt_cb; /* Callback for this interface */ + gmpx_patnode io_ctx_node; /* Node on context tree */ + gmpx_intf_id io_ctx_intf; /* Interface ID */ + gmpp_xmit_ready_func io_ctx_alt_cb; /* Callback for this interface */ } gmpp_io_exception; GMPX_PATNODE_TO_STRUCT(gmpp_patnode_to_io_ex, gmpp_io_exception, io_ctx_node); diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmpr_private.h b/src/vnsw/agent/services/multicast/grpmgmt/gmpr_private.h index 92770d709fe..1e3043ab831 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmpr_private.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmpr_private.h @@ -61,29 +61,29 @@ * by interface ID on little-endian machines. */ typedef struct gmpr_instance_ { - uint32_t rinst_magic; /* Magic number for robustness */ - thread rinst_thread; /* Link on global instance thread */ - thread rinst_client_thread; /* Head of client thread */ - thread rinst_startup_intf_thread; /* Head of intfs starting up */ + uint32_t rinst_magic; /* Magic number for robustness */ + thread rinst_thread; /* Link on global instance thread */ + thread rinst_client_thread; /* Head of client thread */ + thread rinst_startup_intf_thread; /* Head of intfs starting up */ - gmpx_patroot *rinst_intfs; /* Tree of interfaces */ + gmpx_patroot *rinst_intfs; /* Tree of interfaces */ gmpx_patroot *rinst_global_state_root; /* Root of global state tree */ - gmp_proto rinst_proto; /* Protocol (IGMP/MLD) */ - uint32_t rinst_addrlen; /* Address length (v4 or v6) */ - gmp_addr_catalog rinst_addr_cat; /* Address catalog */ - uint32_t rinst_min_max_resp; /* Min value of max resp field */ + gmp_proto rinst_proto; /* Protocol (IGMP/MLD) */ + uint32_t rinst_addrlen; /* Address length (v4 or v6) */ + gmp_addr_catalog rinst_addr_cat; /* Address catalog */ + uint32_t rinst_min_max_resp; /* Min value of max resp field */ - ordinal_handle rinst_ord_handle; /* Handle for client ordinals */ - void *rinst_context; /* Client instance context */ + ordinal_handle rinst_ord_handle; /* Handle for client ordinals */ + void *rinst_context; /* Client instance context */ gmpr_instance_context rinst_cb_context; /* Instance callbacks */ - uint32_t rinst_group_timeout; /* Group timeout count */ + uint32_t rinst_group_timeout; /* Group timeout count */ - uint32_t rinst_traceflags; /* Trace flags */ + uint32_t rinst_traceflags; /* Trace flags */ - gmpx_timer *rinst_smear_timer; /* Timer for query timer smearing */ + gmpx_timer *rinst_smear_timer; /* Timer for query timer smearing */ - boolean rinst_host_tracking; /* TRUE if doing host tracking */ + boolean rinst_host_tracking; /* TRUE if doing host tracking */ boolean rinst_smear_timer_accelerated; /* TRUE if we're smearing soon */ } gmpr_instance; @@ -100,7 +100,7 @@ THREAD_TO_STRUCT(gmpr_thread_to_instance, gmpr_instance, rinst_thread); #define GMP_QUERY_SMEAR_IVL (30*60*MSECS_PER_SEC) /* Half hour seems OK */ #define GMP_QUERY_QUICK_SMEAR_IVL (10*MSECS_PER_SEC) /* Quick fix */ -#define GMPR_INSTANCE_MAGIC 0x52696E73 /* 'Rins' */ +#define GMPR_INSTANCE_MAGIC 0x52696E73 /* 'Rins' */ typedef enum { GMPR_BELOW_THRESHOLD = 0, @@ -126,81 +126,81 @@ typedef struct gmpr_intf_ { /* Fundamental parameters */ - gmp_version rintf_ver; /* GMP version running */ - gmp_addr_string rintf_local_addr; /* Our address */ - gmp_addr_string rintf_querier_addr; /* Querier address */ + gmp_version rintf_ver; /* GMP version running */ + gmp_addr_string rintf_local_addr; /* Our address */ + gmp_addr_string rintf_querier_addr; /* Querier address */ /* Linkages */ - gmpr_instance *rintf_instance; /* Owning instance */ - gmpx_patnode rintf_inst_patnode; /* Node on instance tree */ - gmpx_patnode rintf_global_patnode; /* Node on global tree */ - gmpx_patroot *rintf_group_root; /* Root of aggregated group records */ - uint32_t rintf_group_count; /* Number of groups */ - gmpx_patroot *rintf_oif_group_root; /* Root of output group records */ - uint32_t rintf_oif_group_count; /* Number of output groups */ - gmpx_intf_id rintf_id; /* Interface ID */ - gmpx_patroot *rintf_host_root; /* Root of host entries */ - thread rintf_startup_thread; /* Entry on instance startup thread */ + gmpr_instance *rintf_instance; /* Owning instance */ + gmpx_patnode rintf_inst_patnode; /* Node on instance tree */ + gmpx_patnode rintf_global_patnode; /* Node on global tree */ + gmpx_patroot *rintf_group_root; /* Root of aggregated group records */ + uint32_t rintf_group_count; /* Number of groups */ + gmpx_patroot *rintf_oif_group_root; /* Root of output group records */ + uint32_t rintf_oif_group_count; /* Number of output groups */ + gmpx_intf_id rintf_id; /* Interface ID */ + gmpx_patroot *rintf_host_root; /* Root of host entries */ + thread rintf_startup_thread; /* Entry on instance startup thread */ /* Query stuff */ - gmpx_timer *rintf_query_timer; /* General query timer */ - uint32_t rintf_query_ivl; /* General query timer interval */ - uint32_t rintf_local_query_ivl; /* Local general query interval */ - uint32_t rintf_query_resp_ivl; /* Query response interval */ + gmpx_timer *rintf_query_timer; /* General query timer */ + uint32_t rintf_query_ivl; /* General query timer interval */ + uint32_t rintf_local_query_ivl; /* Local general query interval */ + uint32_t rintf_query_resp_ivl; /* Query response interval */ uint32_t rintf_local_query_resp_ivl; /* Local query response interval */ - uint32_t rintf_robustness; /* Robustness variable */ - uint32_t rintf_local_robustness; /* Local robustness variable */ - uint32_t rintf_lmq_ivl; /* Last member query interval */ - uint32_t rintf_lmq_count; /* Last member query count */ + uint32_t rintf_robustness; /* Robustness variable */ + uint32_t rintf_local_robustness; /* Local robustness variable */ + uint32_t rintf_lmq_ivl; /* Last member query interval */ + uint32_t rintf_lmq_count; /* Last member query count */ uint32_t rintf_group_membership_ivl; /* Group membership interval */ - uint32_t rintf_lmqt; /* Last member query time */ - uint32_t rintf_other_querier_ivl; /* Other querier present interval */ + uint32_t rintf_lmqt; /* Last member query time */ + uint32_t rintf_other_querier_ivl; /* Other querier present interval */ gmpx_timer *rintf_other_querier_present; /* Other querier present timer */ - boolean rintf_suppress_gen_query; /* Suppress general queries */ - boolean rintf_gen_query_requested; /* General query seq was requested */ - boolean rintf_first_query_pending; /* First query in sequence ready */ - boolean rintf_suppress_gs_query; /* Suppress GS/GSS queries */ + boolean rintf_suppress_gen_query; /* Suppress general queries */ + boolean rintf_gen_query_requested; /* General query seq was requested */ + boolean rintf_first_query_pending; /* First query in sequence ready */ + boolean rintf_suppress_gs_query; /* Suppress GS/GSS queries */ - uint32_t rintf_startup_query_count; /* Count of initial queries */ + uint32_t rintf_startup_query_count; /* Count of initial queries */ - uint32_t rintf_channel_limit; /* Max number of channels */ + uint32_t rintf_channel_limit; /* Max number of channels */ uint32_t rintf_channel_threshold; /* Percentage of maximum at which to - start generating warnings */ + start generating warnings */ uint32_t rintf_log_interval; /* Time between consecutive limit log msgs */ time_t last_log_time; /* Time last group limit related message - was logged */ - uint32_t rintf_channel_count; /* Current channel count */ - uint32_t rintf_chan_limit_drops; /* Count of drops due to chan limit */ - gmpr_limit_state_t rintf_limit_state; /* if count is above/below chan limit/threshold */ + was logged */ + uint32_t rintf_channel_count; /* Current channel count */ + uint32_t rintf_chan_limit_drops; /* Count of drops due to chan limit */ + gmpr_limit_state_t rintf_limit_state; /* if count is above/below chan limit/threshold */ /* Transmission stuff */ - thread rintf_xmit_head; /* Head of xmit groups */ - boolean rintf_xmit_pending; /* TRUE if we have a pending xmit */ - boolean rintf_send_gen_query; /* TRUE if we should send gen query */ + thread rintf_xmit_head; /* Head of xmit groups */ + boolean rintf_xmit_pending; /* TRUE if we have a pending xmit */ + boolean rintf_send_gen_query; /* TRUE if we should send gen query */ - boolean rintf_up; /* TRUE if interface is up */ - boolean rintf_fast_leaves; /* TRUE if doing fast leaves */ - boolean rintf_querier_enabled; /* TRUE if allowed to be V1 querier */ - boolean rintf_querier; /* TRUE if we are querier */ + boolean rintf_up; /* TRUE if interface is up */ + boolean rintf_fast_leaves; /* TRUE if doing fast leaves */ + boolean rintf_querier_enabled; /* TRUE if allowed to be V1 querier */ + boolean rintf_querier; /* TRUE if we are querier */ /* Receive stuff */ - boolean rintf_passive_receive; /* Passive receive */ + boolean rintf_passive_receive; /* Passive receive */ } gmpr_intf; GMPX_PATNODE_TO_STRUCT(gmpr_inst_patnode_to_intf, gmpr_intf, - rintf_inst_patnode); + rintf_inst_patnode); GMPX_PATNODE_TO_STRUCT(gmpr_global_patnode_to_intf, gmpr_intf, - rintf_global_patnode); + rintf_global_patnode); -#define GMPR_QUERY_IVL_DEFAULT 125000 /* Default query interval */ +#define GMPR_QUERY_IVL_DEFAULT 125000 /* Default query interval */ #define GMPR_QUERY_RESP_IVL_DEFAULT 10000 /* Default query response interval */ -#define GMPR_INIT_FIRST_QUERY_IVL 100 /* Initial query delay */ -#define GMPR_INIT_LATER_QUERY_IVL 2000 /* Later startup query delay */ -#define GMPR_LMQI_DEFAULT 1000 /* Default LMQI value */ +#define GMPR_INIT_FIRST_QUERY_IVL 100 /* Initial query delay */ +#define GMPR_INIT_LATER_QUERY_IVL 2000 /* Later startup query delay */ +#define GMPR_LMQI_DEFAULT 1000 /* Default LMQI value */ /* @@ -226,20 +226,20 @@ GMPX_PATNODE_TO_STRUCT(gmpr_global_patnode_to_intf, gmpr_intf, * and not set again until after the queue is drained. */ typedef enum { - GMPR_NOTIFY_GROUP = 1, /* Group notification */ - GMPR_NOTIFY_SOURCE, /* Source notification */ - GMPR_NOTIFY_REFRESH_END, /* End of refresh sequence */ - GMPR_NOTIFY_HOST_GROUP, /* Host group notification */ - GMPR_NOTIFY_HOST_SOURCE, /* Host source notification */ + GMPR_NOTIFY_GROUP = 1, /* Group notification */ + GMPR_NOTIFY_SOURCE, /* Source notification */ + GMPR_NOTIFY_REFRESH_END, /* End of refresh sequence */ + GMPR_NOTIFY_HOST_GROUP, /* Host group notification */ + GMPR_NOTIFY_HOST_SOURCE, /* Host source notification */ } gmpr_notification_type; typedef struct gmpr_notify_block_ { gmpr_notification_type gmpr_notify_type; /* Notification type */ - thread gmpr_notify_thread; /* Entry on client notify thread */ + thread gmpr_notify_thread; /* Entry on client notify thread */ } gmpr_notify_block; THREAD_TO_STRUCT(gmpr_thread_to_notify_block, gmpr_notify_block, - gmpr_notify_thread); + gmpr_notify_thread); /* @@ -268,26 +268,26 @@ typedef struct gmpr_group_ { /* Linkages */ - gmpr_intf *rgroup_intf; /* Pointer back to interface */ - gmpx_patnode rgroup_intf_patnode; /* Node on interface tree of groups */ - thread rgroup_host_group_head; /* Head of host group thread */ - thread rgroup_oif_thread; /* Entry on OIF group thread */ + gmpr_intf *rgroup_intf; /* Pointer back to interface */ + gmpx_patnode rgroup_intf_patnode; /* Node on interface tree of groups */ + thread rgroup_host_group_head; /* Head of host group thread */ + thread rgroup_oif_thread; /* Entry on OIF group thread */ struct gmpr_ogroup_ *rgroup_oif_group; /* OIF group pointer */ /* Group state */ - gmp_addr_string rgroup_addr; /* Group address */ - gmp_filter_mode rgroup_filter_mode; /* Include/Exclude */ + gmp_addr_string rgroup_addr; /* Group address */ + gmp_filter_mode rgroup_filter_mode; /* Include/Exclude */ gmp_addr_list rgroup_src_addr_running; /* Sources with running timers */ gmp_addr_list rgroup_src_addr_stopped; /* Sources with stopped timers */ - gmpx_timer *rgroup_group_timer; /* Group timer */ + gmpx_timer *rgroup_group_timer; /* Group timer */ gmp_addr_string rgroup_last_reporter; /* Address of last reporting host */ /* Query stuff */ - gmpx_timer *rgroup_query_timer; /* For sending group queries */ - gmpx_timer *rgroup_gss_query_timer; /* For sending GSS queries */ - uint8_t rgroup_query_rexmit_count; /* Rexmit count for group queries */ + gmpx_timer *rgroup_query_timer; /* For sending group queries */ + gmpx_timer *rgroup_gss_query_timer; /* For sending GSS queries */ + uint8_t rgroup_query_rexmit_count; /* Rexmit count for group queries */ gmp_addr_list rgroup_query_lo_timers; /* List of sources with lo timers */ gmp_addr_list rgroup_query_hi_timers; /* List of sources with hi timers */ @@ -299,13 +299,13 @@ typedef struct gmpr_group_ { /* Transmission stuff */ - thread rgroup_xmit_thread; /* Entry on intf transmit list */ - boolean rgroup_send_gss_query; /* We need to send a GSS query */ - boolean rgroup_send_group_query; /* We need to send a group query */ + thread rgroup_xmit_thread; /* Entry on intf transmit list */ + boolean rgroup_send_gss_query; /* We need to send a GSS query */ + boolean rgroup_send_group_query; /* We need to send a group query */ } gmpr_group; GMPX_PATNODE_TO_STRUCT(gmpr_intf_patnode_to_group, gmpr_group, - rgroup_intf_patnode); + rgroup_intf_patnode); THREAD_TO_STRUCT(gmpr_xmit_thread_to_group, gmpr_group, rgroup_xmit_thread); THREAD_TO_STRUCT(gmpr_oif_thread_to_group, gmpr_group, rgroup_oif_thread); @@ -325,16 +325,16 @@ THREAD_TO_STRUCT(gmpr_oif_thread_to_group, gmpr_group, rgroup_oif_thread); */ typedef struct gmpr_group_addr_entry_ { - gmp_addr_list_entry rgroup_addr_entry; /* Address entry */ - gmpr_group *rgroup_addr_group; /* Owning group */ - gmpx_timer *rgroup_addr_timer; /* Timer */ - uint8_t rgroup_addr_rexmit_count; /* Query retransmission count */ - thread rgroup_addr_oif_thread; /* Entry on OIF thread */ + gmp_addr_list_entry rgroup_addr_entry; /* Address entry */ + gmpr_group *rgroup_addr_group; /* Owning group */ + gmpx_timer *rgroup_addr_timer; /* Timer */ + uint8_t rgroup_addr_rexmit_count; /* Query retransmission count */ + thread rgroup_addr_oif_thread; /* Entry on OIF thread */ struct gmpr_ogroup_addr_entry_ *rgroup_addr_oif_addr; /* OIF address */ /* Host stuff */ - thread rgroup_host_addr_head; /* Head of host address thread */ + thread rgroup_host_addr_head; /* Head of host address thread */ /* Wasted space */ @@ -343,10 +343,10 @@ typedef struct gmpr_group_addr_entry_ } gmpr_group_addr_entry; THREAD_TO_STRUCT(gmpr_oif_thread_to_group_addr_entry, gmpr_group_addr_entry, - rgroup_addr_oif_thread); + rgroup_addr_oif_thread); EMBEDDED_STRUCT_TO_STRUCT(gmpr_addr_entry_to_group_entry, - gmpr_group_addr_entry, gmp_addr_list_entry, - rgroup_addr_entry); + gmpr_group_addr_entry, gmp_addr_list_entry, + rgroup_addr_entry); /* @@ -378,18 +378,18 @@ EMBEDDED_STRUCT_TO_STRUCT(gmpr_addr_entry_to_group_entry, * represent the actual forwarding state. */ typedef struct gmpr_ogroup_ { - gmpr_intf *rogroup_intf; /* Pointer back to interface */ - gmpx_patnode rogroup_intf_patnode; /* Node on interface tree of groups */ + gmpr_intf *rogroup_intf; /* Pointer back to interface */ + gmpx_patnode rogroup_intf_patnode; /* Node on interface tree of groups */ gmpr_notify_block rogroup_client_thread[GMPX_MAX_RTR_CLIENTS]; - /* Notification blocks */ + /* Notification blocks */ boolean rogroup_send_full_notif[GMPX_MAX_RTR_CLIENTS]; - /* TRUE if we should send full notif */ - thread rogroup_global_thread; /* Entry on global state thread */ - thread rogroup_oif_head; /* Head of input groups contributing */ + /* TRUE if we should send full notif */ + thread rogroup_global_thread; /* Entry on global state thread */ + thread rogroup_oif_head; /* Head of input groups contributing */ /* Group state */ - gmp_addr_string rogroup_addr; /* Group address */ + gmp_addr_string rogroup_addr; /* Group address */ gmp_filter_mode rogroup_filter_mode; /* Include/Exclude */ gmp_addr_list rogroup_incl_src_addr; /* Active include sources */ gmp_addr_list rogroup_excl_src_addr; /* Active exclude sources */ @@ -397,9 +397,9 @@ typedef struct gmpr_ogroup_ { } gmpr_ogroup; GMPX_PATNODE_TO_STRUCT(gmpr_oif_patnode_to_group, gmpr_ogroup, - rogroup_intf_patnode); + rogroup_intf_patnode); THREAD_TO_STRUCT(gmpr_global_thread_to_group, gmpr_ogroup, - rogroup_global_thread); + rogroup_global_thread); /* @@ -416,21 +416,21 @@ THREAD_TO_STRUCT(gmpr_global_thread_to_group, gmpr_ogroup, */ typedef struct gmpr_ogroup_addr_entry_ { - gmp_addr_list_entry rogroup_addr_entry; /* Address entry */ - gmpr_ogroup *rogroup_addr_group; /* Owning group */ - thread rogroup_addr_oif_head; /* Head of contributing sources */ + gmp_addr_list_entry rogroup_addr_entry; /* Address entry */ + gmpr_ogroup *rogroup_addr_group; /* Owning group */ + thread rogroup_addr_oif_head; /* Head of contributing sources */ /* Notification stuff */ gmpr_notify_block rogroup_addr_client_thread[GMPX_MAX_RTR_CLIENTS]; - /* Notification blocks */ - boolean rogroup_notify; /* TRUE if notification required */ + /* Notification blocks */ + boolean rogroup_notify; /* TRUE if notification required */ } gmpr_ogroup_addr_entry; EMBEDDED_STRUCT_TO_STRUCT(gmpr_addr_entry_to_ogroup_entry, - gmpr_ogroup_addr_entry, gmp_addr_list_entry, - rogroup_addr_entry); + gmpr_ogroup_addr_entry, gmp_addr_list_entry, + rogroup_addr_entry); /* @@ -440,25 +440,25 @@ EMBEDDED_STRUCT_TO_STRUCT(gmpr_addr_entry_to_ogroup_entry, * state. */ typedef struct gmpr_client_ { - uint32_t rclient_magic; /* Magic number for robustness */ - gmpr_instance *rclient_instance; /* Owning instance */ - ordinal_t rclient_ordinal; /* Client ordinal */ - thread rclient_thread; /* Link on instance client thread */ - void *rclient_context; /* Client context */ - - thread rclient_notif_head; /* Head of group notifications */ - thread rclient_host_notif_head; /* Head of host notifications */ + uint32_t rclient_magic; /* Magic number for robustness */ + gmpr_instance *rclient_instance; /* Owning instance */ + ordinal_t rclient_ordinal; /* Client ordinal */ + thread rclient_thread; /* Link on instance client thread */ + void *rclient_context; /* Client context */ + + thread rclient_notif_head; /* Head of group notifications */ + thread rclient_host_notif_head; /* Head of host notifications */ gmpr_client_context rclient_cb_context; /* Client callback */ gmpr_notify_block rclient_refresh_end_notif; /* End-refresh notification */ - gmpx_timer *rclient_startup_timer; /* Startup timer */ - boolean rclient_notify; /* TRUE if we need to notify */ - boolean rclient_host_notify; /* Ditto for host notifications */ + gmpx_timer *rclient_startup_timer; /* Startup timer */ + boolean rclient_notify; /* TRUE if we need to notify */ + boolean rclient_host_notify; /* Ditto for host notifications */ } gmpr_client; THREAD_TO_STRUCT(gmpr_thread_to_client, gmpr_client, rclient_thread); -#define GMPR_CLIENT_MAGIC 0x52636C69 /* 'Rcli' */ +#define GMPR_CLIENT_MAGIC 0x52636C69 /* 'Rcli' */ /* @@ -472,10 +472,10 @@ THREAD_TO_STRUCT(gmpr_thread_to_client, gmpr_client, rclient_thread); * by the host address. */ typedef struct gmpr_host_ { - gmpx_patnode rhost_node; /* Node on interface tree */ - gmp_addr_string rhost_addr; /* Host address */ - gmpr_intf *rhost_intf; /* Interface pointer */ - gmpx_patroot *rhost_group_root; /* Root of group tree */ + gmpx_patnode rhost_node; /* Node on interface tree */ + gmp_addr_string rhost_addr; /* Host address */ + gmpr_intf *rhost_intf; /* Interface pointer */ + gmpx_patroot *rhost_group_root; /* Root of group tree */ } gmpr_host; GMPX_PATNODE_TO_STRUCT(gmpr_patnode_to_host, gmpr_host, rhost_node); @@ -505,23 +505,23 @@ GMPX_PATNODE_TO_STRUCT(gmpr_patnode_to_host, gmpr_host, rhost_node); * as a side effect of deleting source addresses. */ typedef struct gmpr_host_group_ { - gmpx_patnode rhgroup_node; /* Node on tree */ - gmp_addr_string rhgroup_addr; /* Group address */ - gmpr_host *rhgroup_host; /* Host pointer */ - gmp_addr_list rhgroup_addrs; /* List of sources */ - gmp_addr_list rhgroup_deleted; /* Deleted sources awaiting notify */ - thread rhgroup_thread; /* Entry on main group thread */ - gmpr_group *rhgroup_group; /* Pointer to main group entry */ - gmpx_timer *rhgroup_timer; /* Host group timer */ + gmpx_patnode rhgroup_node; /* Node on tree */ + gmp_addr_string rhgroup_addr; /* Group address */ + gmpr_host *rhgroup_host; /* Host pointer */ + gmp_addr_list rhgroup_addrs; /* List of sources */ + gmp_addr_list rhgroup_deleted; /* Deleted sources awaiting notify */ + thread rhgroup_thread; /* Entry on main group thread */ + gmpr_group *rhgroup_group; /* Pointer to main group entry */ + gmpx_timer *rhgroup_timer; /* Host group timer */ gmpr_notify_block rhgroup_notify[GMPX_MAX_RTR_CLIENTS]; - /* Notification block */ - boolean rhgroup_is_deleted; /* Deleted, but locked */ - uint8_t rhgroup_lock_count; /* Lock count */ + /* Notification block */ + boolean rhgroup_is_deleted; /* Deleted, but locked */ + uint8_t rhgroup_lock_count; /* Lock count */ } gmpr_host_group; THREAD_TO_STRUCT(gmpr_thread_to_host_group, gmpr_host_group, rhgroup_thread); GMPX_PATNODE_TO_STRUCT(gmpr_patnode_to_host_group, gmpr_host_group, - rhgroup_node); + rhgroup_node); /* * gmpr_host_group_active @@ -535,7 +535,7 @@ gmpr_host_group_active (gmpr_host_group *host_group) /* Tolerate NULL pointers. */ if (!host_group) - return FALSE; + return FALSE; /* The host group is active if it's bound to a group. */ @@ -549,20 +549,20 @@ gmpr_host_group_active (gmpr_host_group *host_group) * This structure represents a single source address on a host group entry. */ typedef struct gmpr_host_group_addr_ { - gmp_addr_list_entry rhga_addr_ent; /* Address entry */ - thread rhga_thread; /* Entry on main addr entry thread */ - gmpr_group_addr_entry *rhga_source; /* Pointer to main addr entry */ + gmp_addr_list_entry rhga_addr_ent; /* Address entry */ + thread rhga_thread; /* Entry on main addr entry thread */ + gmpr_group_addr_entry *rhga_source; /* Pointer to main addr entry */ gmpr_notify_block rhga_notify[GMPX_MAX_RTR_CLIENTS]; - /* Notification block */ - gmpr_host_group *rhga_host_group; /* Pointer to owning host group */ - gmpx_timer *rhga_timer; /* Host source timer */ + /* Notification block */ + gmpr_host_group *rhga_host_group; /* Pointer to owning host group */ + gmpx_timer *rhga_timer; /* Host source timer */ } gmpr_host_group_addr; EMBEDDED_STRUCT_TO_STRUCT(gmpr_addr_entry_to_host_group_entry, - gmpr_host_group_addr, gmp_addr_list_entry, - rhga_addr_ent); + gmpr_host_group_addr, gmp_addr_list_entry, + rhga_addr_ent); THREAD_TO_STRUCT(gmpr_thread_to_host_group_addr_entry, gmpr_host_group_addr, - rhga_thread); + rhga_thread); /* @@ -580,13 +580,13 @@ THREAD_TO_STRUCT(gmpr_thread_to_host_group_addr_entry, gmpr_host_group_addr, * provided in the notifications. */ typedef struct gmpr_global_group_ { - patnode global_group_node; /* Entry on global tree */ - gmp_addr_string global_group_addr; /* Group address */ - thread global_group_head; /* Head of thread of groups */ + patnode global_group_node; /* Entry on global tree */ + gmp_addr_string global_group_addr; /* Group address */ + thread global_group_head; /* Head of thread of groups */ } gmpr_global_group; GMPX_PATNODE_TO_STRUCT(gmpr_patnode_to_global_group, gmpr_global_group, - global_group_node); + global_group_node); /* * Inlines... @@ -602,13 +602,13 @@ GMPX_PATNODE_TO_STRUCT(gmpr_patnode_to_global_group, gmpr_global_group, */ static inline gmpr_ogroup * gmpr_client_notification_to_group (gmpr_notify_block *notify_block, - ordinal_t ordinal) + ordinal_t ordinal) { uint8_t *byte_ptr; gmpr_ogroup *group; if (!notify_block) - return NULL; + return NULL; gmpx_assert(ordinal < GMPX_MAX_RTR_CLIENTS); @@ -639,7 +639,7 @@ gmpr_client_notification_to_group (gmpr_notify_block *notify_block, */ static inline gmpr_ogroup_addr_entry * gmpr_client_notification_to_addr_entry (gmpr_notify_block *notify_block, - ordinal_t ordinal) + ordinal_t ordinal) { uint8_t *byte_ptr; gmpr_ogroup_addr_entry *group_addr; @@ -649,7 +649,7 @@ gmpr_client_notification_to_addr_entry (gmpr_notify_block *notify_block, /* Bail if the ordinal is out of range. */ if (ordinal >= GMPX_MAX_RTR_CLIENTS) - return NULL; + return NULL; /* Adjust for the client ordinal offset. */ @@ -675,13 +675,13 @@ gmpr_client_notification_to_addr_entry (gmpr_notify_block *notify_block, */ static inline gmpr_host_group * gmpr_client_notification_to_host_group (gmpr_notify_block *notify_block, - ordinal_t ordinal) + ordinal_t ordinal) { uint8_t *byte_ptr; gmpr_host_group *host_group; if (!notify_block) - return NULL; + return NULL; gmpx_assert(ordinal < GMPX_MAX_RTR_CLIENTS); @@ -712,7 +712,7 @@ gmpr_client_notification_to_host_group (gmpr_notify_block *notify_block, */ static inline gmpr_host_group_addr * gmpr_client_notification_to_host_group_addr (gmpr_notify_block *notify_block, - ordinal_t ordinal) + ordinal_t ordinal) { uint8_t *byte_ptr; gmpr_host_group_addr *group_addr; @@ -722,7 +722,7 @@ gmpr_client_notification_to_host_group_addr (gmpr_notify_block *notify_block, /* Bail if the ordinal is out of range. */ if (ordinal >= GMPX_MAX_RTR_CLIENTS) - return NULL; + return NULL; /* Adjust for the client ordinal offset. */ @@ -787,7 +787,7 @@ gmpr_group_addr_mode (gmpr_ogroup_addr_entry *group_addr) gmpx_assert(!gmpr_group_addr_deleted(group_addr)); mode = GMP_FILTER_MODE_EXCLUDE; if (gmpr_group_addr_included(group_addr)) - mode = GMP_FILTER_MODE_INCLUDE; + mode = GMP_FILTER_MODE_INCLUDE; return mode; } @@ -837,9 +837,9 @@ static inline boolean gmpr_group_is_active (gmpr_group *group) { if (group->rgroup_filter_mode == GMP_FILTER_MODE_EXCLUDE) - return TRUE; + return TRUE; if (!gmp_addr_list_empty(&group->rgroup_src_addr_running)) - return TRUE; + return TRUE; return FALSE; } @@ -854,9 +854,9 @@ static inline boolean gmpr_ogroup_is_active (gmpr_ogroup *ogroup) { if (ogroup->rogroup_filter_mode == GMP_FILTER_MODE_EXCLUDE) - return TRUE; + return TRUE; if (!gmp_addr_list_empty(&ogroup->rogroup_incl_src_addr)) - return TRUE; + return TRUE; return FALSE; } @@ -872,9 +872,9 @@ static inline gmp_addr_list * gmpr_ogroup_source_list_by_mode (gmpr_ogroup *group, gmp_filter_mode mode) { if (mode == GMP_FILTER_MODE_INCLUDE) { - return &group->rogroup_incl_src_addr; + return &group->rogroup_incl_src_addr; } else { - return &group->rogroup_excl_src_addr; + return &group->rogroup_excl_src_addr; } } @@ -901,7 +901,7 @@ static inline boolean gmpr_all_group_lists_empty (gmpr_group *group) { return (gmp_addr_list_empty(&group->rgroup_src_addr_running) && - gmp_addr_list_empty(&group->rgroup_src_addr_stopped)); + gmp_addr_list_empty(&group->rgroup_src_addr_stopped)); } @@ -915,9 +915,9 @@ static inline gmp_addr_list * gmpr_group_source_list (gmpr_group *group) { if (group->rgroup_filter_mode == GMP_FILTER_MODE_INCLUDE) { - return &group->rgroup_src_addr_running; + return &group->rgroup_src_addr_running; } else { - return &group->rgroup_src_addr_stopped; + return &group->rgroup_src_addr_stopped; } } @@ -944,14 +944,14 @@ gmpr_source_ord_is_active (gmpr_ogroup *group, ordinal_t ord) /* If the group is in Include mode, it's active if in the include list. */ if (group->rogroup_filter_mode == GMP_FILTER_MODE_INCLUDE) - return in_include; + return in_include; /* * Exclude mode. The source is active if it's in the exclude list and * not in the include list. */ return (gmp_addr_in_list(&group->rogroup_excl_src_addr, ord) && - !in_include); + !in_include); } @@ -972,14 +972,14 @@ gmpr_source_is_active (gmpr_ogroup *group, gmpr_ogroup_addr_entry *group_addr) /* Active if we're in include mode. */ if (group->rogroup_filter_mode == GMP_FILTER_MODE_INCLUDE) - return TRUE; + return TRUE; /* * Active if the excluded source is *not* in the Include list, or * inactive if it is. */ return (!gmp_addr_in_list(&group->rogroup_incl_src_addr, - group_addr->rogroup_addr_entry.addr_ent_ord)); + group_addr->rogroup_addr_entry.addr_ent_ord)); } @@ -989,8 +989,8 @@ gmpr_source_is_active (gmpr_ogroup *group, gmpr_ogroup_addr_entry *group_addr) * Enum for gmpr_update_group_oif and gmpr_update_source_oif */ typedef enum { - OIF_DELETE, /* Deleting component */ - OIF_UPDATE, /* Updating component */ + OIF_DELETE, /* Deleting component */ + OIF_UPDATE, /* Updating component */ } oif_update_type; @@ -1019,7 +1019,7 @@ extern gmpx_patroot *gmpr_global_intf_tree[]; /* gmpr_instance.c */ extern gmpr_instance *gmpr_instance_create(gmp_proto proto, - void *inst_context); + void *inst_context); extern gmpr_instance *gmpr_get_instance(gmp_instance_id instance_id); extern void gmpr_instance_destroy(gmpr_instance *instance); extern void gmpr_accelerate_query_smear(gmpr_instance *instance); @@ -1033,52 +1033,52 @@ extern void gmpr_destroy_instance_clients(gmpr_instance *instance); typedef enum {NOTIFY_CONDITIONAL, NOTIFY_UNCONDITIONAL} gmpr_source_notify_flag; extern void gmpr_source_notify_clients(gmpr_ogroup_addr_entry *group_addr, - gmpr_source_notify_flag flag); + gmpr_source_notify_flag flag); extern void gmpr_client_enqueue_all_groups(gmpr_client *client, boolean flush); extern void gmpr_client_enqueue_all_intf_groups(gmpr_client *client, - gmpr_intf *intf, - boolean flush); + gmpr_intf *intf, + boolean flush); extern gmpr_client_notification * gmpr_client_get_notification(gmpr_client *client, - gmpr_client_notification *last_notification); + gmpr_client_notification *last_notification); extern void gmpr_free_notification(gmpr_client_notification *notification); extern void gmpr_mode_change_notify_clients(gmpr_ogroup *group); extern void gmpr_group_notify_clients(gmpr_ogroup *group); extern void gmpr_alert_clients(gmpr_instance *instance); extern boolean gmpr_notifications_active(gmpr_notify_block *notify_block); extern void gmpr_set_notification_type(gmpr_notify_block *notify_block, - gmpr_notification_type notify_type); + gmpr_notification_type notify_type); extern void gmpr_flush_notifications(gmpr_notify_block *notify_block, - boolean just_delink); + boolean just_delink); extern void gmpr_enqueue_refresh_end(gmpr_client *client); /* gmpr_intf.c */ extern int gmpr_intf_set_params(gmpr_instance *instance, gmpx_intf_id intf_id, - gmpr_intf_params *params); + gmpr_intf_params *params); extern gmpr_intf *gmpr_intf_lookup(gmpr_instance *instance, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern gmpr_intf *gmpr_intf_lookup_global(gmp_proto proto, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_kick_xmit(gmpr_intf *intf); extern int gmpr_attach_intf_internal(gmpr_instance *instance, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern int gmpr_detach_intf_internal(gmpr_instance *instance, - gmpx_intf_id intf_id); + gmpx_intf_id intf_id); extern void gmpr_destroy_instance_intfs(gmpr_instance *instance); extern void gmpr_intf_update_robustness(gmpr_intf *intf, uint32_t robustness); extern void gmpr_intf_update_query_ivl(gmpr_intf *intf, uint32_t query_ivl); extern void gmpr_update_querier(gmpr_intf *intf, gmp_addr_string *addr, - boolean querier); + boolean querier); extern void gmpr_setup_initial_query_timer(gmpr_intf *intf); extern void gmpr_trigger_one_query(gmpr_intf *intf); extern gmpr_intf *gmpr_next_instance_intf(gmpr_instance *instance, - gmpr_intf *prev_intf); + gmpr_intf *prev_intf); /* gmpr_group.c */ extern gmpr_group *gmpr_group_create(gmpr_intf *intf, - const gmp_addr_string *group_addr); + const gmp_addr_string *group_addr); extern gmpr_group *gmpr_group_lookup(gmpr_intf *intf, const uint8_t *group); extern gmpr_ogroup *gmpr_ogroup_lookup(gmpr_intf *intf, const uint8_t *group); extern gmpx_timer *gmpr_create_change_report_timer(gmpr_group *group); @@ -1089,28 +1089,28 @@ extern boolean gmpr_attempt_ogroup_free(gmpr_ogroup *ogroup); extern void gmpr_destroy_intf_groups(gmpr_intf *intf); extern void gmpr_enqueue_group_xmit(gmpr_group *group); extern void gmpr_init_group_addr_entry(gmpr_group *group, - gmp_addr_list_entry *addr_entry); + gmp_addr_list_entry *addr_entry); extern gmpr_global_group *gmpr_link_global_group(gmpr_ogroup *group); extern void gmpr_delink_global_group(gmpr_ogroup *group); extern gmpr_global_group *gmpr_lookup_global_group(gmpr_instance *instance, - uint8_t *group_addr); + uint8_t *group_addr); extern void gmpr_evaluate_group_version(gmpr_group *group); extern gmp_version gmpr_group_version(gmpr_intf *intf, gmpr_group *group); extern boolean gmpr_group_forwards_all_sources(gmpr_ogroup *group); extern boolean gmpr_group_forwards_source(gmpr_ogroup *group, - const uint8_t *source); + const uint8_t *source); extern void gmpr_timeout_group(gmpr_group *group); extern void gmpr_update_group_oif(gmpr_group *group, oif_update_type type); extern void gmpr_update_source_oif(gmpr_group_addr_entry *group_addr, - oif_update_type type); + oif_update_type type); extern void gmpr_update_oif_mode_change(gmpr_group *group); extern void gmpr_notify_oif_map_change_internal(gmpr_intf *intf); extern gmpr_group *gmpr_next_intf_group(gmpr_intf *intf, gmpr_group *group); -extern gmpr_ogroup *gmpr_next_oif_group(gmpr_intf *oif, gmpr_ogroup *group); +extern gmpr_ogroup *gmpr_next_oif_group(gmpr_intf *oif, gmpr_ogroup *group); extern void gmpr_update_intf_output_groups(gmpr_intf *intf); extern void gmpr_flush_intf_input_groups(gmpr_intf *intf); extern void gmpr_enqueue_all_source_notifications(gmpr_ogroup *ogroup, - gmpr_client *client); + gmpr_client *client); extern void gmpr_flush_notifications_group(gmpr_ogroup *ogroup); extern boolean gmpr_check_grp_limit(gmpr_intf *intf, boolean incr); @@ -1129,12 +1129,12 @@ extern void gmpr_last_host_group_ref_gone(gmpr_group *group); extern void gmpr_host_process_report(uint8_t *src_addr, gmp_report_rectype rec_type, - gmpr_group *group, gmp_addr_vect *source_vect); + gmpr_group *group, gmp_addr_vect *source_vect); extern gmpr_client_host_notification * gmpr_client_get_host_notification(gmpr_client *client, - gmpr_client_host_notification *last_notification); + gmpr_client_host_notification *last_notification); extern void gmpr_client_free_host_notification( - gmpr_client_host_notification *host_notif); + gmpr_client_host_notification *host_notif); extern void gmpr_alert_host_clients(gmpr_instance *instance); extern void gmpr_client_enqueue_all_host_groups(gmpr_client *client); extern void gmpr_flush_host_notifications_client(gmpr_client *client); diff --git a/src/vnsw/agent/services/multicast/grpmgmt/gmpr_trace.h b/src/vnsw/agent/services/multicast/grpmgmt/gmpr_trace.h index 65350023849..c6f5de5ee95 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/gmpr_trace.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/gmpr_trace.h @@ -22,7 +22,7 @@ gmpx_trace(instance->rinst_context, __VA_ARGS__) /* - * Error event + * Error event */ #define gmpr_post_event(instance, ev, ...) \ gmpx_post_event(instance->rinst_context, ev, __VA_ARGS__) @@ -34,8 +34,8 @@ * Beware that the low order bits are defined in gmp_trace.h! */ -#define GMPR_TRACE_GROUP 0x00000100 /* Group activity */ -#define GMPR_TRACE_HOST_NOTIFY 0x00000200 /* Host notification */ +#define GMPR_TRACE_GROUP 0x00000100 /* Group activity */ +#define GMPR_TRACE_HOST_NOTIFY 0x00000200 /* Host notification */ #define GMPR_TRACE_CLIENT_NOTIFY 0x00000400 /* Client notification */ extern const char * diff --git a/src/vnsw/agent/services/multicast/grpmgmt/igmp_protocol.h b/src/vnsw/agent/services/multicast/grpmgmt/igmp_protocol.h index df20e1fcb14..ca4d16ce9b9 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/igmp_protocol.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/igmp_protocol.h @@ -23,16 +23,16 @@ * The IGMP header qualifies the contents of the rest of the packet. */ typedef struct igmp_hdr_ { - uint8_t igmp_hdr_type; /* packet type */ - uint8_t igmp_hdr_maxresp; /* Max resp code or reserved */ - uint16_t igmp_hdr_cksum; /* Checksum */ + uint8_t igmp_hdr_type; /* packet type */ + uint8_t igmp_hdr_maxresp; /* Max resp code or reserved */ + uint16_t igmp_hdr_cksum; /* Checksum */ } igmp_hdr; -#define IGMP_TYPE_QUERY 0x11 /* Query (all versions) */ -#define IGMP_TYPE_V1_REPORT 0x12 /* Version 1 Report */ -#define IGMP_TYPE_V2_REPORT 0x16 /* Version 2 Report */ -#define IGMP_TYPE_V2_LEAVE 0x17 /* Version 2 Leave */ -#define IGMP_TYPE_V3_REPORT 0x22 /* Version 3 Report */ +#define IGMP_TYPE_QUERY 0x11 /* Query (all versions) */ +#define IGMP_TYPE_V1_REPORT 0x12 /* Version 1 Report */ +#define IGMP_TYPE_V2_REPORT 0x16 /* Version 2 Report */ +#define IGMP_TYPE_V2_LEAVE 0x17 /* Version 2 Leave */ +#define IGMP_TYPE_V3_REPORT 0x22 /* Version 3 Report */ /* * Version 1 and version 2 packets @@ -40,7 +40,7 @@ typedef struct igmp_hdr_ { * All IGMP v1 and v2 packets have the same format. */ typedef struct igmp_v1v2_pkt_ { - igmp_hdr igmp_v1v2_pkt_hdr; /* Packet header */ + igmp_hdr igmp_v1v2_pkt_hdr; /* Packet header */ uint8_t igmp_v1v2_pkt_group[IPV4_ADDR_LEN]; /* Group address */ } igmp_v1v2_pkt; @@ -49,16 +49,16 @@ typedef struct igmp_v1v2_pkt_ { * Version 3 Query packet */ typedef struct igmp_v3_query_ { - igmp_hdr igmp_v3_query_hdr; /* Packet header */ + igmp_hdr igmp_v3_query_hdr; /* Packet header */ uint8_t igmp_v3_query_group[IPV4_ADDR_LEN]; /* Group address */ - uint8_t igmp_v3_query_s_qrv; /* S/QRV fields */ - uint8_t igmp_v3_query_qqic; /* QQIC */ - uint16_t igmp_v3_query_num_srcs; /* Number of sources */ - uint8_t igmp_v3_query_source[0]; /* Array of sources */ + uint8_t igmp_v3_query_s_qrv; /* S/QRV fields */ + uint8_t igmp_v3_query_qqic; /* QQIC */ + uint16_t igmp_v3_query_num_srcs; /* Number of sources */ + uint8_t igmp_v3_query_source[0]; /* Array of sources */ } igmp_v3_query; -#define IGMP_SUPP_RTR_PROC_MASK 0x8 /* "S" bit in s_qrv field */ -#define IGMP_QRV_MASK 0x7 /* QRV value in s_qrv field */ +#define IGMP_SUPP_RTR_PROC_MASK 0x8 /* "S" bit in s_qrv field */ +#define IGMP_QRV_MASK 0x7 /* QRV value in s_qrv field */ /* @@ -67,9 +67,9 @@ typedef struct igmp_v3_query_ { * Version 3 reports have one or more group records. */ typedef struct igmp_v3_rpt_rcrd_ { - uint8_t igmp_v3_rpt_rec_type; /* Record type */ - uint8_t igmp_v3_rpt_aux_len; /* Auxiliary data length */ - uint16_t igmp_v3_rpt_num_srcs; /* Number of sources */ + uint8_t igmp_v3_rpt_rec_type; /* Record type */ + uint8_t igmp_v3_rpt_aux_len; /* Auxiliary data length */ + uint16_t igmp_v3_rpt_num_srcs; /* Number of sources */ uint8_t igmp_v3_rpt_group[IPV4_ADDR_LEN]; /* Group address */ } igmp_v3_rpt_rcrd; @@ -79,9 +79,9 @@ static inline uint8_t* get_igmp_v3_rpt_source(igmp_v3_rpt_rcrd *ptr) { } typedef struct igmp_v3_report_ { - igmp_hdr igmp_v3_report_hdr; /* Packet header */ - uint16_t igmp_v3_report_rsvd; /* Reserved */ - uint16_t igmp_v3_report_num_rcrds; /* Number of records */ + igmp_hdr igmp_v3_report_hdr; /* Packet header */ + uint16_t igmp_v3_report_rsvd; /* Reserved */ + uint16_t igmp_v3_report_num_rcrds; /* Number of records */ igmp_v3_rpt_rcrd igmp_v3_report_rcrd[0]; /* Set records */ } igmp_v3_report; @@ -92,7 +92,7 @@ typedef struct igmp_v3_report_ { * This is a hack to access the header to determine the packet type. */ typedef struct igmp_naked_header_ { - igmp_hdr igmp_naked_header_hdr; /* Packet header */ + igmp_hdr igmp_naked_header_hdr; /* Packet header */ } igmp_naked_header; @@ -102,10 +102,10 @@ typedef struct igmp_naked_header_ { * This is a union of all types to aid in type coercion. */ typedef union igmp_packet_ { - igmp_naked_header igmp_pkt_naked; /* Naked header */ - igmp_v1v2_pkt igmp_pkt_v1v2; /* V1/V2 packet */ - igmp_v3_query igmp_pkt_v3_query; /* V3 query */ - igmp_v3_report igmp_pkt_v3_rpt; /* V3 report */ + igmp_naked_header igmp_pkt_naked; /* Naked header */ + igmp_v1v2_pkt igmp_pkt_v1v2; /* V1/V2 packet */ + igmp_v3_query igmp_pkt_v3_query; /* V3 query */ + igmp_v3_report igmp_pkt_v3_rpt; /* V3 report */ } igmp_packet; @@ -114,24 +114,24 @@ typedef union igmp_packet_ { * * The Max Resp and QQIC fields in version 3 can be fixed or floating point. */ -#define IGMP_FIXFLOAT_FLAG 0x80 /* Set if floating point */ -#define IGMP_FLOAT_EXP_MASK 0x70 /* Floating point exponent mask */ -#define IGMP_FLOAT_EXP_SHIFT 4 /* Shift count for exponent */ -#define IGMP_FLOAT_MANT_MASK 0x0F /* Floating point mantissa mask */ -#define IGMP_FLOAT_MANT_HIGHBIT 0x10 /* High bit of mantissa */ -#define IGMP_FLOAT_MAX_MANT 0x1F /* Max mantissa portion */ -#define IGMP_FLOAT_MANT_SHIFT 0 /* Shift count for mantissa */ -#define IGMP_FLOAT_EXP_OFFSET 3 /* Offset bits to add */ -#define IGMP_FLOAT_MAX_EXP 0x07 /* Maximum exponent value */ +#define IGMP_FIXFLOAT_FLAG 0x80 /* Set if floating point */ +#define IGMP_FLOAT_EXP_MASK 0x70 /* Floating point exponent mask */ +#define IGMP_FLOAT_EXP_SHIFT 4 /* Shift count for exponent */ +#define IGMP_FLOAT_MANT_MASK 0x0F /* Floating point mantissa mask */ +#define IGMP_FLOAT_MANT_HIGHBIT 0x10 /* High bit of mantissa */ +#define IGMP_FLOAT_MAX_MANT 0x1F /* Max mantissa portion */ +#define IGMP_FLOAT_MANT_SHIFT 0 /* Shift count for mantissa */ +#define IGMP_FLOAT_EXP_OFFSET 3 /* Offset bits to add */ +#define IGMP_FLOAT_MAX_EXP 0x07 /* Maximum exponent value */ #define IGMP_MAX_FLOAT_ENCODABLE \ - ((IGMP_FLOAT_MANT_MASK | IGMP_FLOAT_MANT_HIGHBIT) << \ - (IGMP_FLOAT_MAX_EXP + IGMP_FLOAT_EXP_OFFSET)) - /* Maximum encodable value */ + ((IGMP_FLOAT_MANT_MASK | IGMP_FLOAT_MANT_HIGHBIT) << \ + (IGMP_FLOAT_MAX_EXP + IGMP_FLOAT_EXP_OFFSET)) + /* Maximum encodable value */ -#define IGMP_MAX_RESP_MSEC 100 /* Max Resp is in units of 100 msec */ -#define IGMP_MAX_RESP_DEFAULT 100 /* Default Max Resp val (* 100 msec) */ -#define IGMP_V2_MAX_MAX_RESP 0xFF /* Maximum Max Resp value for V2 */ +#define IGMP_MAX_RESP_MSEC 100 /* Max Resp is in units of 100 msec */ +#define IGMP_MAX_RESP_DEFAULT 100 /* Default Max Resp val (* 100 msec) */ +#define IGMP_V2_MAX_MAX_RESP 0xFF /* Maximum Max Resp value for V2 */ /* diff --git a/src/vnsw/agent/services/multicast/grpmgmt/mld_proto.h b/src/vnsw/agent/services/multicast/grpmgmt/mld_proto.h index c3288cf1a92..3c88638dd64 100644 --- a/src/vnsw/agent/services/multicast/grpmgmt/mld_proto.h +++ b/src/vnsw/agent/services/multicast/grpmgmt/mld_proto.h @@ -23,15 +23,15 @@ * The MLD header qualifies the contents of the rest of the packet. */ typedef struct mld_hdr_ { - uint8_t mld_hdr_type; /* packet type */ - uint8_t mld_hdr_resv; /* Reserved */ - uint16_t mld_hdr_cksum; /* Checksum */ + uint8_t mld_hdr_type; /* packet type */ + uint8_t mld_hdr_resv; /* Reserved */ + uint16_t mld_hdr_cksum; /* Checksum */ } mld_hdr; -#define MLD_TYPE_QUERY 130 /* Query (all versions) */ -#define MLD_TYPE_V1_REPORT 131 /* Version 1 Report */ -#define MLD_TYPE_V1_LEAVE 132 /* Version 1 Leave */ -#define MLD_TYPE_V2_REPORT 143 /* Version 2 Report */ +#define MLD_TYPE_QUERY 130 /* Query (all versions) */ +#define MLD_TYPE_V1_REPORT 131 /* Version 1 Report */ +#define MLD_TYPE_V1_LEAVE 132 /* Version 1 Leave */ +#define MLD_TYPE_V2_REPORT 143 /* Version 2 Report */ /* * Version 1 packets @@ -39,9 +39,9 @@ typedef struct mld_hdr_ { * All MLD v1 packets have the same format. */ typedef struct mld_v1_pkt_ { - mld_hdr mld_v1_pkt_hdr; /* Packet header */ - uint16_t mld_v1_max_resp; /* Maximum Response Delay */ - uint16_t mld_v1_resv; /* Reserved */ + mld_hdr mld_v1_pkt_hdr; /* Packet header */ + uint16_t mld_v1_max_resp; /* Maximum Response Delay */ + uint16_t mld_v1_resv; /* Reserved */ uint8_t mld_v1_pkt_group[IPV6_ADDR_LEN]; /* Group address */ } mld_v1_pkt; @@ -50,18 +50,18 @@ typedef struct mld_v1_pkt_ { * Version 2 Query packet */ typedef struct mld_v2_query_ { - mld_hdr mld_v2_query_hdr; /* Packet header */ - uint16_t mld_v2_max_resp; /* Max resp code */ - uint16_t mld_v2_resv; /* Reserved */ + mld_hdr mld_v2_query_hdr; /* Packet header */ + uint16_t mld_v2_max_resp; /* Max resp code */ + uint16_t mld_v2_resv; /* Reserved */ uint8_t mld_v2_query_group[IPV6_ADDR_LEN]; /* Group address */ - uint8_t mld_v2_query_s_qrv; /* S/QRV fields */ - uint8_t mld_v2_query_qqic; /* QQIC */ - uint16_t mld_v2_query_num_srcs; /* Number of sources */ - uint8_t mld_v2_query_source[0]; /* Array of sources */ + uint8_t mld_v2_query_s_qrv; /* S/QRV fields */ + uint8_t mld_v2_query_qqic; /* QQIC */ + uint16_t mld_v2_query_num_srcs; /* Number of sources */ + uint8_t mld_v2_query_source[0]; /* Array of sources */ } mld_v2_query; -#define MLD_SUPP_RTR_PROC_MASK 0x8 /* "S" bit in s_qrv field */ -#define MLD_QRV_MASK 0x7 /* QRV value in s_qrv field */ +#define MLD_SUPP_RTR_PROC_MASK 0x8 /* "S" bit in s_qrv field */ +#define MLD_QRV_MASK 0x7 /* QRV value in s_qrv field */ /* @@ -70,9 +70,9 @@ typedef struct mld_v2_query_ { * Version 2 reports have one or more group records. */ typedef struct mld_v2_rpt_rcrd_ { - uint8_t mld_v2_rpt_rec_type; /* Record type */ - uint8_t mld_v2_rpt_aux_len; /* Auxiliary data length */ - uint16_t mld_v2_rpt_num_srcs; /* Number of sources */ + uint8_t mld_v2_rpt_rec_type; /* Record type */ + uint8_t mld_v2_rpt_aux_len; /* Auxiliary data length */ + uint16_t mld_v2_rpt_num_srcs; /* Number of sources */ uint8_t mld_v2_rpt_group[IPV6_ADDR_LEN]; /* Group address */ } mld_v2_rpt_rcrd; @@ -82,9 +82,9 @@ static inline uint8_t* get_mld_v2_rpt_source(mld_v2_rpt_rcrd *ptr) { } typedef struct mld_v2_report_ { - mld_hdr mld_v2_report_hdr; /* Packet header */ - uint16_t mld_v2_report_rsvd; /* Reserved */ - uint16_t mld_v2_report_num_rcrds; /* Number of records */ + mld_hdr mld_v2_report_hdr; /* Packet header */ + uint16_t mld_v2_report_rsvd; /* Reserved */ + uint16_t mld_v2_report_num_rcrds; /* Number of records */ mld_v2_rpt_rcrd mld_v2_report_rcrd[0]; /* Set records */ } mld_v2_report; @@ -95,8 +95,8 @@ typedef struct mld_v2_report_ { * This is a hack to access the header to determine the packet type. */ typedef struct mld_naked_header_ { - mld_hdr mld_naked_header_hdr; /* Packet header */ - uint16_t mld_naked_max_resp; /* Max resp code */ + mld_hdr mld_naked_header_hdr; /* Packet header */ + uint16_t mld_naked_max_resp; /* Max resp code */ } mld_naked_header; @@ -106,10 +106,10 @@ typedef struct mld_naked_header_ { * This is a union of all types to aid in type coercion. */ typedef union mld_packet_ { - mld_naked_header mld_pkt_naked; /* Naked header */ - mld_v1_pkt mld_pkt_v1; /* V1 packet */ - mld_v2_query mld_pkt_v2_query; /* V2 query */ - mld_v2_report mld_pkt_v2_rpt; /* V2 report */ + mld_naked_header mld_pkt_naked; /* Naked header */ + mld_v1_pkt mld_pkt_v1; /* V1 packet */ + mld_v2_query mld_pkt_v2_query; /* V2 query */ + mld_v2_report mld_pkt_v2_rpt; /* V2 report */ } mld_packet; @@ -118,43 +118,43 @@ typedef union mld_packet_ { * * The Max Resp field in version 2 can be fixed or floating point. */ -#define MLD_MAXRSP_FIXFLOAT_FLAG 0x8000 /* Set if floating point */ +#define MLD_MAXRSP_FIXFLOAT_FLAG 0x8000 /* Set if floating point */ #define MLD_MAXRSP_EXP_MASK 0x7000 /* Floating point exponent mask */ -#define MLD_MAXRSP_EXP_SHIFT 12 /* Shift count for exponent */ +#define MLD_MAXRSP_EXP_SHIFT 12 /* Shift count for exponent */ #define MLD_MAXRSP_MANT_MASK 0x0FFF /* Floating point mantissa mask */ -#define MLD_MAXRSP_MANT_HIGHBIT 0x1000 /* High bit of mantissa */ -#define MLD_MAXRSP_MAX_MANT 0x1FFF /* Max mantissa portion */ -#define MLD_MAXRSP_MANT_SHIFT 0 /* Shift count for mantissa */ -#define MLD_MAXRSP_EXP_OFFSET 3 /* Offset bits to add */ -#define MLD_MAXRSP_MAX_EXP 0x07 /* Maximum exponent value */ +#define MLD_MAXRSP_MANT_HIGHBIT 0x1000 /* High bit of mantissa */ +#define MLD_MAXRSP_MAX_MANT 0x1FFF /* Max mantissa portion */ +#define MLD_MAXRSP_MANT_SHIFT 0 /* Shift count for mantissa */ +#define MLD_MAXRSP_EXP_OFFSET 3 /* Offset bits to add */ +#define MLD_MAXRSP_MAX_EXP 0x07 /* Maximum exponent value */ #define MLD_MAX_MAXRSP_ENCODABLE \ - ((MLD_MAXRSP_MANT_MASK | MLD_MAXRSP_MANT_HIGHBIT) << \ - (MLD_MAXRSP_MAX_EXP + MLD_MAXRSP_EXP_OFFSET)) - /* Maximum encodable value */ + ((MLD_MAXRSP_MANT_MASK | MLD_MAXRSP_MANT_HIGHBIT) << \ + (MLD_MAXRSP_MAX_EXP + MLD_MAXRSP_EXP_OFFSET)) + /* Maximum encodable value */ /* * QQIC field * * The QQIC field in version 2 can be fixed or floating point. */ -#define MLD_QQIC_FIXFLOAT_FLAG 0x80 /* Set if floating point */ -#define MLD_QQIC_EXP_MASK 0x70 /* Floating point exponent mask */ -#define MLD_QQIC_EXP_SHIFT 4 /* Shift count for exponent */ -#define MLD_QQIC_MANT_MASK 0x0F /* Floating point mantissa mask */ -#define MLD_QQIC_MANT_HIGHBIT 0x10 /* High bit of mantissa */ -#define MLD_QQIC_MAX_MANT 0x1F /* Max mantissa portion */ -#define MLD_QQIC_MANT_SHIFT 0 /* Shift count for mantissa */ -#define MLD_QQIC_EXP_OFFSET 3 /* Offset bits to add */ -#define MLD_QQIC_MAX_EXP 0x07 /* Maximum exponent value */ +#define MLD_QQIC_FIXFLOAT_FLAG 0x80 /* Set if floating point */ +#define MLD_QQIC_EXP_MASK 0x70 /* Floating point exponent mask */ +#define MLD_QQIC_EXP_SHIFT 4 /* Shift count for exponent */ +#define MLD_QQIC_MANT_MASK 0x0F /* Floating point mantissa mask */ +#define MLD_QQIC_MANT_HIGHBIT 0x10 /* High bit of mantissa */ +#define MLD_QQIC_MAX_MANT 0x1F /* Max mantissa portion */ +#define MLD_QQIC_MANT_SHIFT 0 /* Shift count for mantissa */ +#define MLD_QQIC_EXP_OFFSET 3 /* Offset bits to add */ +#define MLD_QQIC_MAX_EXP 0x07 /* Maximum exponent value */ #define MLD_MAX_QQIC_ENCODABLE \ - ((MLD_QQIC_MANT_MASK | MLD_QQIC_MANT_HIGHBIT) << \ - (MLD_QQIC_MAX_EXP + MLD_QQIC_EXP_OFFSET)) - /* Maximum encodable value */ + ((MLD_QQIC_MANT_MASK | MLD_QQIC_MANT_HIGHBIT) << \ + (MLD_QQIC_MAX_EXP + MLD_QQIC_EXP_OFFSET)) + /* Maximum encodable value */ -#define MLD_MAX_RESP_MSEC 1 /* Max Resp is in units of msec */ -#define MLD_MAX_RESP_DEFAULT 10000 /* Default Max Resp val msec) */ -#define MLD_V1_MAX_MAX_RESP 0xFFFF /* Maximum Max Resp value for V1 */ +#define MLD_MAX_RESP_MSEC 1 /* Max Resp is in units of msec */ +#define MLD_MAX_RESP_DEFAULT 10000 /* Default Max Resp val msec) */ +#define MLD_V1_MAX_MAX_RESP 0xFFFF /* Maximum Max Resp value for V1 */ diff --git a/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector.h b/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector.h index 7b7ec3c020c..27dc3b90f69 100644 --- a/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector.h +++ b/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector.h @@ -174,7 +174,7 @@ * with optional callback. (A "clear" operation clears any bit * that is set in the second vector.) * - * int bv_copy_vector(bit_vector *src, bit_vector *dest, + * int bv_copy_vector(bit_vector *src, bit_vector *dest, * bv_callback callback, void *context, * bv_callback_option cb_opt) * Copies the contents of vector "src" to vector "dest", with optional @@ -370,18 +370,18 @@ * number if no allocated blocks with free bits are available. */ -typedef uint32_t bv_bitnum_t; /* Bit number */ -#define BV_BAD_BITNUM 0xffffffff /* Illegal bit number */ +typedef uint32_t bv_bitnum_t; /* Bit number */ +#define BV_BAD_BITNUM 0xffffffff /* Illegal bit number */ typedef struct bit_vector_ { - bvx_patroot *bv_root; /* Patricia root */ - uint32_t bv_entry_count; /* Number of attached entries */ - thread bv_nonfull_head; /* Head of non-full entries */ - bv_bitnum_t bv_callback_ord; /* Ordinal of callback bit */ - bv_bitnum_t bv_freed_ord; /* Ordinal of a freed entry */ - boolean bv_fastvects; /* Perform fast vector operations */ - boolean bv_cb_result; /* TRUE if vector is callback result */ - boolean bv_cb_source; /* TRUE if vector is callback source */ + bvx_patroot *bv_root; /* Patricia root */ + uint32_t bv_entry_count; /* Number of attached entries */ + thread bv_nonfull_head; /* Head of non-full entries */ + bv_bitnum_t bv_callback_ord; /* Ordinal of callback bit */ + bv_bitnum_t bv_freed_ord; /* Ordinal of a freed entry */ + boolean bv_fastvects; /* Perform fast vector operations */ + boolean bv_cb_result; /* TRUE if vector is callback result */ + boolean bv_cb_source; /* TRUE if vector is callback source */ } bit_vector; /* @@ -393,7 +393,7 @@ typedef struct bit_vector_ { * save time in some situations. */ typedef boolean (*bv_callback)(void *context, bv_bitnum_t bit_number, - boolean new_bit_value, boolean old_bit_value); + boolean new_bit_value, boolean old_bit_value); @@ -401,8 +401,8 @@ typedef boolean (*bv_callback)(void *context, bv_bitnum_t bit_number, * Definitions of bit result callback options. */ typedef enum { - BV_CALL_CHANGE, /* Call back if result bit changed */ - BV_CALL_SET /* Call back if result bit is set */ + BV_CALL_CHANGE, /* Call back if result bit changed */ + BV_CALL_SET /* Call back if result bit is set */ } bv_callback_option; /* Externals */ @@ -413,27 +413,27 @@ extern boolean bv_clear_bit(bit_vector *bv, bv_bitnum_t bit_number); extern boolean bv_bit_is_set(bit_vector *bv, bv_bitnum_t bit_number); extern void bv_init_vector(bit_vector *bv, boolean fast_vects); extern int bv_and_vectors(bit_vector *first, bit_vector *second, - bit_vector *result, bv_callback callback, - void *context, bv_callback_option cb_opt); + bit_vector *result, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int bv_or_vectors(bit_vector *first, bit_vector *second, - bit_vector *result, bv_callback callback, - void *context, bv_callback_option cb_opt); + bit_vector *result, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int bv_xor_vectors(bit_vector *first, bit_vector *second, - bit_vector *result, bv_callback callback, - void *context, bv_callback_option cb_opt); + bit_vector *result, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int bv_clear_vectors(bit_vector *first, bit_vector *second, - bit_vector *result, bv_callback callback, - void *context, bv_callback_option cb_opt); + bit_vector *result, bv_callback callback, + void *context, bv_callback_option cb_opt); extern int bv_copy_vector(bit_vector *src, bit_vector *dest, - bv_callback callback, void *context, - bv_callback_option cb_opt); + bv_callback callback, void *context, + bv_callback_option cb_opt); extern int bv_walk_vector(bit_vector *vect, bv_callback callback, - void *context); + void *context); extern bv_bitnum_t bv_first_set_bit(bit_vector *bv); extern boolean bv_empty(bit_vector *bv); extern bv_bitnum_t bv_first_clear_bit(bit_vector *bv); extern bv_bitnum_t bv_find_clear_bit(bit_vector *bv); extern void bv_clear_all_bits(bit_vector *bv, bv_callback callback, - void *context, bv_callback_option cb_opt); + void *context, bv_callback_option cb_opt); #endif /* __BITVECTOR_H__ */ diff --git a/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector_private.h b/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector_private.h index d961c59bfd3..2dcc4907a4c 100644 --- a/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector_private.h +++ b/src/vnsw/agent/services/multicast/stubs/bitvector/bitvector_private.h @@ -37,9 +37,9 @@ * in the vector is defined by bv_word_t. All are defined in the * environment file. */ -#define BV_BITSPERWORD (sizeof(bv_word_t) * 8) /* Bits per word */ -#define BV_BITSIZE (1 << (BV_BITSIZE_LOG2)) /* Number of bits per entry */ -#define BV_WORDSIZE ((BV_BITSIZE + BV_BITSPERWORD - 1) / BV_BITSPERWORD) +#define BV_BITSPERWORD (sizeof(bv_word_t) * 8) /* Bits per word */ +#define BV_BITSIZE (1 << (BV_BITSIZE_LOG2)) /* Number of bits per entry */ +#define BV_WORDSIZE ((BV_BITSIZE + BV_BITSPERWORD - 1) / BV_BITSPERWORD) /* @@ -62,19 +62,19 @@ * to flag this case. */ typedef struct bv_entry_ { - thread bv_ent_nonfull_thread; /* Entry on non-full-entry thread */ - bvx_patnode bv_ent_node; /* Patricia node */ + thread bv_ent_nonfull_thread; /* Entry on non-full-entry thread */ + bvx_patnode bv_ent_node; /* Patricia node */ uint8_t bv_key[sizeof(bv_bitnum_t)]; /* Patricia key */ - bv_bitnum_t bv_start; /* Starting bit number */ - int bv_setcount; /* Number of set bits */ - bv_word_t bv_bits[BV_WORDSIZE]; /* Actual bits */ + bv_bitnum_t bv_start; /* Starting bit number */ + int bv_setcount; /* Number of set bits */ + bv_word_t bv_bits[BV_WORDSIZE]; /* Actual bits */ } bv_entry; BVX_PATNODE_TO_STRUCT(bv_patnode_to_bv_entry, bv_entry, bv_ent_node); THREAD_TO_STRUCT(bv_thread_to_bv_entry, bv_entry, bv_ent_nonfull_thread); -#define BV_UNKNOWN_COUNT -1 /* bv_setcount unknown */ -#define BV_ALLSET ((bv_word_t)(~0)) /* All-ones constant */ +#define BV_UNKNOWN_COUNT -1 /* bv_setcount unknown */ +#define BV_ALLSET ((bv_word_t)(~0)) /* All-ones constant */ #define BV_MAX_BITNUM ((0x7fffffff - BV_BITSIZE) + 1) /* Max bit num + 1 */ diff --git a/src/vnsw/agent/services/multicast/stubs/bitvector/ordinal_private.h b/src/vnsw/agent/services/multicast/stubs/bitvector/ordinal_private.h index dc451eea0a3..ead7e14e211 100644 --- a/src/vnsw/agent/services/multicast/stubs/bitvector/ordinal_private.h +++ b/src/vnsw/agent/services/multicast/stubs/bitvector/ordinal_private.h @@ -16,8 +16,8 @@ * track of the ordinal space. */ typedef struct ord_context_ { - bit_vector ord_vector; /* Bit vector */ - ord_compact_option ord_compact; /* Compact mode */ + bit_vector ord_vector; /* Bit vector */ + ord_compact_option ord_compact; /* Compact mode */ } ord_context; #endif /* __ORDINAL_PRIVATE_H__ */ diff --git a/src/vnsw/agent/services/services_init.cc b/src/vnsw/agent/services/services_init.cc index 3600442bf37..adb3b00e601 100644 --- a/src/vnsw/agent/services/services_init.cc +++ b/src/vnsw/agent/services/services_init.cc @@ -29,7 +29,7 @@ SandeshTraceBufferPtr MetadataTraceBuf(SandeshTraceBufferCreate("Metadata", 500) SandeshTraceBufferPtr BfdTraceBuf(SandeshTraceBufferCreate("Bfd", 500)); SandeshTraceBufferPtr IgmpTraceBuf(SandeshTraceBufferCreate("Igmp", 500)); -ServicesModule::ServicesModule(Agent *agent, const std::string &metadata_secret) +ServicesModule::ServicesModule(Agent *agent, const std::string &metadata_secret) : agent_(agent), metadata_secret_key_(metadata_secret), dhcp_proto_(NULL), dhcpv6_proto_(NULL), dns_proto_(NULL), arp_proto_(NULL), bfd_proto_(NULL), icmp_proto_(NULL), icmpv6_proto_(NULL), igmp_proto_(NULL), metadata_proxy_(NULL) { diff --git a/src/vnsw/agent/services/services_sandesh.cc b/src/vnsw/agent/services/services_sandesh.cc index 2ed99f5e533..33a2e2d3fcc 100644 --- a/src/vnsw/agent/services/services_sandesh.cc +++ b/src/vnsw/agent/services/services_sandesh.cc @@ -39,7 +39,7 @@ (stats.icmpv6_neighbor_advert_unsolicited_); \ list.push_back(entry); -std::map g_ip_protocol_map = +std::map g_ip_protocol_map = boost::assign::map_list_of (1, "icmp") (2, "igmp") @@ -82,7 +82,7 @@ std::map g_dhcpv6_msg_types = void ServicesSandesh::MacToString(const unsigned char *mac, std::string &mac_str) { char mstr[32]; - snprintf(mstr, 32, "%02x:%02x:%02x:%02x:%02x:%02x", + snprintf(mstr, 32, "%02x:%02x:%02x:%02x:%02x:%02x", mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]); mac_str.assign(mstr); } @@ -164,7 +164,7 @@ void ServicesSandesh::PktStatsSandesh(std::string ctxt, bool more) { void ServicesSandesh::DhcpStatsSandesh(std::string ctxt, bool more) { DhcpStats *dhcp = new DhcpStats(); - const DhcpProto::DhcpStats &dstats = + const DhcpProto::DhcpStats &dstats = Agent::GetInstance()->GetDhcpProto()->GetStats(); dhcp->set_dhcp_discover(dstats.discover); dhcp->set_dhcp_request(dstats.request); @@ -500,7 +500,7 @@ ServicesSandesh::FillOptionInteger(uint32_t data, std::string msg) { return str.str(); } -std::string +std::string ServicesSandesh::FillOptionIp(uint32_t data, std::string msg) { Ip4Address addr(data); return msg + addr.to_string() + "; "; @@ -562,7 +562,7 @@ void ServicesSandesh::FillDhcpv4Options(Dhcpv4Options *opt, std::string &resp, case DHCP_OPTION_DOMAIN_NAME: if (len >= (2 + opt->len)) - resp += FillOptionString((char *)opt->data, opt->len, + resp += FillOptionString((char *)opt->data, opt->len, "Domain Name : "); break; @@ -637,7 +637,7 @@ void ServicesSandesh::FillDhcpv4Hdr(dhcphdr *dhcp, Dhcpv4Hdr &resp, resp.hops = dhcp->hops; resp.xid = IntToHexString(dhcp->xid); resp.secs = ntohs(dhcp->secs); - resp.flags = + resp.flags = (ntohs(dhcp->flags) & DHCP_BCAST_FLAG) ? "broadcast" : "unicast"; Ip4Address ciaddr(ntohl(dhcp->ciaddr)); Ip4Address yiaddr(ntohl(dhcp->yiaddr)); @@ -674,7 +674,7 @@ void ServicesSandesh::FillDnsHdr(dnshdr *dns, DnsHdr &resp, int32_t dnslen) { resp.flags += "truncated; "; if (dns->flags.auth) resp.flags += "authoritative answer; "; - resp.flags += (!dns->flags.op) ? "query; " : + resp.flags += (!dns->flags.op) ? "query; " : ((dns->flags.op == DNS_OPCODE_UPDATE)? "update; " : "other op; "); if (dns->flags.req) { @@ -908,7 +908,7 @@ void ServicesSandesh::MetadataHandleRequest(std::string ctxt, bool more = false) MetadataResponse *resp = new MetadataResponse(); resp->set_metadata_server_port( Agent::GetInstance()->metadata_server_port()); - const MetadataProxy::MetadataStats &stats = + const MetadataProxy::MetadataStats &stats = Agent::GetInstance()->services()->metadataproxy()->metadatastats(); resp->set_metadata_requests(stats.requests); resp->set_metadata_responses(stats.responses); @@ -1036,7 +1036,7 @@ void PktTraceInfo::HandleRequest() const { void ShowDnsEntries::HandleRequest() const { AgentDnsEntries *resp = new AgentDnsEntries(); std::vector dns_list; - const DnsProto::DnsUpdateSet &dns_update_set = + const DnsProto::DnsUpdateSet &dns_update_set = Agent::GetInstance()->GetDnsProto()->update_set(); for (DnsProto::DnsUpdateSet::const_iterator it = dns_update_set.begin(); it != dns_update_set.end(); ++it) { diff --git a/src/vnsw/agent/services/services_sandesh.h b/src/vnsw/agent/services/services_sandesh.h index bae2a25d02f..11764d1c698 100644 --- a/src/vnsw/agent/services/services_sandesh.h +++ b/src/vnsw/agent/services/services_sandesh.h @@ -75,7 +75,7 @@ class ArpSandesh { public: static const uint8_t entries_per_sandesh = 100; ArpSandesh(SandeshResponse *resp) : iter_(0), resp_(resp) {}; - bool SetArpEntry(const ArpKey &key, const ArpEntry *entry); + bool SetArpEntry(const ArpKey &key, const ArpEntry *entry); void Response() { resp_->Response(); } void SetInterfaceArpStatsEntry( ArpProto::InterfaceArpMap::const_iterator &it, diff --git a/src/vnsw/agent/services/test/arp_path_preference_test.cc b/src/vnsw/agent/services/test/arp_path_preference_test.cc index 4246b364ca9..7434209f67e 100644 --- a/src/vnsw/agent/services/test/arp_path_preference_test.cc +++ b/src/vnsw/agent/services/test/arp_path_preference_test.cc @@ -89,7 +89,7 @@ class ArpPathPreferenceTest : public ::testing::Test { Agent *agent; }; -//Check EVPN route and IP route list has +//Check EVPN route and IP route list has //interface ID TEST_F(ArpPathPreferenceTest, Test1) { uint32_t vrf_id = VrfGet("vrf1")->vrf_id(); @@ -177,7 +177,7 @@ int main(int argc, char *argv[]) { client = TestInit(init_file, ksync_init, true, true); usleep(100000); client->WaitForIdle(); - + int ret = RUN_ALL_TESTS(); TestShutdown(); delete client; diff --git a/src/vnsw/agent/services/test/arp_test.cc b/src/vnsw/agent/services/test/arp_test.cc index 1814933c78a..873287d04cc 100644 --- a/src/vnsw/agent/services/test/arp_test.cc +++ b/src/vnsw/agent/services/test/arp_test.cc @@ -166,8 +166,8 @@ class ArpTest : public ::testing::Test { PhysicalInterfaceKey key(Agent::GetInstance()->fabric_interface_name()); Interface *eth = static_cast (Agent::GetInstance()->interface_table()->FindActiveEntry(&key)); - ArpProto::ArpIpc *ipc = - new ArpProto::ArpIpc(type, addr, + ArpProto::ArpIpc *ipc = + new ArpProto::ArpIpc(type, addr, Agent::GetInstance()->vrf_table()-> FindVrfFromName(Agent::GetInstance()->fabric_vrf_name()), eth); Agent::GetInstance()->pkt()->pkt_handler()->SendMessage(PktHandler::ARP, ipc); @@ -489,7 +489,7 @@ TEST_F(ArpTest, GratArpSendTest) { EXPECT_TRUE(Agent::GetInstance()->GetArpProto()->FindGratiousArpEntry(key) != NULL); Agent::GetInstance()->fabric_inet4_unicast_table()->DeleteReq( - Agent::GetInstance()->local_peer(), + Agent::GetInstance()->local_peer(), Agent::GetInstance()->fabric_vrf_name(), ip1, 32, NULL); client->WaitForIdle(); @@ -502,7 +502,7 @@ TEST_F(ArpTest, GratArpSendTest) { ArpKey key1(ip2.to_ulong(), vrf); EXPECT_TRUE(Agent::GetInstance()->GetArpProto()->FindGratiousArpEntry(key1) != NULL); Agent::GetInstance()->fabric_inet4_unicast_table()->DeleteReq( - Agent::GetInstance()->local_peer(), + Agent::GetInstance()->local_peer(), Agent::GetInstance()->fabric_vrf_name(), ip2, 32, NULL); client->WaitForIdle(); @@ -713,7 +713,7 @@ TEST_F(ArpTest, DISABLED_SubnetResolveWithoutPolicy) { const ArpNH *arp_nh = static_cast(rt->GetActiveNextHop()); EXPECT_TRUE(arp_nh->GetInterface() == vintf); EXPECT_TRUE(arp_nh->PolicyEnabled() == false); - EXPECT_TRUE(rt->GetActivePath()->dest_vn_name() == "vn1"); + EXPECT_TRUE(rt->GetActivePath()->dest_vn_name() == "vn1"); DelLink("virtual-machine-interface", input1[0].name, "subnet", "subnet"); @@ -822,7 +822,7 @@ TEST_F(ArpTest, DISABLED_SubnetResolveWithPolicyUpdate) { client->WaitForIdle(); WAIT_FOR(500, 1000, arp_nh->GetResolveState() == true); EXPECT_TRUE(arp_nh->PolicyEnabled() == false); - + //Change policy of interface AddAcl("acl1", 1); AddLink("virtual-network", "vn1", "access-control-list", "acl1"); diff --git a/src/vnsw/agent/services/test/dhcp_test.cc b/src/vnsw/agent/services/test/dhcp_test.cc index f9b2ab70c35..013aba3cf72 100644 --- a/src/vnsw/agent/services/test/dhcp_test.cc +++ b/src/vnsw/agent/services/test/dhcp_test.cc @@ -92,9 +92,9 @@ class DhcpTest : public ::testing::Test { } } - uint32_t GetItfCount() { + uint32_t GetItfCount() { tbb::mutex::scoped_lock lock(mutex_); - return itf_count_; + return itf_count_; } void WaitForItfUpdate(unsigned int expect_count) { @@ -106,9 +106,9 @@ class DhcpTest : public ::testing::Test { } } - std::size_t GetItfId(int index) { + std::size_t GetItfId(int index) { tbb::mutex::scoped_lock lock(mutex_); - return itf_id_[index]; + return itf_id_[index]; } std::size_t GetGwItfId() { @@ -116,7 +116,7 @@ class DhcpTest : public ::testing::Test { return gw_itf_id_; } - std::size_t fabric_interface_id() { + std::size_t fabric_interface_id() { PhysicalInterfaceKey key(Agent::GetInstance()->params()->eth_port().c_str()); Interface *intf = static_cast (Agent::GetInstance()->interface_table()->FindActiveEntry(&key)); @@ -455,13 +455,13 @@ class DhcpTest : public ::testing::Test { EXPECT_EQ(1U, stats.acks); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 2, 1, 0); + DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -673,13 +673,13 @@ TEST_F(DhcpTest, DhcpReqTest) { all_sandesh->Release(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 2, 1, 0); + DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -708,7 +708,7 @@ TEST_F(DhcpTest, DhcpOtherReqTest) { EXPECT_EQ(1U, stats.release); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -735,7 +735,7 @@ TEST_F(DhcpTest, DhcpOptionTest) { {CLIENT_REQ_PREFIX, 24, CLIENT_REQ_GW, true}, }; char vdns_attr[] = "\n test.domain\n true\n fixed\n 120\n \n"; - char ipam_attr[] = + char ipam_attr[] = "\ virtual-dns-server\ \ @@ -788,13 +788,13 @@ TEST_F(DhcpTest, DhcpOptionTest) { sand->Release(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -837,11 +837,11 @@ TEST_F(DhcpTest, DhcpNakTest) { sand->Release(); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -901,11 +901,11 @@ TEST_F(DhcpTest, DhcpShortLeaseTest) { WaitForItfUpdate(0); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -926,7 +926,7 @@ TEST_F(DhcpTest, DhcpTenantDnsTest) { IpamInfo ipam_info[] = { {"3.2.5.0", 24, "3.2.5.254", true}, }; - char ipam_attr[] = + char ipam_attr[] = "\ tenant-dns-server\ \ @@ -968,11 +968,11 @@ TEST_F(DhcpTest, DhcpTenantDnsTest) { EXPECT_EQ(1U, stats.acks); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -1006,7 +1006,7 @@ TEST_F(DhcpTest, DhcpFabricPortTest) { client->Reset(); DeleteVmportEnv(input, 1, 1, 0, NULL, - Agent::GetInstance()->fabric_vrf_name().c_str()); + Agent::GetInstance()->fabric_vrf_name().c_str()); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -1050,7 +1050,7 @@ TEST_F(DhcpTest, DhcpZeroIpTest) { client->Reset(); DeleteVmportEnv(input, 1, 1, 0, NULL, - Agent::GetInstance()->fabric_vrf_name().c_str()); + Agent::GetInstance()->fabric_vrf_name().c_str()); client->WaitForIdle(); Agent::GetInstance()->GetDhcpProto()->ClearStats(); @@ -1076,7 +1076,7 @@ TEST_F(DhcpTest, IpamSpecificDhcpOptions) { {"1.1.1.0", 24, "1.1.1.200", true}, }; char vdns_attr[] = "\n test.contrail.juniper.net\n true\n fixed\n 120\n \n"; - char ipam_attr[] = + char ipam_attr[] = "\ virtual-dns-server\ vdns1\ @@ -1158,13 +1158,13 @@ TEST_F(DhcpTest, IpamSpecificDhcpOptions) { new_sand->Release(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 2, 1, 0); + DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); ClearPktTrace(); @@ -1191,7 +1191,7 @@ TEST_F(DhcpTest, SubnetSpecificDhcpOptions) { {"1.1.1.0", 24, "1.1.1.200", true}, }; char vdns_attr[] = "\n test.contrail.juniper.net\n true\n fixed\n 120\n \n"; - char ipam_attr[] = + char ipam_attr[] = "\ default-dns-server\ \ @@ -1217,7 +1217,7 @@ TEST_F(DhcpTest, SubnetSpecificDhcpOptions) { 4.5.0.0/16 4.5.0.254 \ \ "; - char add_subnet_tags[] = + char add_subnet_tags[] = "\ \ 6\ @@ -1269,13 +1269,13 @@ TEST_F(DhcpTest, SubnetSpecificDhcpOptions) { sand->Release(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 2, 1, 0); + DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); ClearPktTrace(); @@ -1302,7 +1302,7 @@ TEST_F(DhcpTest, PortSpecificDhcpOptions) { {"7.8.9.0", 24, "7.8.9.12", true}, {"1.1.1.0", 24, "1.1.1.200", true}, }; - char ipam_attr[] = + char ipam_attr[] = "\ default-dns-server\ \ @@ -1325,7 +1325,7 @@ TEST_F(DhcpTest, PortSpecificDhcpOptions) { \ "; - char add_subnet_tags[] = + char add_subnet_tags[] = "\ \ 6\ @@ -1384,13 +1384,13 @@ TEST_F(DhcpTest, PortSpecificDhcpOptions) { sand->Release(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 2, 1, 0); + DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); ClearPktTrace(); diff --git a/src/vnsw/agent/services/test/dns_test.cc b/src/vnsw/agent/services/test/dns_test.cc index 25c8560bd25..fe7bdc00912 100644 --- a/src/vnsw/agent/services/test/dns_test.cc +++ b/src/vnsw/agent/services/test/dns_test.cc @@ -97,7 +97,7 @@ std::string auth_data[MAX_ITEMS] = {"8.8.8.254", class DnsTest : public ::testing::Test { public: - DnsTest() { + DnsTest() { Agent::GetInstance()->set_controller_ifmap_xmpp_server("127.0.0.1", 0); Agent::GetInstance()->set_ifmap_active_xmpp_server("127.0.0.1", 0); rid_ = Agent::GetInstance()->interface_table()->Register( @@ -144,7 +144,7 @@ class DnsTest : public ::testing::Test { add_items[i].soa.expiry = add_items[i].soa.ttl = 1000; } } - ~DnsTest() { + ~DnsTest() { Agent::GetInstance()->interface_table()->Unregister(rid_); } @@ -162,9 +162,9 @@ class DnsTest : public ::testing::Test { } } - uint32_t GetItfCount() { + uint32_t GetItfCount() { tbb::mutex::scoped_lock lock(mutex_); - return itf_count_; + return itf_count_; } void WaitForItfUpdate(unsigned int expect_count) { @@ -176,9 +176,9 @@ class DnsTest : public ::testing::Test { } } - std::size_t GetItfId(int index) { + std::size_t GetItfId(int index) { tbb::mutex::scoped_lock lock(mutex_); - return itf_id_; + return itf_id_; } void CHECK_STATS(DnsProto::DnsStats &stats, uint32_t req, uint32_t res, @@ -284,7 +284,7 @@ class DnsTest : public ::testing::Test { while (!Agent::GetInstance()->GetDnsProto()->IsDnsQueryInProgress(g_xid)) g_xid++; dnshdr *dns = (dnshdr *) buf; - BindUtil::BuildDnsHeader(dns, g_xid, DNS_QUERY_RESPONSE, + BindUtil::BuildDnsHeader(dns, g_xid, DNS_QUERY_RESPONSE, DNS_OPCODE_QUERY, 0, 0, 0, 0); if (flag) { dns->flags.ret = DNS_ERR_NO_SUCH_NAME; @@ -296,8 +296,8 @@ class DnsTest : public ::testing::Test { len = sizeof(dnshdr); uint8_t *ptr = (uint8_t *) (dns + 1); for (int i = 0; i < numQues; i++) - ptr = BindUtil::AddQuestionSection(ptr, items[i].name, - items[i].type, items[i].eclass, + ptr = BindUtil::AddQuestionSection(ptr, items[i].name, + items[i].type, items[i].eclass, len); for (int i = 0; i < numQues; i++) ptr = BindUtil::AddAnswerSection(ptr, items[i], len); @@ -326,7 +326,7 @@ class DnsTest : public ::testing::Test { void CheckSendXmppUpdate() { // Call the SendXmppUpdate directly and check that all items are done - AgentDnsXmppChannel *tmp_xmpp_channel = + AgentDnsXmppChannel *tmp_xmpp_channel = new AgentDnsXmppChannel(Agent::GetInstance(), "server", 0); Agent *agent = Agent::GetInstance(); boost::shared_ptr pkt_info(new PktInfo(Agent::GetInstance(), @@ -446,7 +446,7 @@ TEST_F(DnsTest, VirtualDnsReqTest) { {"1.1.1.0", 24, "1.1.1.200", true}, }; - char vdns_attr[] = + char vdns_attr[] = "\ test.contrail.juniper.net\ true\ @@ -586,7 +586,7 @@ TEST_F(DnsTest, VirtualDnsReqTest) { client->Reset(); DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); } @@ -976,7 +976,7 @@ TEST_F(DnsTest, VirtualDnsLinkLocalReqTest) { Agent::GetInstance()->GetDnsProto()->ClearStats(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); IntfCfgDel(input, 0); @@ -1002,7 +1002,7 @@ TEST_F(DnsTest, DnsXmppTest) { {"1.1.1.0", 24, "1.1.1.200", true}, }; - char vdns_attr[] = + char vdns_attr[] = "\ test.contrail.juniper.net\ true\ @@ -1046,13 +1046,13 @@ TEST_F(DnsTest, DnsXmppTest) { CheckSendXmppUpdate(); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); - DelVDNS("vdns1"); + DelVDNS("vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); Agent::GetInstance()->GetDnsProto()->ClearStats(); @@ -1261,11 +1261,11 @@ TEST_F(DnsTest, DnsDropTest) { CHECK_STATS(stats, 2, 0, 0, 0, 1, 1); client->Reset(); - DelIPAM("vn1", "vdns1"); + DelIPAM("vn1", "vdns1"); client->WaitForIdle(); client->Reset(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); IntfCfgDel(input, 0); diff --git a/src/vnsw/agent/services/test/icmp_test.cc b/src/vnsw/agent/services/test/icmp_test.cc index 6a19710bbbb..248dd9e0ffb 100644 --- a/src/vnsw/agent/services/test/icmp_test.cc +++ b/src/vnsw/agent/services/test/icmp_test.cc @@ -75,12 +75,12 @@ class IcmpTest : public ::testing::Test { } } - uint32_t GetItfCount() { + uint32_t GetItfCount() { tbb::mutex::scoped_lock lock(mutex_); - return itf_count_; + return itf_count_; } - std::size_t GetItfId(int index) { + std::size_t GetItfId(int index) { tbb::mutex::scoped_lock lock(mutex_); return itf_id_[index]; } @@ -343,10 +343,10 @@ TEST_F(IcmpTest, IcmpErrorTest) { {"1.1.1.0", 24, "1.1.1.200", true}, }; - CreateVmportEnv(input, 1, 0); + CreateVmportEnv(input, 1, 0); client->WaitForIdle(); client->Reset(); - AddIPAM("vn1", ipam_info, 1); + AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); SendIcmp(GetItfId(0), ntohl(inet_addr(ipam_info[0].gw)), TYPE_ERROR); diff --git a/src/vnsw/agent/services/test/icmpv6_path_preference_test.cc b/src/vnsw/agent/services/test/icmpv6_path_preference_test.cc index 4e55d6bb7c6..d28c0a7c2cf 100644 --- a/src/vnsw/agent/services/test/icmpv6_path_preference_test.cc +++ b/src/vnsw/agent/services/test/icmpv6_path_preference_test.cc @@ -91,7 +91,7 @@ class Icmp6PathPreferenceTest : public ::testing::Test { Agent *agent; }; -//Check EVPN route and IP route list has +//Check EVPN route and IP route list has //interface ID TEST_F(Icmp6PathPreferenceTest, Test1) { uint32_t vrf_id = VrfGet("vrf1")->vrf_id(); @@ -179,7 +179,7 @@ int main(int argc, char *argv[]) { client = TestInit(init_file, ksync_init, true, true); usleep(100000); client->WaitForIdle(); - + int ret = RUN_ALL_TESTS(); TestShutdown(); delete client; diff --git a/src/vnsw/agent/services/test/metadata_test.cc b/src/vnsw/agent/services/test/metadata_test.cc index deed80bf2d2..f2785f18897 100644 --- a/src/vnsw/agent/services/test/metadata_test.cc +++ b/src/vnsw/agent/services/test/metadata_test.cc @@ -168,16 +168,16 @@ class MetadataTest : public ::testing::Test { std::stringstream global_config; global_config << "\n" << "\n" - << "metadata\n" - << "169.254.169.254\n" - << "80\n" - << "\n" - << "" + << "metadata\n" + << "169.254.169.254\n" + << "80\n" + << "\n" + << "" << nova_api_proxy_->GetPort() << "\n" - << "127.0.0.1\n" - << "\n" - << ""; + << "127.0.0.1\n" + << "\n" + << ""; char buf[BUF_SIZE]; int len = 0; @@ -531,7 +531,7 @@ TEST_F(MetadataTest, MetadataReqTest_services_ip) { EXPECT_TRUE(rflow->key().dst_addr.to_v4() == intf->mdata_ip_addr()); client->Reset(); StopHttpClient(); - DeleteVmportEnv(input, 1, 1, 0); + DeleteVmportEnv(input, 1, 1, 0); client->WaitForIdle(); ClearLinkLocalConfig(); diff --git a/src/vnsw/agent/services/test/pkt_trace_test.cc b/src/vnsw/agent/services/test/pkt_trace_test.cc index 7e68ac20052..2d651fe7ed2 100644 --- a/src/vnsw/agent/services/test/pkt_trace_test.cc +++ b/src/vnsw/agent/services/test/pkt_trace_test.cc @@ -84,14 +84,14 @@ class PktTraceTest : public ::testing::Test { } } - uint32_t GetItfCount() { + uint32_t GetItfCount() { tbb::mutex::scoped_lock lock(mutex_); - return itf_count_; + return itf_count_; } - std::size_t GetItfId(int index) { + std::size_t GetItfId(int index) { tbb::mutex::scoped_lock lock(mutex_); - return itf_id_[index]; + return itf_id_[index]; } void CheckSandeshResponse(Sandesh *sandesh, int count) { @@ -198,10 +198,10 @@ TEST_F(PktTraceTest, TraceTest) { {"7.8.9.0", 24, "7.8.9.12", true}, }; - CreateVmportEnv(input, 2, 0); + CreateVmportEnv(input, 2, 0); client->WaitForIdle(); client->Reset(); - AddIPAM("vn1", ipam_info, 2); + AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); ClearAllInfo *clear_req1 = new ClearAllInfo(); diff --git a/src/vnsw/agent/test-xml/test_xml_oper.h b/src/vnsw/agent/test-xml/test_xml_oper.h index 30da76bc0a1..accaee843ce 100644 --- a/src/vnsw/agent/test-xml/test_xml_oper.h +++ b/src/vnsw/agent/test-xml/test_xml_oper.h @@ -144,7 +144,7 @@ class AgentUtXmlVmiVrf : public AgentUtXmlConfig { class AgentUtXmlAcl : public AgentUtXmlConfig { public: struct Ace { - Ace() : + Ace() : src_sg_(0), dst_sg_(0), src_vn_(""), dst_vn_(""), src_ip_(""), src_ip_plen_(0), dst_ip_(""), dst_ip_plen_(0), proto_(0), sport_begin_(-1), sport_end_(-1), dport_begin_(-1), dport_end_(-1) { diff --git a/src/vnsw/agent/test-xml/test_xml_validate.cc b/src/vnsw/agent/test-xml/test_xml_validate.cc index 464ecf5290a..fceadbdbc44 100644 --- a/src/vnsw/agent/test-xml/test_xml_validate.cc +++ b/src/vnsw/agent/test-xml/test_xml_validate.cc @@ -160,7 +160,7 @@ AgentUtXmlValidationNode::AgentUtXmlValidationNode(const string &name, AgentUtXmlValidationNode::~AgentUtXmlValidationNode() { } - + bool AgentUtXmlValidationNode::ReadCmnXml() { std::string str; if (GetStringAttribute(node_, "present", &str)) { diff --git a/src/vnsw/agent/test/control_node_mock.cc b/src/vnsw/agent/test/control_node_mock.cc index a7d90f33f2f..0c3f1d02b5e 100644 --- a/src/vnsw/agent/test/control_node_mock.cc +++ b/src/vnsw/agent/test/control_node_mock.cc @@ -22,7 +22,7 @@ using namespace autogen; namespace test { ControlNodeMock::ControlNodeMock(EventManager *evm, string address) : - evm_(evm), address_(address), + evm_(evm), address_(address), channel_(NULL) { xs = new XmppServer(evm_, XmppInit::kControlNodeJID); @@ -85,7 +85,7 @@ ControlNodeMock::VrfEntry* ControlNodeMock::AddVrf(const string &vrf) { } return ent; - + } void ControlNodeMock::SubscribeVrf(const string &vrf) { @@ -122,8 +122,8 @@ void ControlNodeMock::UnSubscribeVrf(const string &vrf) { } -ControlNodeMock::RouteEntry* -ControlNodeMock::InsertRoute(string &vrf_name, string &address, +ControlNodeMock::RouteEntry* +ControlNodeMock::InsertRoute(string &vrf_name, string &address, string &nh, int label, string &vn) { VrfEntry *vrf = AddVrf(vrf_name); @@ -136,7 +136,7 @@ ControlNodeMock::InsertRoute(string &vrf_name, string &address, ent->address = address; ent->vn = vn; - //Populate the nexthop + //Populate the nexthop NHEntry nh_entry; nh_entry.nh = nh; nh_entry.label = label; @@ -159,9 +159,9 @@ ControlNodeMock::InsertRoute(string &vrf_name, string &address, return ent; } -ControlNodeMock::RouteEntry* -ControlNodeMock::RemoveRoute(string &vrf_name, string &address, - string &nh, int label, string &vn, +ControlNodeMock::RouteEntry* +ControlNodeMock::RemoveRoute(string &vrf_name, string &address, + string &nh, int label, string &vn, bool &send_delete) { VrfEntry *vrf = AddVrf(vrf_name); @@ -174,7 +174,7 @@ ControlNodeMock::RemoveRoute(string &vrf_name, string &address, ent->address = address; ent->vn = vn; - //Populate the nexthop + //Populate the nexthop NHEntry nh_entry; nh_entry.nh = nh; nh_entry.label = label; @@ -220,7 +220,7 @@ void ControlNodeMock::GetRoutes(string vrf, const XmppStanza::XmppMessage *msg) add = true; } - RouteEntry *rt = InsertRoute(vrf, item.entry.nlri.address, + RouteEntry *rt = InsertRoute(vrf, item.entry.nlri.address, item.entry.next_hops.next_hop[0].address, item.entry.next_hops.next_hop[0].label, item.entry.virtual_network); @@ -249,7 +249,7 @@ void ControlNodeMock::ReceiveUpdate(const XmppStanza::XmppMessage *msg) { void ControlNodeMock::XmppChannelEvent(XmppChannel *channel, xmps::PeerState state) { if (state == xmps::READY) { - channel_ = channel; + channel_ = channel; channel_->RegisterReceive(xmps::BGP, boost::bind(&ControlNodeMock::ReceiveUpdate, this, _1)); } else if (state == xmps::NOT_READY) { @@ -296,7 +296,7 @@ bool ControlNodeMock::IsEstablished() { } -void ControlNodeMock::AddRoute(string vrf, string address, +void ControlNodeMock::AddRoute(string vrf, string address, string nh, int label, string vn) { RouteEntry *rt = InsertRoute(vrf, address, nh, label, vn); @@ -310,7 +310,7 @@ void ControlNodeMock::AddRoute(string vrf, string address, } -void ControlNodeMock::DeleteRoute(string vrf, string address, +void ControlNodeMock::DeleteRoute(string vrf, string address, string nh, int label, string vn) { bool send_delete = false; @@ -332,7 +332,7 @@ void ControlNodeMock::SendRoute(string vrf, RouteEntry *rt, bool add) { xml_node items = event.append_child("items"); stringstream nodestr; nodestr << BgpAf::IPv4 << "/" << BgpAf::Unicast << "/" << vrf.c_str(); - items.append_attribute("node") = nodestr.str().c_str(); + items.append_attribute("node") = nodestr.str().c_str(); autogen::ItemType item; diff --git a/src/vnsw/agent/test/control_node_mock.h b/src/vnsw/agent/test/control_node_mock.h index c2800435a7a..7bcb05f6d38 100644 --- a/src/vnsw/agent/test/control_node_mock.h +++ b/src/vnsw/agent/test/control_node_mock.h @@ -23,7 +23,7 @@ class ControlNodeMock { std::string nh; int label; } NHEntry; - + typedef struct RouteEntry_ { std::string address; std::string vn; @@ -39,7 +39,7 @@ class ControlNodeMock { ControlNodeMock(EventManager *evm, std::string address); ~ControlNodeMock(); void AddRoute(std::string vrf, std::string address, std::string nh, int, std::string vn); - void DeleteRoute(std::string vrf, std::string address, std::string nh, + void DeleteRoute(std::string vrf, std::string address, std::string nh, int label, std::string vn); void SubscribeVrf(const std::string &vrf); void UnSubscribeVrf(const std::string &vrf); @@ -48,14 +48,14 @@ class ControlNodeMock { void Shutdown(); void Clear(); -private: +private: pugi::xml_node AddXmppHdr(); void SendUpdate(xmps::PeerId id); void ReceiveUpdate(const XmppStanza::XmppMessage *msg); void XmppChannelEvent(XmppChannel *channel, xmps::PeerState state); - RouteEntry* InsertRoute(std::string &vrf, std::string &address, + RouteEntry* InsertRoute(std::string &vrf, std::string &address, std::string &nh, int label, std::string &vn); - RouteEntry* RemoveRoute(std::string &vrf, std::string &address, + RouteEntry* RemoveRoute(std::string &vrf, std::string &address, std::string &nh, int label, std::string &vn, bool &send_delete); void GetRoutes(std::string vrf, const XmppStanza::XmppMessage *msg); void WriteReadyCb(const boost::system::error_code &ec); diff --git a/src/vnsw/agent/test/test_agent_db_entry.cc b/src/vnsw/agent/test/test_agent_db_entry.cc index 9e2fefb01bb..555dd66025b 100644 --- a/src/vnsw/agent/test/test_agent_db_entry.cc +++ b/src/vnsw/agent/test/test_agent_db_entry.cc @@ -38,7 +38,7 @@ TEST_F(AgentDbEntry, db_entry_self_reference) { int main(int argc, char *argv[]) { GETUSERARGS(); client = TestInit(init_file, ksync_init, true, true, false); - + int ret = RUN_ALL_TESTS(); TestShutdown(); delete client; diff --git a/src/vnsw/agent/test/test_agent_init.h b/src/vnsw/agent/test/test_agent_init.h index 56dbc77fad6..f4b7bd86e76 100644 --- a/src/vnsw/agent/test/test_agent_init.h +++ b/src/vnsw/agent/test/test_agent_init.h @@ -15,7 +15,7 @@ class Agent; class AgentParam; -// The class to drive agent initialization. +// The class to drive agent initialization. // Defines control parameters used to enable/disable agent features class TestAgentInit : public ContrailInitCommon { public: diff --git a/src/vnsw/agent/test/test_agent_route_walker.cc b/src/vnsw/agent/test/test_agent_route_walker.cc index d7a7d26e071..a9e3c127ecb 100644 --- a/src/vnsw/agent/test/test_agent_route_walker.cc +++ b/src/vnsw/agent/test/test_agent_route_walker.cc @@ -131,7 +131,7 @@ class AgentRouteWalkerTest : public AgentRouteWalker { }; class Test : public ::testing::Test { -public: +public: Test() { default_tunnel_type_ = TunnelType::MPLS_GRE; vrf_name_1_ = "vrf1"; @@ -147,7 +147,7 @@ class Test : public ::testing::Test { agent_->oper_db()->agent_route_walk_manager()-> RegisterWalker(static_cast(walker_.get())); }; - ~Test() { + ~Test() { } void SetupEnvironment(int num_vrfs) { diff --git a/src/vnsw/agent/test/test_alias_ip_cfg.cc b/src/vnsw/agent/test/test_alias_ip_cfg.cc index 479d509c4ab..5a34baa0e3a 100644 --- a/src/vnsw/agent/test/test_alias_ip_cfg.cc +++ b/src/vnsw/agent/test/test_alias_ip_cfg.cc @@ -212,9 +212,9 @@ TEST_F(CfgTest, AliasIp_1) { "vnet2"); DelLink("virtual-machine", "vm2", "virtual-machine-interface", "vnet2"); - DelLink("virtual-machine-interface", input[0].name, "instance-ip", + DelLink("virtual-machine-interface", input[0].name, "instance-ip", "instance0"); - DelLink("virtual-machine-interface", input[1].name, "instance-ip", + DelLink("virtual-machine-interface", input[1].name, "instance-ip", "instance1"); DelLink("virtual-machine-interface", "vnet1", "alias-ip", "aip2"); diff --git a/src/vnsw/agent/test/test_basic_scale.h b/src/vnsw/agent/test/test_basic_scale.h index f3ee989ba7b..f0ac3570214 100644 --- a/src/vnsw/agent/test/test_basic_scale.h +++ b/src/vnsw/agent/test/test_basic_scale.h @@ -78,7 +78,7 @@ xml_node MulticastMessageHeader(xml_document *xdoc, std::string vrf) { xml_node L2MessageHeader(xml_document *xdoc, std::string vrf) { xml_node msg = xdoc->append_child("message"); msg.append_attribute("type") = "set"; - msg.append_attribute("from") = XmppInit::kAgentNodeJID; + msg.append_attribute("from") = XmppInit::kAgentNodeJID; string str(XmppInit::kControlNodeJID); str += "/"; str += XmppInit::kBgpPeer; @@ -153,7 +153,7 @@ class ControlNodeMockBgpXmppPeer { peer_skip_route_list_.clear(); } - void ReflectIpv4Route(string vrf_name, const pugi::xml_node &node, + void ReflectIpv4Route(string vrf_name, const pugi::xml_node &node, bool add_change) { autogen::ItemType item; item.Clear(); @@ -167,7 +167,7 @@ class ControlNodeMockBgpXmppPeer { if (add_change) { EXPECT_TRUE(!item.entry.next_hops.next_hop.empty()); //Assuming one interface NH has come - SendRouteMessage(vrf_name, item.entry.nlri.address, + SendRouteMessage(vrf_name, item.entry.nlri.address, item.entry.next_hops.next_hop[0].label, false); } else { SendRouteDeleteMessage(vrf_name, item.entry.nlri.address); @@ -191,7 +191,7 @@ class ControlNodeMockBgpXmppPeer { uint32_t src_label = label1_++; uint32_t tunnel_label_1 = label1_++; uint32_t tunnel_label_2 = label1_++; - SendBcastRouteMessage(vrf_name, item.entry.nlri.group, src_label, + SendBcastRouteMessage(vrf_name, item.entry.nlri.group, src_label, "127.0.0.1", tunnel_label_1, tunnel_label_2); } else { SendBcastRouteDelete(vrf_name, item.entry.nlri.group, "127.0.0.1"); @@ -211,12 +211,12 @@ class ControlNodeMockBgpXmppPeer { if (add_change) { EXPECT_TRUE(!item.entry.next_hops.next_hop.empty()); //Assuming one interface NH has come - SendL2RouteMessage(vrf_name, item.entry.nlri.mac, - item.entry.nlri.address, + SendL2RouteMessage(vrf_name, item.entry.nlri.mac, + item.entry.nlri.address, item.entry.next_hops.next_hop[0].label); } else { //TODO check why retract parsing fails - //SendL2RouteDeleteMessage(item.entry.nlri.mac, vrf_name, + //SendL2RouteDeleteMessage(item.entry.nlri.mac, vrf_name, // item.entry.nlri.address); } } @@ -350,7 +350,7 @@ class ControlNodeMockBgpXmppPeer { xml_node xitems = MessageHeader(&xdoc, vrf); xml_node node = xitems.append_child("retract"); stringstream ss; - ss << address.c_str() << "/32"; + ss << address.c_str() << "/32"; string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); @@ -363,15 +363,15 @@ class ControlNodeMockBgpXmppPeer { xml_node xitems = L2MessageHeader(&xdoc, vrf); xml_node node = xitems.append_child("retract"); stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); SendDocument(xdoc); } - void SendBcastRouteMessage(std::string vrf, std::string subnet_addr, - int src_label, std::string agent_addr, + void SendBcastRouteMessage(std::string vrf, std::string subnet_addr, + int src_label, std::string agent_addr, int dest_label1, int dest_label2) { xml_document xdoc; xml_node xitems = MulticastMessageHeader(&xdoc, vrf); @@ -386,9 +386,9 @@ class ControlNodeMockBgpXmppPeer { autogen::McastNextHopType nh; nh.af = item.entry.nlri.af; nh.address = "127.0.0.2"; // agent-b, does not exist - stringstream label1; + stringstream label1; label1 << dest_label1; - nh.label = label1.str(); + nh.label = label1.str(); //Add to olist item.entry.olist.next_hop.push_back(nh); @@ -396,9 +396,9 @@ class ControlNodeMockBgpXmppPeer { autogen::McastNextHopType nh2; nh2.af = item.entry.nlri.af; nh2.address = "127.0.0.3"; // agent-c, does not exist - stringstream label2; + stringstream label2; label2 << dest_label2; - nh2.label = label2.str(); + nh2.label = label2.str(); //Add to olist item.entry.olist.next_hop.push_back(nh2); @@ -406,22 +406,22 @@ class ControlNodeMockBgpXmppPeer { xml_node node = xitems.append_child("item"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str() << ",0.0.0.0"; + ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str() << ",0.0.0.0"; string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); SendDocument(xdoc); } - void SendBcastRouteDelete(std::string vrf, std::string addr, + void SendBcastRouteDelete(std::string vrf, std::string addr, std::string agent_addr) { xml_document xdoc; xml_node xitems = MulticastMessageHeader(&xdoc, vrf); xml_node node = xitems.append_child("retract"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << addr.c_str() - << "," << "0.0.0.0"; + ss << agent_addr.c_str() << ":" << "65535:" << addr.c_str() + << "," << "0.0.0.0"; string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); @@ -476,7 +476,7 @@ class ControlNodeMockBgpXmppPeer { } } } - } + } void HandleXmppChannelEvent(XmppChannel *channel, xmps::PeerState state) { @@ -500,7 +500,7 @@ class ControlNodeMockBgpXmppPeer { } bool SendUpdate(uint8_t *msg, size_t size) { - if (channel_ && + if (channel_ && (channel_->GetPeerState() == xmps::READY)) { return channel_->Send(msg, size, xmps::BGP, boost::bind(&ControlNodeMockBgpXmppPeer::WriteReadyCb, this, _1)); @@ -509,7 +509,7 @@ class ControlNodeMockBgpXmppPeer { } //TODO need to be moved to use gateway - void AddRemoteV4Routes(int num_routes, std::string vrf_name, std::string vn_name, + void AddRemoteV4Routes(int num_routes, std::string vrf_name, std::string vn_name, std::string ip_prefix) { uint32_t label = 6000; Ip4Address addr = Ip4Address::from_string(ip_prefix); @@ -525,7 +525,7 @@ class ControlNodeMockBgpXmppPeer { Ip4Address addr = Ip4Address::from_string(ip_prefix); for (int i = 0; i < num_routes; i++) { addr = IncrementIpAddress(addr); - SendRouteDeleteMessage(vrf_name, addr.to_string()); + SendRouteDeleteMessage(vrf_name, addr.to_string()); } } @@ -552,7 +552,7 @@ class AgentBasicScaleTest : public ::testing::Test { protected: AgentBasicScaleTest() : thread_(&evm_), agent_(Agent::GetInstance()) { } - + virtual void SetUp() { for (int i = 0; i < num_ctrl_peers; i++) { xs[i] = new XmppServer(&evm_, XmppInit::kControlNodeJID); @@ -560,7 +560,7 @@ class AgentBasicScaleTest : public ::testing::Test { xs[i]->Initialize(0, false); } - + thread_.Start(); } @@ -576,7 +576,7 @@ class AgentBasicScaleTest : public ::testing::Test { xc[i]->ConfigUpdate(new XmppConfigData()); client->WaitForIdle(5); xs[i]->Shutdown(); - bgp_peer[i].reset(); + bgp_peer[i].reset(); client->WaitForIdle(); xc[i]->Shutdown(); client->WaitForIdle(); @@ -589,7 +589,7 @@ class AgentBasicScaleTest : public ::testing::Test { client->WaitForIdle(); Agent::GetInstance()->controller()->Cleanup(); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (Agent::GetInstance()->controller()->DecommissionedPeerListSize() + WAIT_FOR(1000, 1000, (Agent::GetInstance()->controller()->DecommissionedPeerListSize() == 0)); for (int i = 0; i < num_ctrl_peers; i++) { @@ -602,7 +602,7 @@ class AgentBasicScaleTest : public ::testing::Test { } XmppChannelConfig *CreateXmppChannelCfg(const char *address, int port, - const char *local_address, + const char *local_address, const string &from, const string &to, bool isclient) { XmppChannelConfig *cfg = new XmppChannelConfig(isclient); @@ -619,7 +619,7 @@ class AgentBasicScaleTest : public ::testing::Test { XmppConnection *sconnection_l = sconnection[i]; WAIT_FOR(100, 10000, - ((sconnection_l = xs_l->FindConnection(XmppInit::kAgentNodeJID)) + ((sconnection_l = xs_l->FindConnection(XmppInit::kAgentNodeJID)) != NULL)); assert(sconnection_l); //wait for connection establishment @@ -643,13 +643,13 @@ class AgentBasicScaleTest : public ::testing::Test { mock_peer[i].reset(new ControlNodeMockBgpXmppPeer()); xs[i]->RegisterConnectionEvent(xmps::BGP, boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, - mock_peer[i].get(), _1, _2)); + mock_peer[i].get(), _1, _2)); LOG(DEBUG, "Create xmpp agent clien - t" << i); //New config data for this channel and peer xmppc_cfg[i] = new XmppConfigData; xmppc_cfg[i]->AddXmppChannelConfig(CreateXmppChannelCfg(addr.to_string().c_str(), xs[i]->GetPort(), addr.to_string().c_str(), - XmppInit::kAgentNodeJID, + XmppInit::kAgentNodeJID, XmppInit::kControlNodeJID, true)); xc[i]->ConfigUpdate(xmppc_cfg[i]); cchannel[i] = xc[i]->FindChannel(XmppInit::kControlNodeJID); @@ -659,7 +659,7 @@ class AgentBasicScaleTest : public ::testing::Test { Agent::GetInstance()->controller()->fabric_multicast_label_range(i).fabric_multicast_label_range_str, i)); bgp_peer[i].get()->RegisterXmppChannel(cchannel[i]); xc[i]->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer[i].get(), _2)); Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer[i].get(), i); @@ -680,14 +680,14 @@ class AgentBasicScaleTest : public ::testing::Test { for (uint32_t vn_cnt = 1; vn_cnt <= num_vns; vn_cnt++) { stringstream ip_addr; ip_addr << vn_cnt << ".1.1.0"; - Ip4Address addr = + Ip4Address addr = IncrementIpAddress(Ip4Address::from_string(ip_addr.str())); for (uint32_t vm_cnt = 0; vm_cnt < num_vms_per_vn; vm_cnt++) { stringstream name; stringstream mac; int cnt = intf_id - 1; name << "vnet" << intf_id; - mac << "00:00:00:00:" << std::hex << vn_cnt << ":" << + mac << "00:00:00:00:" << std::hex << vn_cnt << ":" << std::hex << (vm_cnt + 1); memcpy(&(input[cnt].name), name.str().c_str(), 32); input[cnt].intf_id = intf_id; @@ -699,9 +699,9 @@ class AgentBasicScaleTest : public ::testing::Test { addr = IncrementIpAddress(addr); } } - //Create vn,vrf,vm,vm-port and route entry in vrf1 + //Create vn,vrf,vm,vm-port and route entry in vrf1 CreateVmportEnv(input, (intf_id - 1)); - WAIT_FOR(10000, 10000, (agent_->interface_table()->Size() == + WAIT_FOR(10000, 10000, (agent_->interface_table()->Size() == ((num_vns * num_vms_per_vn) + 3))); VerifyVmPortActive(true); VerifyRoutes(false); @@ -856,4 +856,4 @@ class AgentBasicScaleTest : public ::testing::Test { strncpy(init_file, vm["config"].as().c_str(), (sizeof(init_file) - 1) ); \ } else { \ strcpy(init_file, DEFAULT_VNSW_CONFIG_FILE); \ - } + } diff --git a/src/vnsw/agent/test/test_bgp_service_configuration.cc b/src/vnsw/agent/test/test_bgp_service_configuration.cc index 38fa194d411..4321028d513 100644 --- a/src/vnsw/agent/test/test_bgp_service_configuration.cc +++ b/src/vnsw/agent/test/test_bgp_service_configuration.cc @@ -38,7 +38,7 @@ static void ValidateSandeshResponse(Sandesh *sandesh, vector &result) { } class BgpCfgTest : public ::testing::Test { -public: +public: BgpCfgTest() : agent_(Agent::GetInstance()) { } diff --git a/src/vnsw/agent/test/test_cfg.cc b/src/vnsw/agent/test/test_cfg.cc index 467b2626f2a..b8f9fa3b804 100644 --- a/src/vnsw/agent/test/test_cfg.cc +++ b/src/vnsw/agent/test/test_cfg.cc @@ -116,7 +116,7 @@ TEST_F(CfgTest, NodeTest) { EXPECT_TRUE(result); parser_->ConfigParse(xdoc_.first_child(), 0); - + WaitForIdle(); IFMapTable *table = IFMapTable::FindTable(&db_, "foo"); ASSERT_TRUE(table!=NULL); @@ -124,7 +124,7 @@ TEST_F(CfgTest, NodeTest) { IFMapNode *TestFoo = table->FindNode("testfoo"); ASSERT_TRUE(TestFoo!=NULL); EXPECT_EQ("testfoo", TestFoo->name()); - + table = IFMapTable::FindTable(&db_, "bar"); ASSERT_TRUE(table!=NULL); @@ -174,7 +174,7 @@ TEST_F(CfgTest, LinkTest) { EXPECT_TRUE(result); parser_->ConfigParse(xdoc_.first_child(), 0); - + WaitForIdle(); EXPECT_EQ(foo_cnt, 1); @@ -250,8 +250,8 @@ TEST_F(CfgTest, LinkTest) { TestBar = btable->FindNode("testbar"); ASSERT_TRUE(TestBar==NULL); - EXPECT_EQ(foo_cnt, 0); - EXPECT_EQ(bar_cnt, 0); + EXPECT_EQ(foo_cnt, 0); + EXPECT_EQ(bar_cnt, 0); ftable->Unregister(fid); btable->Unregister(bid); @@ -261,8 +261,8 @@ TEST_F(CfgTest, LinkTest) { TEST_F(CfgTest, LinkAttrTest) { char buff[1500]; - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " testA\n" " \n" @@ -308,7 +308,7 @@ TEST_F(CfgTest, LinkAttrTest) { EXPECT_TRUE(result); parser_->ConfigParse(xdoc_, 0); - + WaitForIdle(); //Ensure that both nodes are added fine along with attribute @@ -413,7 +413,7 @@ TEST_F(CfgTest, NodeReaddTest) { EXPECT_EQ("testfoo", TestFoo->name()); } - //Delete the all config and readdd the same + //Delete the all config and readdd the same sprintf(buff, "\n" " \n" @@ -431,7 +431,7 @@ TEST_F(CfgTest, NodeReaddTest) { " testbar\n" " \n" "\n" - "\n" + "\n" " \n" " testfoo\n" " \n" @@ -591,7 +591,7 @@ TEST_F(CfgTest, LinkReorderTest) { " testtest\n" " \n" "\n" - "\n" + "\n" " \n" " \n" " testfoo\n" @@ -608,8 +608,8 @@ TEST_F(CfgTest, LinkReorderTest) { WaitForIdle(); //Add another link and nodes with seq = 1 - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -691,8 +691,8 @@ TEST_F(CfgTest, LinkReorderTest) { WaitForIdle(); //Add link with seq 0 - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -701,7 +701,7 @@ TEST_F(CfgTest, LinkReorderTest) { " testtest\n" " \n" " \n" - "\n"); + "\n"); result = xdoc_.load(buff); EXPECT_TRUE(result); @@ -709,8 +709,8 @@ TEST_F(CfgTest, LinkReorderTest) { WaitForIdle(); //update the same with seq 1 and add nodes too - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testtest\n" @@ -739,8 +739,8 @@ TEST_F(CfgTest, LinkReorderTest) { TestTest = ttable->FindNode("testtest"); ASSERT_TRUE(TestTest !=NULL); EXPECT_EQ("testtest", TestTest->name()); - - //Ensure that there is link from foo->test + + //Ensure that there is link from foo->test for (DBGraphVertex::adjacency_iterator iter = TestFoo->begin(&graph_); iter != TestFoo->end(&graph_); ++iter) { TestTest = static_cast(iter.operator->()); @@ -770,8 +770,8 @@ TEST_F(CfgTest, LinkReorderTest) { parser_->ConfigParse(xdoc_, 1); WaitForIdle(); - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testtest\n" @@ -780,8 +780,8 @@ TEST_F(CfgTest, LinkReorderTest) { " testfoo\n" " \n" " \n" - "\n" - "\n" + "\n" + "\n" " \n" " \n" " testtest\n" @@ -790,8 +790,8 @@ TEST_F(CfgTest, LinkReorderTest) { " testfoo\n" " \n" " \n" - "\n" - "\n" + "\n" + "\n" " \n" " \n" " testtest\n" @@ -800,8 +800,8 @@ TEST_F(CfgTest, LinkReorderTest) { " testfoo\n" " \n" " \n" - "\n" - "\n" + "\n" + "\n" " \n" " \n" " testfoo\n" @@ -810,15 +810,15 @@ TEST_F(CfgTest, LinkReorderTest) { " testtest\n" " \n" " \n" - "\n" - "\n" + "\n" + "\n" " \n" " testfoo\n" " \n" " \n" " testtest\n" " \n" - "\n"); + "\n"); result = xdoc_.load(buff); EXPECT_TRUE(result); @@ -831,7 +831,7 @@ TEST_F(CfgTest, LinkReorderTest) { TestTest = ttable->FindNode("testtest"); ASSERT_TRUE(TestTest !=NULL); - EXPECT_EQ("testtest", TestTest->name()); + EXPECT_EQ("testtest", TestTest->name()); //Ensure that there are no links from foo->test and test->foo cnt = 0; @@ -847,8 +847,8 @@ TEST_F(CfgTest, LinkReorderTest) { } EXPECT_EQ(cnt, 0); - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testtest\n" @@ -865,7 +865,7 @@ TEST_F(CfgTest, LinkReorderTest) { " testbar\n" " \n" " \n" - "\n"); + "\n"); result = xdoc_.load(buff); EXPECT_TRUE(result); parser_->ConfigParse(xdoc_, 0); @@ -877,8 +877,8 @@ TEST_F(CfgTest, LinkReorderTest) { TEST_F(CfgTest, NodeDeleteLinkPendingTest) { char buff[1500]; - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -979,11 +979,11 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { //testbar and testtest should exist TestTest = ttable->FindNode("testtest"); ASSERT_TRUE(TestTest !=NULL); - EXPECT_EQ("testtest", TestTest->name()); + EXPECT_EQ("testtest", TestTest->name()); TestBar = btable->FindNode("testbar"); ASSERT_TRUE(TestBar !=NULL); - EXPECT_EQ("testbar", TestBar->name()); + EXPECT_EQ("testbar", TestBar->name()); //Ensure that there are no links from test->foo and bar->foo cnt = 0; @@ -1000,8 +1000,8 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { EXPECT_EQ(cnt, 0); //Add node foo again and veriy all nodes and links - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " testfoo\n" " \n" @@ -1060,8 +1060,8 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { WaitForIdle(); //Now delete links and add node - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -1079,7 +1079,7 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { " \n" " \n" "" - "\n" + "\n" " \n" " testfoo\n" " \n" @@ -1117,8 +1117,8 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { EXPECT_EQ(cnt, 0); //Have all the nodes and links and delete bar - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -1136,7 +1136,7 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { " \n" " \n" "" - "\n" + "\n" " \n" " testbar\n" " \n" @@ -1188,12 +1188,12 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { " \n" " \n" "\n" - "\n" + "\n" " \n" " testtest\n" " \n" "\n" - "\n" + "\n" " \n" " testfoo\n" " \n" @@ -1209,8 +1209,8 @@ TEST_F(CfgTest, NodeDeleteLinkPendingTest) { TEST_F(CfgTest, NodeDelLinkAddDeferTest) { char buff[1500]; - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " testfoo\n" " \n" @@ -1275,7 +1275,7 @@ TEST_F(CfgTest, NodeDelLinkAddDeferTest) { EXPECT_EQ("testfoo", TestFoo->name()); } - //Delete the all config and readdd the same + //Delete the all config and readdd the same sprintf(buff, "\n" " \n" @@ -1293,7 +1293,7 @@ TEST_F(CfgTest, NodeDelLinkAddDeferTest) { " testbar\n" " \n" "\n" - "\n" + "\n" " \n" " testbar\n" " \n" @@ -1427,8 +1427,8 @@ TEST_F(CfgTest, LinkJumbleTest) { ASSERT_TRUE(TestBar == NULL); //Add bar now - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " testbar\n" " \n" @@ -1899,8 +1899,8 @@ TEST_F(CfgTest, StaleTimeoutDeferList) { } EXPECT_EQ(cnt, 0); - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " \n" " testfoo\n" @@ -1930,8 +1930,8 @@ TEST_F(CfgTest, StaleTimeoutDeferList) { parser_->ConfigParse(xdoc_, 2); WaitForIdle(); - sprintf(buff, - "\n" + sprintf(buff, + "\n" " \n" " testfoo\n" " \n" @@ -1968,7 +1968,7 @@ TEST_F(CfgTest, StaleTimeoutDeferList) { ASSERT_TRUE(TestTest !=NULL); EXPECT_EQ("testtest", TestTest->name()); - //Ensure that there is Link from Foo toTest + //Ensure that there is Link from Foo toTest cnt = 0; for (DBGraphVertex::adjacency_iterator iter = TestFoo->begin(&graph_); iter != TestFoo->end(&graph_); ++iter) { diff --git a/src/vnsw/agent/test/test_cfg_listener.cc b/src/vnsw/agent/test/test_cfg_listener.cc index 271cc1992d2..bdcc42dee42 100644 --- a/src/vnsw/agent/test/test_cfg_listener.cc +++ b/src/vnsw/agent/test/test_cfg_listener.cc @@ -49,7 +49,7 @@ TEST_F(CfgTest, DbNodeWithoutIdPerms_1) { // Send VN Node without ID Perms. No entry should be created AddXmlHdr(buff, len); - sprintf(buff + len, + sprintf(buff + len, " \n" " vn1\n" " \n"); @@ -61,7 +61,7 @@ TEST_F(CfgTest, DbNodeWithoutIdPerms_1) { // Send VN Node with ID Perms. VN Entry must be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -106,7 +106,7 @@ TEST_F(CfgTest, LinkWithoutIdPerms_1) { // Send VM Node with ID Perms. VM must be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -120,7 +120,7 @@ TEST_F(CfgTest, LinkWithoutIdPerms_1) { // Create VN AddXmlHdr(buff, len); - AddNodeString(buff, len, "access-control-list", "acl1", 1); + AddNodeString(buff, len, "access-control-list", "acl1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -128,7 +128,7 @@ TEST_F(CfgTest, LinkWithoutIdPerms_1) { // Resend VM node. Link between VN and VM should be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "access-control-list", "acl1", 1); + AddNodeString(buff, len, "access-control-list", "acl1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -158,7 +158,7 @@ TEST_F(CfgTest, NonDbNodeWithoutIdPerms_1) { // Send VN Node without ID Perms. No entry should be created AddXmlHdr(buff, len); - sprintf(buff + len, + sprintf(buff + len, " \n" " ipam1\n" " \n"); @@ -170,7 +170,7 @@ TEST_F(CfgTest, NonDbNodeWithoutIdPerms_1) { // Send VN Node with ID Perms. VN Entry must be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "network-ipam", "ipam1", 1); + AddNodeString(buff, len, "network-ipam", "ipam1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -215,7 +215,7 @@ TEST_F(CfgTest, NonDbLinkWithoutIdPerms_1) { // Send VN Node with ID Perms. VN must be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -231,7 +231,7 @@ TEST_F(CfgTest, NonDbLinkWithoutIdPerms_1) { // Create network-ipam with ID-PERMS AddXmlHdr(buff, len); - AddNodeString(buff, len, "network-ipam", "ipam1", 1); + AddNodeString(buff, len, "network-ipam", "ipam1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); @@ -239,13 +239,13 @@ TEST_F(CfgTest, NonDbLinkWithoutIdPerms_1) { // Resend VN node. Link between VN and network-ipam should be created AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddXmlTail(buff, len); ApplyXmlString(buff); client->WaitForIdle(); EXPECT_TRUE(VnFind(1)); EXPECT_EQ(notify_count_, 1); - + // Delete entries DelLink("virtual-network", "vn1", "network-ipam", "ipam1"); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_cmn_util.h b/src/vnsw/agent/test/test_cmn_util.h index e77c26a39aa..4adabcd4673 100644 --- a/src/vnsw/agent/test/test_cmn_util.h +++ b/src/vnsw/agent/test/test_cmn_util.h @@ -98,7 +98,7 @@ void AddNodeString(char *buff, int &len, const char *nodename, const char *name, const char *add_subnet_tags = NULL); void AddVmPortVrfNodeString(char *buff, int &len, const char *name, int id); void DelNodeString(char *buff, int &len, const char *node_name, const char *name); -void ApplyXmlString(const char *buff); +void ApplyXmlString(const char *buff); string GetMetadata(const char *node1, const char *node2, const char *mdata = NULL); void AddLink(const char *node_name1, const char *name1, const char *node_name2, @@ -176,10 +176,10 @@ bool VmPortFloatingIpCount(int id, unsigned int count); bool VmPortAliasIpCount(int id, unsigned int count); bool VmPortGetStats(PortInfo *input, int id, uint32_t & bytes, uint32_t & pkts); bool VmPortStats(PortInfo *input, int id, uint32_t bytes, uint32_t pkts); -bool VmPortStatsMatch(Interface *intf, uint32_t ibytes, uint32_t ipkts, +bool VmPortStatsMatch(Interface *intf, uint32_t ibytes, uint32_t ipkts, uint32_t obytes, uint32_t opkts); InetInterface *InetInterfaceGet(const char *ifname); -bool VnStatsMatch(char *vn, uint64_t in_bytes, uint64_t in_pkts, +bool VnStatsMatch(char *vn, uint64_t in_bytes, uint64_t in_pkts, uint64_t out_bytes, uint64_t out_pkts); bool VmPortInactive(int id); std::string VmPortGetAnalyzerName(int id); @@ -362,7 +362,7 @@ void DelIPAM(const char *name, const char *vdns_name = NULL); void AddVDNS(const char *vdns_name, const char *vdns_attr); void DelVDNS(const char *vdns_name); void AddEncryptRemoteTunnelConfig(const EncryptTunnelEndpoint *endpoints, int count, - std::string encrypt_mode); + std::string encrypt_mode); void AddLinkLocalConfig(const TestLinkLocalService *services, int count); void DelLinkLocalConfig(); void DeleteGlobalVrouterConfig(); @@ -386,7 +386,7 @@ void DeleteVmportEnv(struct PortInfo *input, int count, int del_vn, int acl_id = void DeleteVmportFIpEnv(struct PortInfo *input, int count, int del_vn, int acl_id = 0, const char *vn = NULL, const char *vrf = NULL); void CreateVmportEnvInternal(struct PortInfo *input, int count, int acl_id = 0, - const char *vn = NULL, const char *vrf = NULL, + const char *vn = NULL, const char *vrf = NULL, const char *vm_interface_attr = NULL, bool l2_vn = false, bool with_ip = false, bool ecmp = false, bool vn_admin_state = true, bool with_ip6 = false, @@ -434,13 +434,13 @@ FlowEntry* FlowGet(int nh_id, std::string sip, std::string dip, uint8_t proto, uint16_t sport, uint16_t dport); bool FlowGet(const string &vrf_name, const char *sip, const char *dip, uint8_t proto, uint16_t sport, uint16_t dport, bool rflow, - std::string svn, std::string dvn, uint32_t hash_id, + std::string svn, std::string dvn, uint32_t hash_id, int nh_id, int rev_nh_id = -1); bool FlowGet(const string &vrf_name, const char *sip, const char *dip, uint8_t proto, uint16_t sport, uint16_t dport, bool rflow, - std::string svn, std::string dvn, uint32_t hash_id, bool fwd, + std::string svn, std::string dvn, uint32_t hash_id, bool fwd, bool nat, int nh_id, int rev_nh_id = -1); -bool FlowGet(int vrf_id, const char *sip, const char *dip, uint8_t proto, +bool FlowGet(int vrf_id, const char *sip, const char *dip, uint8_t proto, uint16_t sport, uint16_t dport, bool short_flow, int hash_id, int reverse_hash_id, int nh_id, int rev_nh_id = -1); FlowEntry* FlowGet(int vrf_id, std::string sip, std::string dip, uint8_t proto, @@ -462,8 +462,8 @@ PktGen *TxMplsPacketUtil(int ifindex, const char *out_sip, const char *out_dip, uint32_t label, const char *sip, const char *dip, int proto, int hash_idx = 0); PktGen *TxMplsTcpPacketUtil(int ifindex, const char *out_sip, - const char *out_dip, uint32_t label, - const char *sip, const char *dip, + const char *out_dip, uint32_t label, + const char *sip, const char *dip, int sport, int dport, int hash_idx = 0); bool VrfStatsMatch(int vrf_id, std::string vrf_name, bool stats_match, @@ -520,7 +520,7 @@ void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *addr, void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *addr, int count, const char *nexthop); void AddInterfaceRouteTable(const char *name, int id, TestIp4Prefix *addr, - int count, const char *nexthop, + int count, const char *nexthop, const std::vector &communities); void AddInterfaceRouteTableV6(const char *name, int id, TestIp6Prefix *addr, int count); diff --git a/src/vnsw/agent/test/test_ecmp6.cc b/src/vnsw/agent/test/test_ecmp6.cc index aca13d6cb0a..ed6373ed1d9 100644 --- a/src/vnsw/agent/test/test_ecmp6.cc +++ b/src/vnsw/agent/test/test_ecmp6.cc @@ -211,7 +211,7 @@ TEST_F(EcmpV6Test, EcmpNH_2) { intf_nh = static_cast(mpls->nexthop()); EXPECT_TRUE(intf_nh->GetInterface()->name() == "vnet5"); - //Verify that mpls label allocated for ECMP route, points + //Verify that mpls label allocated for ECMP route, points //to the same composite NH uint32_t composite_nh_mpls_label = rt->GetActiveLabel(); mpls = GetActiveLabel(composite_nh_mpls_label); @@ -261,7 +261,7 @@ TEST_F(EcmpV6Test, EcmpNH_2) { DelIPAM("vn1"); client->WaitForIdle(); EXPECT_FALSE(RouteFindV6("vrf1", addr, 128)); - + //Expect MPLS label to be not present EXPECT_FALSE(FindMplsLabel(composite_nh_mpls_label)); diff --git a/src/vnsw/agent/test/test_ecmp_nh.cc b/src/vnsw/agent/test/test_ecmp_nh.cc index 83dd0145d98..070a9d66911 100644 --- a/src/vnsw/agent/test/test_ecmp_nh.cc +++ b/src/vnsw/agent/test/test_ecmp_nh.cc @@ -177,7 +177,7 @@ TEST_F(EcmpNhTest, EcmpNH_1) { client->WaitForIdle(); WAIT_FOR(100, 1000, (VrfFind("vrf1") == false)); EXPECT_FALSE(RouteFind("vrf1", ip, 32)); - + //Expect MPLS label to be not present EXPECT_FALSE(FindMplsLabel(mpls_label)); } @@ -285,14 +285,14 @@ TEST_F(EcmpNhTest, EcmpNH_2) { intf_nh = static_cast(mpls->nexthop()); EXPECT_TRUE(intf_nh->GetInterface()->name() == "vnet5"); - //Verify that mpls label allocated for ECMP route, points + //Verify that mpls label allocated for ECMP route, points //to the same composite NH uint32_t composite_nh_mpls_label = rt->GetActiveLabel(); mpls = GetActiveLabel(composite_nh_mpls_label); EXPECT_TRUE(mpls->nexthop() == comp_nh); - //Delete couple of interface and verify composite NH also get + //Delete couple of interface and verify composite NH also get //deleted DeleteVmportEnv(input2, 1, false); DeleteVmportEnv(input4, 1, false); @@ -336,7 +336,7 @@ TEST_F(EcmpNhTest, EcmpNH_2) { DeleteVmportEnv(input1, 1, true); client->WaitForIdle(); EXPECT_FALSE(RouteFind("vrf1", ip, 32)); - + //Expect MPLS label to be not present EXPECT_FALSE(FindMplsLabel(composite_nh_mpls_label)); @@ -450,13 +450,13 @@ TEST_F(EcmpNhTest, EcmpNH_3) { intf_nh = static_cast(mpls->nexthop()); EXPECT_TRUE(intf_nh->GetInterface()->name() == "vnet5"); - //Verify that mpls label allocated for ECMP route, points + //Verify that mpls label allocated for ECMP route, points //to the same composite NH uint32_t composite_mpls_label = rt->GetActiveLabel(); mpls = GetActiveLabel(composite_mpls_label); EXPECT_TRUE(mpls->nexthop() == comp_nh); - //Delete couple of interface and verify composite NH also get + //Delete couple of interface and verify composite NH also get //deleted DelLink("virtual-machine-interface", "vnet1", "floating-ip", "fip1"); client->WaitForIdle(); @@ -507,7 +507,7 @@ TEST_F(EcmpNhTest, EcmpNH_3) { //Expect MPLS label to be not present EXPECT_FALSE(FindMplsLabel(composite_mpls_label)); - + DelLink("virtual-machine-interface", "vnet5", "floating-ip", "fip1"); DelLink("floating-ip-pool", "fip-pool1", "virtual-network", "default-project:vn2"); client->WaitForIdle(); @@ -551,7 +551,7 @@ TEST_F(EcmpNhTest, EcmpNH_4) { } //Create a remote route first pointing to tunnel NH -//Change the route to point to composite NH with old tunnel NH +//Change the route to point to composite NH with old tunnel NH //and a new tunnel NH, and make sure //preexiting NH gets slot 0 in composite NH TEST_F(EcmpNhTest, EcmpNH_5) { @@ -775,7 +775,7 @@ TEST_F(EcmpNhTest, DISABLED_EcmpNH_7) { intf_nh = static_cast(mpls->nexthop()); EXPECT_TRUE(intf_nh->GetInterface()->name() == "vnet3"); - //Delete couple of interface and verify composite NH also get + //Delete couple of interface and verify composite NH also get //deleted DeleteVmportEnv(input1, 1, false); client->WaitForIdle(); @@ -987,7 +987,7 @@ TEST_F(EcmpNhTest, EcmpNH_10) { Ip4Address ip2 = Ip4Address::from_string("100.1.1.2"); EcmpTunnelRouteAdd(bgp_peer, "vrf1", ip2, 32, - comp_nh_list2, false, "vn1", sg_id_list, + comp_nh_list2, false, "vn1", sg_id_list, TagList(), PathPreference()); client->WaitForIdle(); @@ -1209,7 +1209,7 @@ TEST_F(EcmpNhTest, EcmpNH_13) { client->WaitForIdle(); client->CompositeNHWait(1); EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); - + //Delete all the routes and make sure nexthop is also deleted DeleteRoute("vrf1", "100.1.1.1", 32, bgp_peer); client->WaitForIdle(); @@ -1438,7 +1438,7 @@ TEST_F(EcmpNhTest, EcmpNH_16) { comp_nh_list.push_back(nh_data1); SecurityGroupList sg_list; EcmpTunnelRouteAdd(bgp_peer, "vrf2", remote_vm_ip, 32, - comp_nh_list, -1, "vn2", sg_list, + comp_nh_list, -1, "vn2", sg_list, TagList(), PathPreference()); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_evpn_route.cc b/src/vnsw/agent/test/test_evpn_route.cc index 769828b0282..f194c77e2c6 100644 --- a/src/vnsw/agent/test/test_evpn_route.cc +++ b/src/vnsw/agent/test/test_evpn_route.cc @@ -135,7 +135,7 @@ class RouteTest : public ::testing::Test { } void AddResolveRoute(const Ip4Address &server_ip, uint32_t plen) { - VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), agent_->vhost_interface()->name()); agent_->fabric_inet4_unicast_table()->AddResolveRoute( agent_->local_peer(), diff --git a/src/vnsw/agent/test/test_forwarding_mode.cc b/src/vnsw/agent/test/test_forwarding_mode.cc index 8b7508d9af8..ef63e2a7c60 100644 --- a/src/vnsw/agent/test/test_forwarding_mode.cc +++ b/src/vnsw/agent/test/test_forwarding_mode.cc @@ -124,7 +124,7 @@ class ForwardingModeTest : public ::testing::Test { const Ip4Address &server_ip, uint32_t label, TunnelType::TypeBmap bmap) { //Use any other peer than localvmpeer - Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, ip_addr, 32, server_ip, + Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, ip_addr, 32, server_ip, bmap, label+1, vrf_name_, SecurityGroupList(), TagList(), PathPreference()); client->WaitForIdle(); @@ -134,7 +134,7 @@ class ForwardingModeTest : public ::testing::Test { } void AddResolveRoute(const Ip4Address &server_ip, uint32_t plen) { - VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), agent_->vhost_interface()->name()); agent_->fabric_inet4_unicast_table()->AddResolveRoute( agent_->local_peer(), @@ -565,12 +565,12 @@ TEST_F(ForwardingModeTest, default_forwarding_mode_l2_add_aap) { /* Adding AAP entry */ AddAap("vnet1", 1, Ip4Address::from_string("11.11.11.11"), mac.ToString()); VmInterface *vm_intf = static_cast(VmPortGet(1)); - client->WaitForIdle(); + client->WaitForIdle(); EXPECT_TRUE(vm_intf->allowed_address_pair_list().list_.size() == 1); BridgeRouteEntry* aap_l2_rt = L2RouteGet("vrf1", mac); EXPECT_TRUE(aap_l2_rt != NULL); AddAap("vnet1", 1, Ip4Address(0), zero_mac.ToString()); - client->WaitForIdle(); + client->WaitForIdle(); aap_l2_rt = L2RouteGet("vrf1", mac); EXPECT_TRUE(aap_l2_rt == NULL); EXPECT_TRUE(vm_intf->allowed_address_pair_list().list_.size() == 0); diff --git a/src/vnsw/agent/test/test_global_vrouter_config.cc b/src/vnsw/agent/test/test_global_vrouter_config.cc index 15e3f6e052b..a222db556fb 100644 --- a/src/vnsw/agent/test/test_global_vrouter_config.cc +++ b/src/vnsw/agent/test/test_global_vrouter_config.cc @@ -73,7 +73,7 @@ TEST_F(CfgTest, Global_vxlan_network_identifier_mode_config) { EXPECT_TRUE(Agent::GetInstance()->vxlan_network_identifier_mode() == Agent::AUTOMATIC); - //Set to configured and then delete node + //Set to configured and then delete node str << "configured" << endl; AddNode("global-vrouter-config", "vrouter-config", 1, str.str().c_str()); client->WaitForIdle(); @@ -91,18 +91,18 @@ TEST_F(CfgTest, Global_vxlan_network_identifier_mode_config) { TEST_F(CfgTest, TunnelType_test) { client->Reset(); ASSERT_TRUE(TunnelType::DefaultType() == default_tunnel_type_); - ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == + ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == default_tunnel_type_); AddEncapList("MPLSoUDP", "MPLSoGRE", "VXLAN"); client->WaitForIdle(); - ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == + ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == TunnelType::MPLS_UDP); client->WaitForIdle(); DelEncapList(); client->WaitForIdle(); ASSERT_TRUE(TunnelType::DefaultType() == default_tunnel_type_); - ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == + ASSERT_TRUE(TunnelType::ComputeType(TunnelType::AllType()) == default_tunnel_type_); AddEncapList("MPLSoUDP", "VXLAN", ""); diff --git a/src/vnsw/agent/test/test_init.h b/src/vnsw/agent/test/test_init.h index 2ac7c52b47a..872aef3cc3f 100644 --- a/src/vnsw/agent/test/test_init.h +++ b/src/vnsw/agent/test/test_init.h @@ -236,13 +236,13 @@ class TestClient { if (comp_nh->GetType() != NextHop::COMPOSITE) return; comp_nh_notify_++; - std::vector::iterator it = + std::vector::iterator it = std::find(comp_nh_list_.begin(), comp_nh_list_.end(), comp_nh); if (e->IsDeleted()) { comp_nh_del_notify_++; if (it != comp_nh_list_.end()) comp_nh_list_.erase(it); - } else { + } else { if (it == comp_nh_list_.end()) { comp_nh_list_.push_back(comp_nh); } @@ -281,9 +281,9 @@ class TestClient { } void CompositeNHReset() {comp_nh_list_.clear();}; void MplsReset() {mpls_notify_ = mpls_del_notify_ = 0;}; - void Reset() {vrf_notify_ = acl_notify_ = port_notify_ = vn_notify_ = - vm_notify_ = cfg_notify_ = port_del_notify_ = - vm_del_notify_ = vn_del_notify_ = vrf_del_notify_ = + void Reset() {vrf_notify_ = acl_notify_ = port_notify_ = vn_notify_ = + vm_notify_ = cfg_notify_ = port_del_notify_ = + vm_del_notify_ = vn_del_notify_ = vrf_del_notify_ = nh_notify_ = nh_del_notify_ = comp_nh_notify_ = comp_nh_del_notify_ = 0;}; uint32_t acl_notify() { return acl_notify_;} @@ -456,7 +456,7 @@ class TestClient { EXPECT_EQ(port_count, port_del_notify_); return (port_del_notify_ == port_count); } - + bool VmDelNotifyWait(int count) { int i = 0; @@ -530,7 +530,7 @@ class TestClient { WAIT_FOR(100, 10000, (mpls_notify_ >= mpls_count)); return (mpls_notify_ >= mpls_count); } - + bool NotifyWait(int port_count, int vn_count, int vm_count) { bool vn_ret = VnNotifyWait(vn_count); bool vm_ret = VmNotifyWait(vm_count); @@ -562,21 +562,21 @@ class TestClient { } void Init() { - Agent::GetInstance()->vn_table()->Register(boost::bind(&TestClient::VnNotify, + Agent::GetInstance()->vn_table()->Register(boost::bind(&TestClient::VnNotify, this, _1, _2)); - Agent::GetInstance()->vm_table()->Register(boost::bind(&TestClient::VmNotify, + Agent::GetInstance()->vm_table()->Register(boost::bind(&TestClient::VmNotify, this, _1, _2)); - Agent::GetInstance()->interface_table()->Register(boost::bind(&TestClient::PortNotify, + Agent::GetInstance()->interface_table()->Register(boost::bind(&TestClient::PortNotify, this, _1, _2)); - Agent::GetInstance()->acl_table()->Register(boost::bind(&TestClient::AclNotify, + Agent::GetInstance()->acl_table()->Register(boost::bind(&TestClient::AclNotify, this, _1, _2)); - Agent::GetInstance()->vrf_table()->Register(boost::bind(&TestClient::VrfNotify, + Agent::GetInstance()->vrf_table()->Register(boost::bind(&TestClient::VrfNotify, this, _1, _2)); Agent::GetInstance()->nexthop_table()->Register(boost::bind(&TestClient::CompositeNHNotify, this, _1, _2)); Agent::GetInstance()->nexthop_table()->Register(boost::bind(&TestClient::NHNotify, this, _1, _2)); - Agent::GetInstance()->mpls_table()->Register(boost::bind(&TestClient::MplsNotify, + Agent::GetInstance()->mpls_table()->Register(boost::bind(&TestClient::MplsNotify, this, _1, _2)); }; TestAgentInit *agent_init() { return agent_init_.get(); } @@ -608,7 +608,7 @@ class TestClient { AgentParam param_; }; -TestClient *TestInit(const char *init_file = NULL, bool ksync_init = false, +TestClient *TestInit(const char *init_file = NULL, bool ksync_init = false, bool pkt_init = true, bool services_init = true, bool uve_init = true, int agent_stats_interval = AgentParam::kAgentStatsInterval, diff --git a/src/vnsw/agent/test/test_integration.cc b/src/vnsw/agent/test/test_integration.cc index eb8c1cdfad0..fe2c5707637 100644 --- a/src/vnsw/agent/test/test_integration.cc +++ b/src/vnsw/agent/test/test_integration.cc @@ -357,7 +357,7 @@ void IntfExpectProcess (xml_node &parent, bool expect) { for (xml_node child = node.first_child(); child; child = child.next_sibling()) { if (strcmp(child.name(), "mac") == 0) { - EXPECT_TRUE(strcasecmp(child.child_value(), + EXPECT_TRUE(strcasecmp(child.child_value(), intf->get_mac().c_str()) == 0); } else if (strcmp(child.name(), "name") == 0) { EXPECT_TRUE(strcmp(child.child_value(), diff --git a/src/vnsw/agent/test/test_l2route.cc b/src/vnsw/agent/test/test_l2route.cc index e72c2f87e4a..30900c38b48 100644 --- a/src/vnsw/agent/test/test_l2route.cc +++ b/src/vnsw/agent/test/test_l2route.cc @@ -248,7 +248,7 @@ TEST_F(RouteTest, LocalVmRoute_1) { client->WaitForIdle(); WAIT_FOR(1000, 100, (VmPortL2Active(input, 0) == true)); - MulticastGroupObject *obj = + MulticastGroupObject *obj = MulticastHandler::GetInstance()->FindFloodGroupObject("vrf1"); EXPECT_TRUE(obj != NULL); WAIT_FOR(1000, 100, @@ -259,7 +259,7 @@ TEST_F(RouteTest, LocalVmRoute_1) { EXPECT_TRUE(rt->dest_vn_name() == "vn1"); uint32_t label = rt->GetActiveLabel(); MplsLabelKey key(label); - MplsLabel *mpls = + MplsLabel *mpls = static_cast(agent_->mpls_table()->Find(&key, true)); EXPECT_TRUE(mpls->nexthop() == nh); @@ -294,7 +294,7 @@ TEST_F(RouteTest, LocalVmRoute_2) { EXPECT_TRUE(rt->dest_vn_name() == "vn1"); uint32_t label = rt->GetActiveLabel(); MplsLabelKey key(label); - MplsLabel *mpls = + MplsLabel *mpls = static_cast(agent_->mpls_table()->Find(&key, true)); EXPECT_TRUE(mpls->nexthop() == nh); @@ -324,7 +324,7 @@ TEST_F(RouteTest, Mpls_sandesh_check_with_l2route) { client->WaitForIdle(); WAIT_FOR(1000, 100, (VmPortL2Active(input, 0) == true)); - MulticastGroupObject *obj = + MulticastGroupObject *obj = MulticastHandler::GetInstance()->FindFloodGroupObject("vrf1"); EXPECT_TRUE(obj != NULL); EXPECT_TRUE(L2RouteFind(vrf_name_, local_vm_mac_, local_vm_ip4_)); @@ -1111,7 +1111,7 @@ TEST_F(RouteTest, delete_notify_on_multicast_rt_with_no_state) { EXPECT_TRUE(route_state != NULL); VrfExport::State *vs = static_cast (bgp_peer_->GetVrfExportState(agent_->vrf_table()->GetTablePartition(rt->vrf()), - rt->vrf())); + rt->vrf())); rt->ClearState(rt->get_table(), vs->rt_export_[Agent::BRIDGE]->GetListenerId()); delete route_state; @@ -1419,7 +1419,7 @@ TEST_F(RouteTest, multiple_peer_evpn_label_check) { client->WaitForIdle(); } -// Bug# 1529665 +// Bug# 1529665 TEST_F(RouteTest, evpn_mcast_label_check_with_no_vm) { client->Reset(); AddEncapList("VXLAN", "MPLSoUDP", "MPLSoGRE"); @@ -1635,7 +1635,7 @@ class SetupTask : public Task { std::string test_name_; }; -//Bug# 1571598 +//Bug# 1571598 TEST_F(RouteTest, SquashPathTest_1) { struct PortInfo input[] = { {"vnet1", 1, "1.1.1.10", "00:00:01:01:01:10", 1, 1}, diff --git a/src/vnsw/agent/test/test_llgr.cc b/src/vnsw/agent/test/test_llgr.cc index ea10cce883e..d1ddabfe30b 100644 --- a/src/vnsw/agent/test/test_llgr.cc +++ b/src/vnsw/agent/test/test_llgr.cc @@ -114,7 +114,7 @@ class LlgrTest : public ::testing::Test { AgentXmppChannel *channel = bgp_peer_->GetAgentXmppChannel(); AgentIfMapXmppChannel *ifmap_channel = new AgentIfMapXmppChannel(agent_, channel->GetXmppChannel(), - channel->GetXmppServerIdx()); + channel->GetXmppServerIdx()); agent_->set_ifmap_xmpp_channel(ifmap_channel, channel->GetXmppServerIdx()); agent_->set_ifmap_active_xmpp_server("127.0.0.1", @@ -133,7 +133,7 @@ class LlgrTest : public ::testing::Test { const Ip4Address &server_ip, uint32_t label, TunnelType::TypeBmap bmap) { //Use any other peer than localvmpeer - Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, ip_addr, 32, server_ip, + Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, ip_addr, 32, server_ip, bmap, label+1, vrf_name_, SecurityGroupList(), TagList(), PathPreference()); client->WaitForIdle(); @@ -143,7 +143,7 @@ class LlgrTest : public ::testing::Test { } void AddResolveRoute(const Ip4Address &server_ip, uint32_t plen) { - VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), agent_->vhost_interface()->name()); agent_->fabric_inet4_unicast_table()->AddResolveRoute( agent_->local_peer(), diff --git a/src/vnsw/agent/test/test_mirror.cc b/src/vnsw/agent/test/test_mirror.cc index d492b14136a..7040f2265ff 100644 --- a/src/vnsw/agent/test/test_mirror.cc +++ b/src/vnsw/agent/test/test_mirror.cc @@ -83,7 +83,7 @@ class MirrorTableTest : public ::testing::Test { void AddAllArpEntry() { for (int i = 0; i < count_; i++) { - AddArp(dip_[i].to_string().c_str(), "0a:0b:0c:0d:0e:0f", + AddArp(dip_[i].to_string().c_str(), "0a:0b:0c:0d:0e:0f", eth_itf.c_str()); } client->WaitForIdle(); @@ -132,9 +132,9 @@ class MirrorTableTest : public ::testing::Test { TEST_F(MirrorTableTest, MirrorEntryAddDel_1) { AddAllMirrorEntry(); - + MirrorEntry *mirr_entry; - //Verify all mirror entry and mirror NH are added + //Verify all mirror entry and mirror NH are added for (int i = 0; i < count_; i++) { EXPECT_TRUE(MirrorEntryFind(i)); mirr_entry = GetMirrorEntry(i); @@ -147,7 +147,7 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_1) { //Resolve ARP for dest server IP and make sure NH //are valid now AddAllArpEntry(); - //Verify all mirror entry and mirror NH are added + //Verify all mirror entry and mirror NH are added for (int i = 0; i < count_; i++) { EXPECT_TRUE(MirrorEntryFind(i)); mirr_entry = GetMirrorEntry(i); @@ -181,9 +181,9 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_1) { TEST_F(MirrorTableTest, MirrorEntryAddDel_2) { AddAllMirrorEntry(); - + MirrorEntry *mirr_entry; - //Verify all mirror entry and mirror NH are added + //Verify all mirror entry and mirror NH are added for (int i = 0; i < count_; i++) { EXPECT_TRUE(MirrorEntryFind(i)); mirr_entry = GetMirrorEntry(i); @@ -196,7 +196,7 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_2) { //Resolve ARP for dest server IP and make sure NH //are valid now AddAllArpEntry(); - //Verify all mirror entry and mirror NH are added + //Verify all mirror entry and mirror NH are added for (int i = 0; i < count_; i++) { EXPECT_TRUE(MirrorEntryFind(i)); mirr_entry = GetMirrorEntry(i); @@ -234,7 +234,7 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_3) { //Add mirror entry pointing to same vhost IP std::stringstream str; str << analyzer; - MirrorTable::AddMirrorEntry(analyzer, agent_->fabric_vrf_name(), + MirrorTable::AddMirrorEntry(analyzer, agent_->fabric_vrf_name(), vhost_ip, 0x1, vhost_ip, 0x2); client->WaitForIdle(); //Mirror NH would point to a route, whose nexthop would be RCV NH @@ -253,7 +253,7 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_3) { (agent_->mirror_table()->FindActiveEntry(&key)); EXPECT_TRUE(mirr_entry == NULL); } - + TEST_F(MirrorTableTest, MirrorEntryAddDel_4) { Ip4Address vhost_ip(agent_->router_id()); Ip4Address remote_server = Ip4Address::from_string("1.1.1.1"); @@ -268,13 +268,13 @@ TEST_F(MirrorTableTest, MirrorEntryAddDel_4) { (agent_->mirror_table()->FindActiveEntry(&key)); EXPECT_TRUE(mirr_entry != NULL); const MirrorNH *mirr_nh = static_cast(mirr_entry->GetNH()); - //Gateway route not resolved, hence mirror entry would + //Gateway route not resolved, hence mirror entry would //be pointing to invalid NH const NextHop *nh = mirr_nh->GetRt()->GetActiveNextHop(); EXPECT_TRUE(nh->IsValid() == false); //Resolve ARP for subnet gateway route - AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", + AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", eth_itf.c_str()); client->WaitForIdle(); EXPECT_TRUE(nh->IsValid() == true); @@ -497,7 +497,7 @@ TEST_F(MirrorTableTest, StaticMirrorEntryAdd_6) { //This test is to verify the Dynamic without Juniper header config //Add Mirror Entry without mirror VRF so that Mirror entry will create the //vrf and attach to the Tunnel NH created by BridgeTunnelRouteAdd -// Change the VRF and check NH refrence is released +// Change the VRF and check NH refrence is released TEST_F(MirrorTableTest, StaticMirrorEntryAdd_7) { Ip4Address vhost_ip(agent_->router_id()); Ip4Address remote_server = Ip4Address::from_string("1.1.1.1"); @@ -640,7 +640,7 @@ TEST_F(MirrorTableTest, StaticMirrorEntryAdd_8) { EXPECT_TRUE(mirr_entry == NULL); client->WaitForIdle(); } -//This test is to verify the Static without Juniper header config +//This test is to verify the Static without Juniper header config //create a route in resolved state and check that Mirror entry creates tunnel nh //and attaches to it. TEST_F(MirrorTableTest, StaticMirrorEntryAdd_9) { diff --git a/src/vnsw/agent/test/test_multicast.cc b/src/vnsw/agent/test/test_multicast.cc index f07d199a828..b325acb125e 100644 --- a/src/vnsw/agent/test/test_multicast.cc +++ b/src/vnsw/agent/test/test_multicast.cc @@ -85,14 +85,14 @@ TEST_F(MulticastTest, Mcast_basic) { client->WaitForIdle(); CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); WAIT_FOR(1000, 1000, (MCRouteFind("vrf1", "255.255.255.255") == true)); client->Reset(); //Sandesh request DoMulticastSandesh(1); //key manipulation - Inet4MulticastRouteEntry *mc_rt = + Inet4MulticastRouteEntry *mc_rt = MCRouteGet("vrf1", IpAddress::from_string("255.255.255.255").to_v4()); EXPECT_TRUE(mc_rt != NULL); Inet4MulticastRouteKey key("vrf1", @@ -151,7 +151,7 @@ TEST_F(MulticastTest, McastSubnet_1) { client->Reset(); - InetUnicastRouteEntry *rt; + InetUnicastRouteEntry *rt; NextHop *nh; CompositeNH *cnh; MulticastGroupObject *mcobj; @@ -159,16 +159,16 @@ TEST_F(MulticastTest, McastSubnet_1) { AddIPAM("vn1", ipam_info, 3); client->WaitForIdle(); - EXPECT_TRUE(VmPortActive(input, 0)); - EXPECT_TRUE(VmPortActive(input, 1)); - EXPECT_TRUE(VmPortActive(input, 2)); + EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 1)); + EXPECT_TRUE(VmPortActive(input, 2)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "1.1.1.255", 32)); EXPECT_TRUE(RouteFind("vrf1", "1.1.1.255", 32)); EXPECT_TRUE(RouteFind("vrf1", "3.3.255.255", 32)); TunnelOlist olist_map; - olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, + olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); agent_->oper_db()->multicast()-> @@ -194,19 +194,19 @@ TEST_F(MulticastTest, McastSubnet_1) { EXPECT_TRUE(cnh->GetType() == NextHop::COMPOSITE); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - MplsLabel *mpls = - agent_->mpls_table()->FindMplsLabel(1111); - ASSERT_TRUE(mpls == NULL); + MplsLabel *mpls = + agent_->mpls_table()->FindMplsLabel(1111); + ASSERT_TRUE(mpls == NULL); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 2); TunnelOlist olist_map1; - olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 7777, + olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 7777, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); - olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 9999, + olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 9999, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); - olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 8888, + olist_map1.push_back(OlistTunnelEntry(nil_uuid(), 8888, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); agent_->oper_db()->multicast()-> @@ -221,16 +221,16 @@ TEST_F(MulticastTest, McastSubnet_1) { cnh = static_cast(nh); ASSERT_TRUE(nh != NULL); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - mpls = agent_->mpls_table()->FindMplsLabel(2222); - ASSERT_TRUE(mpls == NULL); + mpls = agent_->mpls_table()->FindMplsLabel(2222); + ASSERT_TRUE(mpls == NULL); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 1); client->WaitForIdle(); TunnelOlist olist_map2; - olist_map2.push_back(OlistTunnelEntry(nil_uuid(), 8888, + olist_map2.push_back(OlistTunnelEntry(nil_uuid(), 8888, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); - olist_map2.push_back(OlistTunnelEntry(nil_uuid(), 5555, + olist_map2.push_back(OlistTunnelEntry(nil_uuid(), 5555, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); agent_->oper_db()->multicast()-> @@ -246,13 +246,13 @@ TEST_F(MulticastTest, McastSubnet_1) { nh = const_cast(rt->GetActiveNextHop()); ASSERT_TRUE(nh != NULL); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - mpls = agent_->mpls_table()->FindMplsLabel(2222); - ASSERT_TRUE(mpls == NULL); + mpls = agent_->mpls_table()->FindMplsLabel(2222); + ASSERT_TRUE(mpls == NULL); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 1); memset(buf, 0, BUF_SIZE); AddXmlHdr(buf, len); - AddNodeString(buf, len, "virtual-network-network-ipam", + AddNodeString(buf, len, "virtual-network-network-ipam", "default-network-ipam,vn1", ipam_updated_info, 4); AddXmlTail(buf, len); ApplyXmlString(buf); @@ -261,7 +261,7 @@ TEST_F(MulticastTest, McastSubnet_1) { WAIT_FOR(1000, 1000, RouteGet("vrf1", IpAddress::from_string("4.255.255.255").to_v4(), 32)); EXPECT_TRUE(rt->GetActiveNextHop()->GetType() == NextHop::COMPOSITE); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -283,7 +283,7 @@ TEST_F(MulticastTest, McastSubnet_1) { false); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); @@ -334,9 +334,9 @@ TEST_F(MulticastTest, L2Broadcast_1) { CompositeNH *cnh; MulticastGroupObject *mcobj; - EXPECT_TRUE(VmPortActive(input, 0)); - EXPECT_TRUE(VmPortActive(input, 1)); - EXPECT_TRUE(VmPortActive(input, 2)); + EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 1)); + EXPECT_TRUE(VmPortActive(input, 2)); WAIT_FOR(1000, 1000, MCRouteFind("vrf1", "255.255.255.255")); EXPECT_TRUE(L2RouteFind("vrf1", MacAddress::BroadcastMac())); @@ -361,7 +361,7 @@ TEST_F(MulticastTest, L2Broadcast_1) { cnh = static_cast(nh); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); WAIT_FOR(1000, 1000, FindMplsLabel(1111)); - MplsLabel *mpls = GetActiveLabel(1111); + MplsLabel *mpls = GetActiveLabel(1111); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 3); EXPECT_TRUE(cnh->ComponentNHCount() == 2); EXPECT_TRUE(cnh->composite_nh_type() == Composite::L3COMP); @@ -375,11 +375,11 @@ TEST_F(MulticastTest, L2Broadcast_1) { EXPECT_TRUE(cnh->GetNH(0) == l2_cnh->GetNH(0)); for (uint8_t i = 1; i < cnh->ComponentNHCount(); i++) { - const InterfaceNH *l3_comp_nh = + const InterfaceNH *l3_comp_nh = static_cast(cnh->Get(i)->nh()); - const InterfaceNH *l2_comp_nh = + const InterfaceNH *l2_comp_nh = static_cast(l2_cnh->Get(i)->nh()); - EXPECT_TRUE(l3_comp_nh->GetFlags() == + EXPECT_TRUE(l3_comp_nh->GetFlags() == (InterfaceNHFlags::MULTICAST | InterfaceNHFlags::INET4)); EXPECT_TRUE(l2_comp_nh->GetFlags() == InterfaceNHFlags::BRIDGE); @@ -411,7 +411,7 @@ TEST_F(MulticastTest, L2Broadcast_1) { EXPECT_TRUE(l3_intf_nh->GetIfUuid() == l2_intf_nh->GetIfUuid()); } - const CompositeNH *mpls_cnh = + const CompositeNH *mpls_cnh = static_cast(mpls->nexthop()); EXPECT_TRUE(mpls_cnh->composite_nh_type() == Composite::MULTIPROTO); EXPECT_TRUE(mpls_cnh->ComponentNHCount() == 2); @@ -421,7 +421,7 @@ TEST_F(MulticastTest, L2Broadcast_1) { DoMulticastSandesh(2); DoMulticastSandesh(3); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -433,7 +433,7 @@ TEST_F(MulticastTest, L2Broadcast_1) { client->WaitForIdle(); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); client->Reset(); @@ -471,7 +471,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteRouteOnVRFDeleteofVN) { AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); - EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 0)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "1.1.1.255", 32)); EXPECT_TRUE(RouteFind("vrf1", "1.1.1.255", 32)); @@ -497,12 +497,12 @@ TEST_F(MulticastTest, McastSubnet_DeleteRouteOnVRFDeleteofVN) { nh = rt->GetActiveNextHop(); cnh = static_cast(nh); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - MplsLabel *mpls = - agent_->mpls_table()->FindMplsLabel(1111); - ASSERT_TRUE(mpls == NULL); + MplsLabel *mpls = + agent_->mpls_table()->FindMplsLabel(1111); + ASSERT_TRUE(mpls == NULL); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 1); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -543,7 +543,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteRouteOnIPAMDeleteofVN) { client->Reset(); - InetUnicastRouteEntry *rt; + InetUnicastRouteEntry *rt; NextHop *nh; CompositeNH *cnh; MulticastGroupObject *mcobj; @@ -551,10 +551,10 @@ TEST_F(MulticastTest, McastSubnet_DeleteRouteOnIPAMDeleteofVN) { AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0))); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0))); WAIT_FOR(1000, 1000, RouteFind("vrf1", "1.1.1.255", 32)); TunnelOlist olist_map; - olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, + olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); agent_->oper_db()->multicast()-> @@ -571,16 +571,16 @@ TEST_F(MulticastTest, McastSubnet_DeleteRouteOnIPAMDeleteofVN) { cnh = static_cast(nh); EXPECT_TRUE(cnh->GetType() == NextHop::COMPOSITE); mcobj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - MplsLabel *mpls = - agent_->mpls_table()->FindMplsLabel(1111); - ASSERT_TRUE(mpls == NULL); + MplsLabel *mpls = + agent_->mpls_table()->FindMplsLabel(1111); + ASSERT_TRUE(mpls == NULL); ASSERT_TRUE((mcobj->GetLocalOlist()).size() == 1); - DelLink("virtual-network", "vn1", "virtual-network-network-ipam", + DelLink("virtual-network", "vn1", "virtual-network-network-ipam", "default-network-ipam,vn1"); client->WaitForIdle(); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -614,7 +614,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteCompNHThenModifyFabricList) { client->Reset(); - InetUnicastRouteEntry *rt; + InetUnicastRouteEntry *rt; NextHop *nh; //CompositeNH *cnh; //MulticastGroupObject *mcobj; @@ -622,7 +622,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteCompNHThenModifyFabricList) { AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); - EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 0)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "1.1.1.255", 32)); EXPECT_TRUE(RouteFind("vrf1", "1.1.1.255", 32)); @@ -631,7 +631,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteCompNHThenModifyFabricList) { rt = RouteGet("vrf1", addr, 32); nh = const_cast(rt->GetActiveNextHop()); EXPECT_TRUE(nh != NULL); - + DBRequest req; NextHopKey *key = static_cast(nh->GetDBRequestKey().release()); req.oper = DBRequest::DB_ENTRY_DELETE; @@ -646,7 +646,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteCompNHThenModifyFabricList) { mcobj->Deleted(true); TunnelOlist olist_map; - olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, + olist_map.push_back(OlistTunnelEntry(nil_uuid(), 2000, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::AllType())); agent_->oper_db()->multicast()-> @@ -658,7 +658,7 @@ TEST_F(MulticastTest, McastSubnet_DeleteCompNHThenModifyFabricList) { client->WaitForIdle(); client->Reset(); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); @@ -697,7 +697,7 @@ TEST_F(MulticastTest, McastSubnet_SubnetIPAMAddDel) { }; client->Reset(); - EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 0)); AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); @@ -751,7 +751,7 @@ TEST_F(MulticastTest, McastSubnet_interfaceadd_after_ipam_delete) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 0)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "11.1.1.255", 32)); @@ -763,7 +763,7 @@ TEST_F(MulticastTest, McastSubnet_interfaceadd_after_ipam_delete) { CreateVmportEnv(input, 2, 0); client->WaitForIdle(); - EXPECT_TRUE(VmPortActive(input, 1)); + EXPECT_TRUE(VmPortActive(input, 1)); CompositeNHKey key("vrf1", IpAddress::from_string("11.1.1.255").to_v4(), IpAddress::from_string("0.0.0.0").to_v4(), false); @@ -806,7 +806,7 @@ TEST_F(MulticastTest, McastSubnet_VN2MultipleVRFtest_ignore_unknown_vrf) { client->WaitForIdle(); client->Reset(); - EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(VmPortActive(input, 0)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "11.1.1.3", 32)); EXPECT_TRUE(RouteFind("vrf1", "11.1.1.3", 32)); @@ -845,7 +845,7 @@ TEST_F(MulticastTest, subnet_bcast_ipv4_vn_delete) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); @@ -899,7 +899,7 @@ TEST_F(MulticastTest, subnet_bcast_ipv4_vn_ipam_change) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); @@ -948,7 +948,7 @@ TEST_F(MulticastTest, subnet_bcast_ipv4_vn_vrf_link_delete) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); @@ -997,7 +997,7 @@ TEST_F(MulticastTest, subnet_bcast_add_l2l3vn_and_l2vn) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 2); client->WaitForIdle(); @@ -1062,8 +1062,8 @@ TEST_F(MulticastTest, evpn_flood_l2l3_mode) { CompositeNH *cnh; MulticastGroupObject *mcobj; - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); - WAIT_FOR(1000, 1000, (VmPortActive(input, 1) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 1) == true)); WAIT_FOR(1000, 1000, MCRouteFind("vrf1", "255.255.255.255")); EXPECT_TRUE(L2RouteFind("vrf1", MacAddress::BroadcastMac())); @@ -1143,11 +1143,11 @@ TEST_F(MulticastTest, evpn_flood_l2l3_mode) { EXPECT_TRUE(l2_intf_cnh->ComponentNHCount() == 2); for (uint8_t i = 0; i < l3_intf_cnh->ComponentNHCount(); i++) { - const InterfaceNH *l3_intf_nh = + const InterfaceNH *l3_intf_nh = static_cast(l3_intf_cnh->GetNH(i)); - const InterfaceNH *l2_intf_nh = + const InterfaceNH *l2_intf_nh = static_cast(l2_intf_cnh->GetNH(i)); - EXPECT_TRUE(l3_intf_nh->GetFlags() == + EXPECT_TRUE(l3_intf_nh->GetFlags() == (InterfaceNHFlags::MULTICAST | InterfaceNHFlags::INET4)); EXPECT_TRUE(l2_intf_nh->GetFlags() == InterfaceNHFlags::BRIDGE); EXPECT_TRUE(l3_intf_nh->GetIfUuid() == l2_intf_nh->GetIfUuid()); @@ -1169,14 +1169,14 @@ TEST_F(MulticastTest, evpn_flood_l2l3_mode) { client->WaitForIdle(); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); client->Reset(); DeleteVmportEnv(input, 2, 1, 0); client->WaitForIdle(); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); WaitForRouteDelete(IpAddress::from_string("255.255.255.255").to_v4(), @@ -1197,7 +1197,7 @@ TEST_F(MulticastTest, evpn_flood_l2_mode) { CreateL2VmportEnv(input, 1); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortL2Active(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortL2Active(input, 0) == true)); WAIT_FOR(1000, 1000, L2RouteFind("vrf1", MacAddress::BroadcastMac())); EXPECT_FALSE(MCRouteFind("vrf1", "255.255.255.255")); @@ -1273,7 +1273,7 @@ TEST_F(MulticastTest, evpn_flood_l2_mode) { DeleteVmportEnv(input, 1, true); client->WaitForIdle(); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", agent_->fabric_interface_name().c_str()); client->WaitForIdle(); WaitForRouteDelete(IpAddress::from_string("255.255.255.255").to_v4(), @@ -1303,7 +1303,7 @@ TEST_F(MulticastTest, change_in_gateway_of_subnet_noop) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); @@ -1352,7 +1352,7 @@ TEST_F(MulticastTest, McastSubnet_VN2MultipleVRFtest_negative) { VxLanNetworkIdentifierMode(false); client->WaitForIdle(); CreateVmportEnv(input, 1, 0); - WAIT_FOR(1000, 1000, VmPortActive(input, 0)); + WAIT_FOR(1000, 1000, VmPortActive(input, 0)); WAIT_FOR(1000, 1000, RouteFind("vrf1", "11.1.1.3", 32)); WAIT_FOR(1000, 1000, !RouteFind("vrf1", "10.1.1.2", 32)); @@ -1361,7 +1361,7 @@ TEST_F(MulticastTest, McastSubnet_VN2MultipleVRFtest_negative) { client->WaitForIdle(); DeleteVmportEnv(input, 1, 0, 0); - WAIT_FOR(1000, 1000, !VmPortActive(input, 0)); + WAIT_FOR(1000, 1000, !VmPortActive(input, 0)); DelLink("virtual-network", "vn1", "routing-instance", "vrf1"); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_nh.cc b/src/vnsw/agent/test/test_nh.cc index 74e6adee59a..a31d29bde9e 100644 --- a/src/vnsw/agent/test/test_nh.cc +++ b/src/vnsw/agent/test/test_nh.cc @@ -80,7 +80,7 @@ static void CreateTunnelNH(const string &vrf_name, const Ip4Address &sip, uint32_t table_size = Agent::GetInstance()->nexthop_table()->Size(); NextHopKey *key = new TunnelNHKey(vrf_name, sip, dip, policy, - TunnelType::ComputeType(bmap)); + TunnelType::ComputeType(bmap)); req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; req.key.reset(key); req.data.reset(data); @@ -96,7 +96,7 @@ static void DeleteTunnelNH(const string &vrf_name, const Ip4Address &sip, uint32_t table_size = Agent::GetInstance()->nexthop_table()->Size(); NextHopKey *key = new TunnelNHKey(vrf_name, sip, dip, policy, - TunnelType::ComputeType(bmap)); + TunnelType::ComputeType(bmap)); req.oper = DBRequest::DB_ENTRY_DELETE; req.key.reset(key); req.data.reset(data); @@ -133,7 +133,7 @@ TEST_F(CfgTest, TunnelNh_1) { Ip4Address::from_string("30.30.30.30"), Ip4Address::from_string("20.20.20.20"), true, TunnelType::AllType()); - CreateTunnelNH(agent_->fabric_vrf_name(), + CreateTunnelNH(agent_->fabric_vrf_name(), Ip4Address::from_string("33.30.30.30"), Ip4Address::from_string("22.20.20.20"), false, TunnelType::AllType()); @@ -144,11 +144,11 @@ TEST_F(CfgTest, TunnelNh_1) { DeleteTunnelNH(agent_->fabric_vrf_name(), agent_->router_id(), Ip4Address::from_string("10.1.1.10"), true, TunnelType::AllType()); - DeleteTunnelNH(agent_->fabric_vrf_name(), + DeleteTunnelNH(agent_->fabric_vrf_name(), Ip4Address::from_string("30.30.30.30"), Ip4Address::from_string("20.20.20.20"), true, TunnelType::AllType()); - DeleteTunnelNH(agent_->fabric_vrf_name(), + DeleteTunnelNH(agent_->fabric_vrf_name(), Ip4Address::from_string("33.30.30.30"), Ip4Address::from_string("22.20.20.20"), false, TunnelType::AllType()); @@ -200,7 +200,7 @@ TEST_F(CfgTest, TunnelNh_3) { Ip4Address::from_string("10.1.1.10"), false, TunnelType::AllType()); client->WaitForIdle(); - + client->NextHopReset(); for (uint32_t i = 0; i < 10; i++) { CreateTunnelNH(agent_->fabric_vrf_name(), agent_->router_id(), @@ -588,7 +588,7 @@ TEST_F(CfgTest, Nexthop_keys) { AddEncapList("VXLAN", "MPLSoGRE", "MPLSoUDP"); client->WaitForIdle(); CreateVmportEnv(input1, 1); - WAIT_FOR(1000, 1000, VmPortActive(10)); + WAIT_FOR(1000, 1000, VmPortActive(10)); Ip4Address ip = Ip4Address::from_string("1.1.1.1"); WAIT_FOR(1000, 1000, (VrfGet("vrf10") != NULL)); WAIT_FOR(1000, 1000, (RouteGet("vrf10", ip, 32) != NULL)); @@ -748,15 +748,15 @@ TEST_F(CfgTest, Nexthop_keys) { //ARP NH with vm interface DBRequest arp_nh_req; arp_nh_req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; - arp_nh_req.key.reset(new ArpNHKey("vrf10", Ip4Address::from_string("11.11.11.11"), + arp_nh_req.key.reset(new ArpNHKey("vrf10", Ip4Address::from_string("11.11.11.11"), false)); MacAddress intf_vm_mac("00:00:01:01:01:11"); - VmInterfaceKey *intf_key = new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, + VmInterfaceKey *intf_key = new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, MakeUuid(10), "vrf10"); arp_nh_req.data.reset(new ArpNHData(intf_vm_mac, intf_key, true)); agent_->nexthop_table()->Enqueue(&arp_nh_req); client->WaitForIdle(); - ArpNHKey find_arp_nh_key("vrf10", Ip4Address::from_string("11.11.11.11"), + ArpNHKey find_arp_nh_key("vrf10", Ip4Address::from_string("11.11.11.11"), false); ArpNH *arp_nh = static_cast (agent_->nexthop_table()->FindActiveEntry(&find_arp_nh_key)); @@ -772,7 +772,7 @@ TEST_F(CfgTest, Nexthop_keys) { del_arp_nh_req.data.reset(NULL); agent_->nexthop_table()->Enqueue(&del_arp_nh_req); client->WaitForIdle(); - ArpNHKey find_del_arp_nh_key("vrf10", Ip4Address::from_string("11.11.11.11"), + ArpNHKey find_del_arp_nh_key("vrf10", Ip4Address::from_string("11.11.11.11"), false); EXPECT_TRUE(agent_->nexthop_table()-> FindActiveEntry(&find_del_arp_nh_key) == NULL); @@ -801,7 +801,7 @@ TEST_F(CfgTest, Nexthop_invalid_vrf) { //ARP NH DBRequest arp_nh_req; arp_nh_req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; - arp_nh_req.key.reset(new ArpNHKey("vrf11", Ip4Address::from_string("11.11.11.11"), + arp_nh_req.key.reset(new ArpNHKey("vrf11", Ip4Address::from_string("11.11.11.11"), false)); arp_nh_req.data.reset(new ArpNHData(vhost_intf_key)); agent_->nexthop_table()->Enqueue(&arp_nh_req); @@ -813,7 +813,7 @@ TEST_F(CfgTest, Nexthop_invalid_vrf) { //Interface NH MacAddress intf_vm_mac("00:00:01:01:01:11"); - VmInterfaceKey *intf_key = new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, + VmInterfaceKey *intf_key = new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, MakeUuid(11), "vrf11"); DBRequest intf_nh_req; intf_nh_req.oper = DBRequest::DB_ENTRY_ADD_CHANGE; diff --git a/src/vnsw/agent/test/test_path_preference_walker.cc b/src/vnsw/agent/test/test_path_preference_walker.cc index 050df1975d8..0346c346f64 100644 --- a/src/vnsw/agent/test/test_path_preference_walker.cc +++ b/src/vnsw/agent/test/test_path_preference_walker.cc @@ -72,7 +72,7 @@ struct TestPathPreferenceRouteListener : public PathPreferenceRouteListener { }; class PathPreferenceRouteTableWalkerTest : public ::testing::Test { -public: +public: PathPreferenceRouteTableWalkerTest() { vrf_name_1_ = "vrf1"; vrf_name_2_ = "vrf2"; @@ -84,7 +84,7 @@ class PathPreferenceRouteTableWalkerTest : public ::testing::Test { test_listener_ = NULL; agent_ = Agent::GetInstance(); }; - ~PathPreferenceRouteTableWalkerTest() { + ~PathPreferenceRouteTableWalkerTest() { } void SetupEnvironment(int num_vrfs) { @@ -110,7 +110,7 @@ class PathPreferenceRouteTableWalkerTest : public ::testing::Test { client->WaitForIdle(); test_listener_->Init(); client->WaitForIdle(); - VmInterfaceKey vhost_intf_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + VmInterfaceKey vhost_intf_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), Agent::GetInstance()->vhost_interface()->name()); Agent::GetInstance()->fabric_inet4_unicast_table()->AddResolveRoute( Agent::GetInstance()->local_peer(), @@ -191,7 +191,7 @@ class PathPreferenceRouteTableWalkerTest : public ::testing::Test { DelIPAM("vn3"); client->WaitForIdle(); } - + std::string vrf_name_1_; std::string vrf_name_2_; std::string vrf_name_3_; diff --git a/src/vnsw/agent/test/test_peer_del.cc b/src/vnsw/agent/test/test_peer_del.cc index 960cf305d57..1438085e7d9 100644 --- a/src/vnsw/agent/test/test_peer_del.cc +++ b/src/vnsw/agent/test/test_peer_del.cc @@ -33,8 +33,8 @@ class AgentPeerDelete : public ::testing::Test { void VrfCreated(DBTablePartBase *partition, DBEntryBase *e, BgpPeer *peer) { VrfEntry *vrf = static_cast(e); // state is created for each peer - DBState *State = vrf->GetState(partition->parent(), peer->GetVrfExportListenerId()); - VrfExport::State *state = static_cast(State); + DBState *State = vrf->GetState(partition->parent(), peer->GetVrfExportListenerId()); + VrfExport::State *state = static_cast(State); if (vrf->IsDeleted()) { if (state == NULL) { return; @@ -46,7 +46,7 @@ class AgentPeerDelete : public ::testing::Test { if (state == NULL) { state = new VrfExport::State(); - vrf->SetState(partition->parent(), peer->GetVrfExportListenerId(), state); + vrf->SetState(partition->parent(), peer->GetVrfExportListenerId(), state); } } @@ -60,7 +60,7 @@ class AgentPeerDelete : public ::testing::Test { IpAddress &dip, int label, InetUnicastAgentRouteTable *table) { Ip4Address s = sip.to_v4(); Ip4Address d = dip.to_v4(); - Inet4TunnelRouteAdd(peer, vrf_name, s, 32, d, + Inet4TunnelRouteAdd(peer, vrf_name, s, 32, d, TunnelType::AllType(), label, "", SecurityGroupList(), TagList(), PathPreference()); } @@ -75,7 +75,7 @@ TEST_F(AgentPeerDelete, peer_test_1) { ip5 = IpAddress::from_string("78.25.2.1"); ip6 = IpAddress::from_string("67.25.2.1"); - BgpPeer *peer1, *peer2; + BgpPeer *peer1, *peer2; AgentXmppChannel *channel1, *channel2; XmppChannelMock xmpp_channel; Agent::GetInstance()->set_controller_ifmap_xmpp_server("0.0.0.1", 0); @@ -162,7 +162,7 @@ TEST_F(AgentPeerDelete, peer_test_1) { TEST_F(AgentPeerDelete, DeletePeerOnDeletedVrf) { XmppChannelMock xmpp_channel; - BgpPeer *peer1, *peer2; + BgpPeer *peer1, *peer2; AgentXmppChannel *channel1; AgentXmppChannel *channel2; Agent::GetInstance()->set_controller_ifmap_xmpp_server("0.0.0.1", 0); @@ -205,9 +205,9 @@ TEST_F(AgentPeerDelete, DeletePeerOnDeletedVrf) { DelVrf("test_vrf3"); client->WaitForIdle(); - peer1->DelPeerRoutes(boost::bind(&AgentPeerDelete::DeletedVrfPeerDelDone, + peer1->DelPeerRoutes(boost::bind(&AgentPeerDelete::DeletedVrfPeerDelDone, this)); - peer2->DelPeerRoutes(boost::bind(&AgentPeerDelete::DeletedVrfPeerDelDone, + peer2->DelPeerRoutes(boost::bind(&AgentPeerDelete::DeletedVrfPeerDelDone, this)); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_route.cc b/src/vnsw/agent/test/test_route.cc index e0673d9b0cd..2d4679c6208 100644 --- a/src/vnsw/agent/test/test_route.cc +++ b/src/vnsw/agent/test/test_route.cc @@ -31,7 +31,7 @@ #include "kstate/test/test_kstate_util.h" #include "vr_types.h" #include "net/bgp_af.h" -#include +#include using namespace boost::assign; @@ -138,7 +138,7 @@ class RouteTest : public ::testing::Test { } void AddVhostRoute() { - VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, + VmInterfaceKey vhost_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), "vhost0"); agent_->fabric_inet4_unicast_table()->AddVHostRecvRouteReq (agent_->local_peer(), agent_->fabric_vrf_name(), vhost_key, @@ -146,8 +146,8 @@ class RouteTest : public ::testing::Test { client->WaitForIdle(); } - void AddRemoteVmRoute(const Ip4Address &remote_vm_ip, - const Ip4Address &server_ip, uint32_t plen, + void AddRemoteVmRoute(const Ip4Address &remote_vm_ip, + const Ip4Address &server_ip, uint32_t plen, uint32_t label, TunnelType::TypeBmap bmap) { //Passing vn name as vrf name itself Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip, plen, server_ip, @@ -156,15 +156,15 @@ class RouteTest : public ::testing::Test { client->WaitForIdle(); } - void AddRemoteVmRoute(const Ip4Address &remote_vm_ip, - const Ip4Address &server_ip, uint32_t plen, + void AddRemoteVmRoute(const Ip4Address &remote_vm_ip, + const Ip4Address &server_ip, uint32_t plen, uint32_t label) { AddRemoteVmRoute(remote_vm_ip, server_ip, plen, label, TunnelType::AllType()); } void AddResolveRoute(const Ip4Address &server_ip, uint32_t plen) { - VmInterfaceKey vhost_intf_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), + VmInterfaceKey vhost_intf_key(AgentKey::ADD_DEL_CHANGE, nil_uuid(), agent_->vhost_interface()->name()); agent_->fabric_inet4_unicast_table()->AddResolveRoute (agent_->local_peer(), agent_->fabric_vrf_name(), server_ip, plen, @@ -172,7 +172,7 @@ class RouteTest : public ::testing::Test { client->WaitForIdle(); } - void AddGatewayRoute(const std::string &vrf_name, + void AddGatewayRoute(const std::string &vrf_name, const Ip4Address &ip, int plen, const Ip4Address &server) { VnListType vn_list; @@ -198,18 +198,18 @@ class RouteTest : public ::testing::Test { client->WaitForIdle(); } - void DeleteRoute(const Peer *peer, const std::string &vrf_name, + void DeleteRoute(const Peer *peer, const std::string &vrf_name, const Ip4Address &addr, uint32_t plen) { AgentRoute *rt = RouteGet(vrf_name, addr, plen); uint32_t path_count = rt->GetPathList().size(); agent_->fabric_inet4_unicast_table()->DeleteReq(peer, vrf_name, addr, plen, NULL); client->WaitForIdle(5); - WAIT_FOR(1000, 10000, ((RouteFind(vrf_name, addr, plen) != true) || + WAIT_FOR(1000, 10000, ((RouteFind(vrf_name, addr, plen) != true) || (rt->GetPathList().size() == (path_count - 1)))); } - bool IsSameNH(const Ip4Address &ip1, uint32_t plen1, const Ip4Address &ip2, + bool IsSameNH(const Ip4Address &ip1, uint32_t plen1, const Ip4Address &ip2, uint32_t plen2, const string vrf_name) { InetUnicastRouteEntry *rt1 = RouteGet(vrf_name, ip1, plen1); const NextHop *nh1 = rt1->GetActiveNextHop(); @@ -450,8 +450,8 @@ TEST_F(RouteTest, VhostRecvRoute_1) { //Add and delete recv route on fabric VRF AddVhostRoute(); EXPECT_TRUE(RouteFind(agent_->fabric_vrf_name(), secondary_vhost_ip_, 32)); - - DeleteRoute(agent_->local_peer(), agent_->fabric_vrf_name(), + + DeleteRoute(agent_->local_peer(), agent_->fabric_vrf_name(), secondary_vhost_ip_, 32); EXPECT_FALSE(RouteFind(agent_->fabric_vrf_name(), secondary_vhost_ip_, 32)); } @@ -545,7 +545,7 @@ TEST_F(RouteTest, RemoteVmRoute_3) { TEST_F(RouteTest, RemoteVmRoute_4) { //Add resolve route AddResolveRoute(server1_ip_, 24); - + //Add a remote VM route pointing to server in same //subnet, tunnel NH will trigger ARP resolution AddRemoteVmRoute(remote_vm_ip_, server1_ip_, 32, MplsTable::kStartLabel, 0); @@ -628,7 +628,7 @@ TEST_F(RouteTest, RemoteVmRoute_5) { EXPECT_TRUE(addr_nh->IsValid() == false); //Resolve ARP for gw - AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", + AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", eth_name_.c_str()); client->WaitForIdle(); addr_nh = addr_rt->GetActiveNextHop(); @@ -687,7 +687,7 @@ TEST_F(RouteTest, RemoteVmRoute_no_gw) { EXPECT_TRUE(addr_nh->IsValid() == false); //Resolve ARP for gw - AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", + AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", eth_name_.c_str()); client->WaitForIdle(); EXPECT_TRUE(addr_nh->IsValid() == true); @@ -761,7 +761,7 @@ TEST_F(RouteTest, GatewayRoute_1) { EXPECT_TRUE(RouteFind(agent_->fabric_vrf_name(), server2_ip_, 32)); //Resolve ARP for subnet gateway route - AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", + AddArp(fabric_gw_ip_.to_string().c_str(), "0a:0b:0c:0d:0e:0f", eth_name_.c_str()); client->WaitForIdle(); EXPECT_TRUE(IsSameNH(server2_ip_, 32, fabric_gw_ip_, 32, @@ -1020,13 +1020,13 @@ TEST_F(RouteTest, RouteToDeletedNH_1) { MacAddress vm_mac = MacAddress::FromString("00:00:00:01:01:01"); // Add state to NextHop so that entry is not freed on delete - DBTableBase::ListenerId id = + DBTableBase::ListenerId id = agent_->nexthop_table()->Register(boost::bind(&RouteTest::NhListener, this, _1, _2)); InterfaceNHKey key(new VmInterfaceKey(AgentKey::ADD_DEL_CHANGE, MakeUuid(1), ""), false, InterfaceNHFlags::INET4, vm_mac); - NextHop *nh = + NextHop *nh = static_cast(agent_->nexthop_table()->FindActiveEntry(&key)); TestNhState *state = new TestNhState(); nh->SetState(agent_->nexthop_table(), id, state); @@ -1219,7 +1219,7 @@ TEST_F(RouteTest, RouteToInactiveInterface) { } TEST_F(RouteTest, RtEntryReuse) { - DBTableBase::ListenerId id = + DBTableBase::ListenerId id = agent_->fabric_inet4_unicast_table()->Register (boost::bind(&RouteTest::RtListener, this, _1, _2)); @@ -1273,7 +1273,7 @@ TEST_F(RouteTest, ScaleRouteAddDel_2) { uint32_t repeat = kScaleCount; uint32_t i = 0; for (i = 0; i < repeat; i++) { - AddRemoteVmRoute(remote_vm_ip_, fabric_gw_ip_, 32, + AddRemoteVmRoute(remote_vm_ip_, fabric_gw_ip_, 32, MplsTable::kStartLabel); if (i != (repeat - 1)) { InetUnicastAgentRouteTable::DeleteReq @@ -1311,8 +1311,8 @@ TEST_F(RouteTest, ScaleRouteAddDel_3) { } SecurityGroupList sg_id_list; - for (uint32_t i = 0; i < kScaleCount; i++) { - EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, + for (uint32_t i = 0; i < kScaleCount; i++) { + EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, comp_nh_list, false, "test", sg_id_list, TagList(), PathPreference()); client->WaitForIdle(); @@ -1345,8 +1345,8 @@ TEST_F(RouteTest, ScaleRouteAddDel_4) { uint32_t repeat = kScaleCount; SecurityGroupList sg_id_list; sg_id_list.push_back(1); - for (uint32_t i = 0; i < repeat; i++) { - EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, + for (uint32_t i = 0; i < repeat; i++) { + EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, comp_nh_list, -1, "test", sg_id_list, TagList(), PathPreference()); client->WaitForIdle(5); @@ -1720,7 +1720,7 @@ TEST_F(RouteTest, SubnetRoute_Flood_2) { }; CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - + //Now add remote route AddRemoteVmRoute(remote_subnet_ip_, fabric_gw_ip_, 29, MplsTable::kStartLabel); @@ -1795,7 +1795,7 @@ TEST_F(RouteTest, route_arp_flags_1) { Ip4Address::from_string("1.1.1.1"), 32); //In ksync binding decides if flood flag i.e. ipam_subnet_route needs to be - //enabled or not. + //enabled or not. EXPECT_FALSE(uc_rt->ipam_subnet_route()); EXPECT_FALSE(uc_rt->proxy_arp()); @@ -1979,7 +1979,7 @@ TEST_F(RouteTest, route_arp_flags_1) { EXPECT_FALSE(rt6->ipam_host_route()); DeleteRoute(bgp_peer_, vrf_name_, subnet_vm_ip_non_ipam_3, 16); client->WaitForIdle(); - + client->Reset(); DelIPAM("vn1"); @@ -2282,13 +2282,13 @@ TEST_F(RouteTest, EcmpTest_1) { agent_->mpls_table()->Enqueue(&req); //Now add ecmp tunnel add request - EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, + EcmpTunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, comp_nh_list, false, "test", sg_id_list, TagList(), PathPreference()); client->WaitForIdle(); TaskScheduler::GetInstance()->Start(); - //DeleteRoute(vrf_name_.c_str(), remote_vm_ip_, 32, peer); + //DeleteRoute(vrf_name_.c_str(), remote_vm_ip_, 32, peer); agent_->fabric_inet4_unicast_table()-> DeleteReq(bgp_peer_, vrf_name_.c_str(), remote_vm_ip_, 32, new ControllerVmRoute(bgp_peer_)); diff --git a/src/vnsw/agent/test/test_route_mock.cc b/src/vnsw/agent/test/test_route_mock.cc index 7e357e207d4..55c2c00d67b 100644 --- a/src/vnsw/agent/test/test_route_mock.cc +++ b/src/vnsw/agent/test/test_route_mock.cc @@ -55,7 +55,7 @@ void RouterIdDepInit(Agent *agent) { void StartControlNodeMock() { thread1 = new ServerThread(&evm1); bgp_peer1 = new test::ControlNodeMock(&evm1, "127.0.0.1"); - + Agent::GetInstance()->set_controller_ifmap_xmpp_server("127.0.0.1", 0); Agent::GetInstance()->set_controller_ifmap_xmpp_port(bgp_peer1->GetServerPort(), 0); Agent::GetInstance()->set_dns_server("", 0); @@ -63,7 +63,7 @@ void StartControlNodeMock() { thread2 = new ServerThread(&evm2); bgp_peer2 = new test::ControlNodeMock(&evm2, "127.0.0.1"); - + Agent::GetInstance()->set_controller_ifmap_xmpp_server("127.0.0.1", 1); Agent::GetInstance()->set_controller_ifmap_xmpp_port(bgp_peer2->GetServerPort(), 1); Agent::GetInstance()->set_dns_server("", 1); @@ -136,7 +136,7 @@ TEST_F(RouteTest, RouteTest_1) { EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() == Peer::BGP_PEER); //Get Local path - const NextHop *local_nh = + const NextHop *local_nh = rt->FindPath(Agent::GetInstance()->local_vm_peer())->ComputeNextHop(agent); const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(local_nh == bgp_nh); @@ -149,14 +149,14 @@ TEST_F(RouteTest, RouteTest_1) { //Create a port, route gets exported to BGP //Ensure the active path in route is BGP injected path, //and both BGP path and local path are pointing to same NH -//Add acl on the port, and verify that both BGP path and +//Add acl on the port, and verify that both BGP path and //local vm path point to policy enabled NH TEST_F(RouteTest, RouteTest_2) { struct PortInfo input[] = { {"vnet1", 1, "1.1.1.10", "00:00:00:01:01:01", 1, 1}, }; Ip4Address local_vm_ip = Ip4Address::from_string("1.1.1.10"); - + CreateVmportEnv(input, 1); client->WaitForIdle(); @@ -168,7 +168,7 @@ TEST_F(RouteTest, RouteTest_2) { EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() == Peer::BGP_PEER); //Local path and BGP path would point to same NH - const NextHop *local_nh = + const NextHop *local_nh = rt->FindPath(Agent::GetInstance()->local_vm_peer())->ComputeNextHop(agent); const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(local_nh == bgp_nh); @@ -223,17 +223,17 @@ TEST_F(RouteTest, BgpEcmpRouteTest_1) { //Expect route to point to composite NH const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(bgp_nh->GetType() == NextHop::COMPOSITE); - + //Two servers have exported same ip route, expect composite NH to have - //2 component NH + //2 component NH const CompositeNH *comp_nh = static_cast(bgp_nh); - EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); + EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); - //Verfiy that all members of component NH are correct + //Verfiy that all members of component NH are correct ComponentNHList::const_iterator component_nh_it = comp_nh->begin(); EXPECT_TRUE((*component_nh_it)->label() == 16); - const TunnelNH *tun_nh = + const TunnelNH *tun_nh = static_cast((*component_nh_it)->nh()); EXPECT_TRUE((*(tun_nh->GetDip())).to_string() == "10.10.10.10"); @@ -267,23 +267,23 @@ TEST_F(RouteTest, BgpEcmpRouteTest_2) { //Expect route to point to composite NH const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(bgp_nh->GetType() == NextHop::TUNNEL); - - //Add one more route, hosted on different server + + //Add one more route, hosted on different server bgp_peer1->AddRoute("vrf1", "1.1.1.1/32", "11.11.11.11", 17, "vn1"); bgp_peer2->AddRoute("vrf1", "1.1.1.1/32", "11.11.11.11", 17, "vn1"); WAIT_FOR(100, 10000, rt->GetActiveNextHop()->GetType() == NextHop::COMPOSITE); //Two servers have exported same ip route, expect composite NH to have - //2 component NH + //2 component NH bgp_nh = rt->GetActiveNextHop(); const CompositeNH *comp_nh = static_cast(bgp_nh); - EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); + EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); - //Verfiy that all members of component NH are correct + //Verfiy that all members of component NH are correct ComponentNHList::const_iterator component_nh_it = comp_nh->begin(); EXPECT_TRUE((*component_nh_it)->label() == 16); - const TunnelNH *tun_nh = + const TunnelNH *tun_nh = static_cast((*component_nh_it)->nh()); EXPECT_TRUE((*(tun_nh->GetDip())).to_string() == "10.10.10.10"); @@ -320,13 +320,13 @@ TEST_F(RouteTest, BgpEcmpRouteTest_3) { const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(bgp_nh->GetType() == NextHop::COMPOSITE); const CompositeNH *comp_nh = static_cast(bgp_nh); - EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); + EXPECT_TRUE(comp_nh->ComponentNHCount() == 2); - //Verfiy that all members of component NH are correct + //Verfiy that all members of component NH are correct ComponentNHList::const_iterator component_nh_it = comp_nh->begin(); EXPECT_TRUE((*component_nh_it)->label() == 16); - const TunnelNH *tun_nh = + const TunnelNH *tun_nh = static_cast((*component_nh_it)->nh()); EXPECT_TRUE((*(tun_nh->GetDip())).to_string() == "10.10.10.10"); @@ -376,16 +376,16 @@ TEST_F(RouteTest, BgpEcmpRouteTest_4) { const NextHop *bgp_nh = rt->GetActiveNextHop(); EXPECT_TRUE(bgp_nh->GetType() == NextHop::COMPOSITE); const CompositeNH *comp_nh = static_cast(bgp_nh); - EXPECT_TRUE(comp_nh->ComponentNHCount() == 3); + EXPECT_TRUE(comp_nh->ComponentNHCount() == 3); //Delete one of the server VM bgp_peer1->DeleteRoute("vrf1", "1.1.1.1/32", "11.11.11.11", 17, "vn1"); bgp_peer2->DeleteRoute("vrf1", "1.1.1.1/32", "11.11.11.11", 17, "vn1"); - //Verfiy that all members of component NH are correct + //Verfiy that all members of component NH are correct ComponentNHList::const_iterator component_nh_it = comp_nh->begin(); EXPECT_TRUE((*component_nh_it)->label() == 16); - const TunnelNH *tun_nh = + const TunnelNH *tun_nh = static_cast((*component_nh_it)->nh()); EXPECT_TRUE((*(tun_nh->GetDip())).to_string() == "10.10.10.10"); @@ -414,7 +414,7 @@ TEST_F(RouteTest, EcmpRouteTest_1) { {"vnet3", 3, "1.1.1.1", "00:00:00:02:02:03", 1, 3}, }; Ip4Address ip = Ip4Address::from_string("1.1.1.1"); - + CreateVmportEnv(input1, 3); client->WaitForIdle(); @@ -454,7 +454,7 @@ TEST_F(RouteTest, EcmpRouteTest_2) { {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, {"vnet2", 2, "1.1.1.1", "00:00:00:02:02:01", 1, 2}, }; - + CreateVmportEnv(input1, 2); client->WaitForIdle(); //Check that route points to composite NH, @@ -493,7 +493,7 @@ TEST_F(RouteTest, EcmpRouteTest_3) { {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, {"vnet2", 2, "1.1.1.2", "00:00:00:02:02:01", 1, 2}, }; - + CreateVmportEnv(input1, 2); client->WaitForIdle(); @@ -556,9 +556,9 @@ TEST_F(RouteTest, EcmpRouteTest_4) { client->WaitForIdle(); //Leak route to vrf2 - bgp_peer1->AddRoute("vrf2", "1.1.1.1/32", + bgp_peer1->AddRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); - bgp_peer2->AddRoute("vrf2", "1.1.1.1/32", + bgp_peer2->AddRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); client->WaitForIdle(); @@ -577,18 +577,18 @@ TEST_F(RouteTest, EcmpRouteTest_4) { client->WaitForIdle(); EXPECT_FALSE(RouteFind("vrf1", ip, 32)); EXPECT_TRUE(comp_nh->ComponentNHCount() == 0); - + //Delete route leaked to vrf2 - bgp_peer1->DeleteRoute("vrf2", "1.1.1.1/32", + bgp_peer1->DeleteRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); - bgp_peer2->DeleteRoute("vrf2", "1.1.1.1/32", + bgp_peer2->DeleteRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); client->WaitForIdle(); WAIT_FOR(100, 10000, RouteFind("vrf2", ip, 32) == false); DelVrf("vrf2"); DelVn("vn2"); } - + TEST_F(RouteTest, EcmpRouteTest_5) { Ip4Address ip = Ip4Address::from_string("1.1.1.1"); //Create mutliple VM interface with same IP @@ -605,9 +605,9 @@ TEST_F(RouteTest, EcmpRouteTest_5) { client->WaitForIdle(); //Leak route to vrf2 - bgp_peer1->AddRoute("vrf2", "1.1.1.1/32", + bgp_peer1->AddRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); - bgp_peer2->AddRoute("vrf2", "1.1.1.1/32", + bgp_peer2->AddRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); client->WaitForIdle(); @@ -636,20 +636,20 @@ TEST_F(RouteTest, EcmpRouteTest_5) { DeleteVmportEnv(input2, 1, true); client->WaitForIdle(); EXPECT_FALSE(RouteFind("vrf1", ip, 32)); - + //Delete route leaked to vrf2 - bgp_peer1->DeleteRoute("vrf2", "1.1.1.1/32", + bgp_peer1->DeleteRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); - bgp_peer2->DeleteRoute("vrf2", "1.1.1.1/32", + bgp_peer2->DeleteRoute("vrf2", "1.1.1.1/32", Agent::GetInstance()->router_id().to_string().c_str(), 18, "vn1"); client->WaitForIdle(); WAIT_FOR(100, 10000, RouteFind("vrf2", ip, 32) == false); DelVrf("vrf2"); DelVn("vn2"); } - + //Test to ensure composite NH, only has non policy enabled -//interface nexthopss +//interface nexthopss TEST_F(RouteTest, EcmpRouteTest_7) { Ip4Address ip = Ip4Address::from_string("1.1.1.1"); //Create VM interface with polcy @@ -679,7 +679,7 @@ TEST_F(RouteTest, EcmpRouteTest_7) { const NextHop *bgp_nh = rt->GetActiveNextHop(); const CompositeNH *comp_nh = static_cast(bgp_nh); - //Verfiy that all members of component NH are correct + //Verfiy that all members of component NH are correct ComponentNHList::const_iterator component_nh_it = comp_nh->begin(); EXPECT_TRUE((*component_nh_it)->nh()->GetType() == NextHop::INTERFACE); diff --git a/src/vnsw/agent/test/test_scale_walk.cc b/src/vnsw/agent/test/test_scale_walk.cc index 3b3bcc247a2..574886f87d2 100644 --- a/src/vnsw/agent/test/test_scale_walk.cc +++ b/src/vnsw/agent/test/test_scale_walk.cc @@ -35,13 +35,13 @@ TEST_F(AgentBasicScaleTest, Basic) { client->Reset(); client->WaitForIdle(); - //Setup + //Setup XmppConnectionSetUp(); BuildVmPortEnvironment(); //Create a walker and pass callback Peer *dummy_peer = new Peer(Peer::BGP_PEER, "dummy_peer", false); - ControllerRouteWalkerTest *route_walker_test = + ControllerRouteWalkerTest *route_walker_test = new ControllerRouteWalkerTest(dummy_peer); SetWalkerYield(walker_yield); route_walker_test->Start(ControllerRouteWalker::NOTIFYALL, true, @@ -49,9 +49,9 @@ TEST_F(AgentBasicScaleTest, Basic) { route_walker_test)); WAIT_FOR(10000, 10000, route_walker_test->walk_done_); SetWalkerYield(DEFAULT_WALKER_YIELD); - + uint32_t total_interface = num_vns * num_vms_per_vn; - uint32_t expected_route_count = 6 + (2 * num_vns) + (3 * total_interface); + uint32_t expected_route_count = 6 + (2 * num_vns) + (3 * total_interface); EXPECT_TRUE(expected_route_count == route_walker_test->route_count_); route_walker_test->vrf_count_ = route_walker_test->route_count_ = 0; @@ -65,7 +65,7 @@ TEST_F(AgentBasicScaleTest, local_and_remote) { client->Reset(); client->WaitForIdle(); - //Setup + //Setup XmppConnectionSetUp(); BuildVmPortEnvironment(); @@ -74,15 +74,15 @@ TEST_F(AgentBasicScaleTest, local_and_remote) { uint32_t total_v4_routes = Agent::GetInstance()->vrf_table()-> GetInet4UnicastRouteTable("vrf1")->Size(); - mock_peer[0].get()->AddRemoteV4Routes(num_remote, "vrf1", "vn1", + mock_peer[0].get()->AddRemoteV4Routes(num_remote, "vrf1", "vn1", "172.0.0.0"); WAIT_FOR(10000, 10000, (Agent::GetInstance()->vrf_table()-> - GetInet4UnicastRouteTable("vrf1")->Size() == + GetInet4UnicastRouteTable("vrf1")->Size() == (total_v4_routes + num_remote))); //Create a walker and pass callback Peer *dummy_peer = new Peer(Peer::BGP_PEER, "dummy_peer", false); - ControllerRouteWalkerTest *route_walker_test = + ControllerRouteWalkerTest *route_walker_test = new ControllerRouteWalkerTest(dummy_peer); SetWalkerYield(walker_yield); route_walker_test->Start(ControllerRouteWalker::NOTIFYALL, true, @@ -90,9 +90,9 @@ TEST_F(AgentBasicScaleTest, local_and_remote) { route_walker_test)); WAIT_FOR(10000, 10000, route_walker_test->walk_done_); SetWalkerYield(DEFAULT_WALKER_YIELD); - + uint32_t expected_route_count = 6 + (2 * num_vns) + (3 * total_interface) + - num_remote; + num_remote; EXPECT_TRUE(expected_route_count == route_walker_test->route_count_); route_walker_test->vrf_count_ = route_walker_test->route_count_ = 0; diff --git a/src/vnsw/agent/test/test_service_chain_cfg.cc b/src/vnsw/agent/test/test_service_chain_cfg.cc index 1b2c7bd6935..b36a6e1571a 100644 --- a/src/vnsw/agent/test/test_service_chain_cfg.cc +++ b/src/vnsw/agent/test/test_service_chain_cfg.cc @@ -159,7 +159,7 @@ TEST_F(ServiceVlanTest, FloatingIp_2) { AddVmPortVrf("ser1", "1.1.1.2", 1); client->WaitForIdle(); - // Add links // vmi-routing-instance node <-> vmi and + // Add links // vmi-routing-instance node <-> vmi and // Add link vmi-routing-instance <-> routing-instanace char buff[2048]; int len = 0; @@ -167,7 +167,7 @@ TEST_F(ServiceVlanTest, FloatingIp_2) { AddNodeString(buff, len, "routing-instance", "vrf2", 2); AddLinkString(buff, len, "virtual-machine-interface-routing-instance", "ser1", "virtual-machine-interface", "vnet1"); - AddLinkString(buff, len, "virtual-machine-interface-routing-instance", + AddLinkString(buff, len, "virtual-machine-interface-routing-instance", "ser1", "routing-instance", "vrf2"); AddXmlTail(buff, len); ApplyXmlString(buff); @@ -203,7 +203,7 @@ TEST_F(ServiceVlanTest, FloatingIp_3) { AddVmPortVrf("ser1", "1.1.1.2", 1); client->WaitForIdle(); - // Add links // vmi-routing-instance node <-> vmi and + // Add links // vmi-routing-instance node <-> vmi and // Add link vmi-routing-instance <-> routing-instanace char buff[2048]; int len = 0; @@ -211,7 +211,7 @@ TEST_F(ServiceVlanTest, FloatingIp_3) { AddLinkString(buff, len, "virtual-machine-interface-routing-instance", "ser1", "virtual-machine-interface", "vnet1"); AddNodeString(buff, len, "routing-instance", "vrf2", 2); - AddLinkString(buff, len, "virtual-machine-interface-routing-instance", + AddLinkString(buff, len, "virtual-machine-interface-routing-instance", "ser1", "routing-instance", "vrf2"); AddXmlTail(buff, len); ApplyXmlString(buff); diff --git a/src/vnsw/agent/test/test_setup.h b/src/vnsw/agent/test/test_setup.h index ce0f8ace6fb..62bac15d953 100644 --- a/src/vnsw/agent/test/test_setup.h +++ b/src/vnsw/agent/test/test_setup.h @@ -116,44 +116,44 @@ void ConstructAce(Ace &ace, string &astr) { void ReadAcl(ptree &config) { for (ptree::const_iterator cfg_iter = config.begin(); cfg_iter != config.end(); - ++cfg_iter) { + ++cfg_iter) { if (cfg_iter->first != "acl") { - continue; - } - ptree acl_tree = cfg_iter->second; - int i = 0; - Acl acl; - acl.name = acl_tree.get("name"); - acl.id = acl_tree.get("id"); - int id = strtoul((acl.id).c_str(), NULL, 0); - LOG(DEBUG, "Acl name:" << acl.name); - for (ptree::const_iterator iter = acl_tree.begin(); iter != acl_tree.end(); - ++iter, ++i) { - if (iter->first == "ace") { - string astr = iter->second.data(); - LOG(DEBUG, "Ace :" << astr); - Ace ace; - ConstructAce(ace, astr); - LOG(DEBUG, "Source :" << ace.src); - LOG(DEBUG, "Dest :" << ace.dst); - LOG(DEBUG, "SP Start:" << ace.sp_s); - LOG(DEBUG, "SP End :" << ace.sp_e); - LOG(DEBUG, "DP Start:" << ace.dp_s); - LOG(DEBUG, "DP End :" << ace.dp_e); - LOG(DEBUG, "Proto :" << ace.protocol); - LOG(DEBUG, "Action :" << ace.action); - acl.ace_l.push_back(ace); - } - ++i; - } - - map::iterator it; - it = acl_l.find(id); - if (it != acl_l.end()) { - LOG(DEBUG, "Modifying existing Acl" << id); - acl_l.erase(id); - } - acl_l.insert(pair(id, acl)); + continue; + } + ptree acl_tree = cfg_iter->second; + int i = 0; + Acl acl; + acl.name = acl_tree.get("name"); + acl.id = acl_tree.get("id"); + int id = strtoul((acl.id).c_str(), NULL, 0); + LOG(DEBUG, "Acl name:" << acl.name); + for (ptree::const_iterator iter = acl_tree.begin(); iter != acl_tree.end(); + ++iter, ++i) { + if (iter->first == "ace") { + string astr = iter->second.data(); + LOG(DEBUG, "Ace :" << astr); + Ace ace; + ConstructAce(ace, astr); + LOG(DEBUG, "Source :" << ace.src); + LOG(DEBUG, "Dest :" << ace.dst); + LOG(DEBUG, "SP Start:" << ace.sp_s); + LOG(DEBUG, "SP End :" << ace.sp_e); + LOG(DEBUG, "DP Start:" << ace.dp_s); + LOG(DEBUG, "DP End :" << ace.dp_e); + LOG(DEBUG, "Proto :" << ace.protocol); + LOG(DEBUG, "Action :" << ace.action); + acl.ace_l.push_back(ace); + } + ++i; + } + + map::iterator it; + it = acl_l.find(id); + if (it != acl_l.end()) { + LOG(DEBUG, "Modifying existing Acl" << id); + acl_l.erase(id); + } + acl_l.insert(pair(id, acl)); } return; } @@ -175,10 +175,10 @@ void ReadVmPort(Vn &vn, string &vm_str) strncpy(vm.pinfo.addr, ip_address.c_str(), sizeof(vm.pinfo.addr)); sprintf(vm.pinfo.mac, "00:00:00:00:00:%02x", vm.pinfo.intf_id); vn.vm_l.push_back(vm); - + LOG(DEBUG, "VM id:" << vm.id); LOG(DEBUG, "VN id:" << vn.id); - LOG(DEBUG, "VRF :" << vn.vrf); + LOG(DEBUG, "VRF :" << vn.vrf); LOG(DEBUG, "VM name :" << vm.name); LOG(DEBUG, "VM Port id:" << vm.pinfo.intf_id); LOG(DEBUG, "VM PortName:" << vm.pinfo.name); @@ -192,19 +192,19 @@ void ReadVmPort(Vn &vn, string &vm_str) static int vn_id = 1; void ReadVn(ptree &vn_tree, Vn &vn) { - for (ptree::iterator iter = vn_tree.begin(); - iter != vn_tree.end(); ++iter) { + for (ptree::iterator iter = vn_tree.begin(); + iter != vn_tree.end(); ++iter) { if (iter->first == "vn-name") { - vn.name = iter->second.data(); - vn.id = vn_id++; - } else if (iter->first == "vrf-name") { - vn.vrf = iter->second.data(); - } else if (iter->first == "vm") { - string pstr = iter->second.data(); - ReadVmPort(vn, pstr); - } else if (iter->first == "acl-id") { - vn.acl_id = strtoul((iter->second.data()).c_str(), NULL, 0); - } + vn.name = iter->second.data(); + vn.id = vn_id++; + } else if (iter->first == "vrf-name") { + vn.vrf = iter->second.data(); + } else if (iter->first == "vm") { + string pstr = iter->second.data(); + ReadVmPort(vn, pstr); + } else if (iter->first == "acl-id") { + vn.acl_id = strtoul((iter->second.data()).c_str(), NULL, 0); + } } LOG(DEBUG, "No of VMs:" << vn.vm_l.size()); LOG(DEBUG, ""); @@ -229,16 +229,16 @@ void ReadExceptionPacket(string &str) { LOG(DEBUG, "protocol:" << ep.proto); tokens >> ep.act; LOG(DEBUG, "action:" << ep.act); - excep_p_l.push_back(ep); + excep_p_l.push_back(ep); } void ReadExceptionPackets(ptree &config) { ptree pkt_tree = config.get_child("exception-packet"); for (ptree::iterator iter = pkt_tree.begin(); - iter != pkt_tree.end(); ++iter) { + iter != pkt_tree.end(); ++iter) { if (iter->first == "packet") { - ReadExceptionPacket(iter->second.data()); - } + ReadExceptionPacket(iter->second.data()); + } } } @@ -246,13 +246,13 @@ void ReadVn(ptree &ccfg) { for (ptree::iterator iter = ccfg.begin(); iter != ccfg.end(); ++iter) { if (iter->first == "vn") { - Vn vn; - ReadVn(iter->second, vn); - vn_l.push_back(vn); - LOG(DEBUG, "Vn Name:" << vn.name); - LOG(DEBUG, "Vn id:" << vn.id); + Vn vn; + ReadVn(iter->second, vn); + vn_l.push_back(vn); + LOG(DEBUG, "Vn Name:" << vn.name); + LOG(DEBUG, "Vn id:" << vn.id); LOG(DEBUG, ""); - } + } } } @@ -286,8 +286,8 @@ Vn *FindVn(string &str) { std::vector::iterator it; for (it = vn_l.begin(); it != vn_l.end(); ++it) { if (((*it).name.compare(str)) == 0) { - return &(*it); - } + return &(*it); + } } return NULL; } @@ -296,8 +296,8 @@ Vm *FindVm(Vn &vn, string &str) { std::vector::iterator it; for (it = vn.vm_l.begin(); it != vn.vm_l.end(); ++it) { if ((*it).name.compare(str) == 0) { - return &(*it); - } + return &(*it); + } } return NULL; } @@ -388,7 +388,7 @@ void CreateIdPermXmlNode(xml_node &xn, Acl &acl) { uuid_ms.append_child(node_pcdata).set_value("0"); xml_node uuid_ls = uuid_n.append_child("uuid-lslong"); uuid_ls.append_child(node_pcdata).set_value(acl.id.c_str()); - + //enable xml_node enable = perm.append_child("enable"); enable.append_child(node_pcdata).set_value("true"); @@ -407,14 +407,14 @@ void CreateAclXmlNode(xml_node &xn, Acl &acl) { for (it = acl.ace_l.begin(); it != acl.ace_l.end(); ++it) { CreateAceXmlNode(acl_xml_node, *it); } - CreateIdPermXmlNode(node, acl); + CreateIdPermXmlNode(node, acl); } void ConstructAclXmlDoc() { xml_document xdoc; xml_node msg = xdoc.append_child("config"); xml_node update = msg.append_child("update"); - + map::iterator it; for (it = acl_l.begin(); it != acl_l.end(); ++it) { CreateAclXmlNode(update, (it->second)); diff --git a/src/vnsw/agent/test/test_tunnel_encap.cc b/src/vnsw/agent/test/test_tunnel_encap.cc index c8848457546..4992c51e06a 100644 --- a/src/vnsw/agent/test/test_tunnel_encap.cc +++ b/src/vnsw/agent/test/test_tunnel_encap.cc @@ -100,7 +100,7 @@ class TunnelEncapTest : public ::testing::Test { client->WaitForIdle(); } - void AddRemoteVmRoute(TunnelType::TypeBmap l3_bmap, + void AddRemoteVmRoute(TunnelType::TypeBmap l3_bmap, TunnelType::TypeBmap l2_bmap) { Inet4TunnelRouteAdd(bgp_peer_, vrf_name_, remote_vm_ip_, 32, @@ -134,7 +134,7 @@ class TunnelEncapTest : public ::testing::Test { client->WaitForIdle(); TunnelOlist olist_map; - olist_map.push_back(OlistTunnelEntry(nil_uuid(), 3000, + olist_map.push_back(OlistTunnelEntry(nil_uuid(), 3000, IpAddress::from_string("8.8.8.8").to_v4(), TunnelType::MplsType())); agent->oper_db()->multicast()->ModifyFabricMembers(Agent::GetInstance()-> @@ -149,7 +149,7 @@ class TunnelEncapTest : public ::testing::Test { IpAddress::from_string("255.255.255.255").to_v4(), IpAddress::from_string("0.0.0.0").to_v4(), 1112, olist_map); - AddArp("8.8.8.8", "00:00:08:08:08:08", + AddArp("8.8.8.8", "00:00:08:08:08:08", Agent::GetInstance()->fabric_interface_name().c_str()); client->WaitForIdle(); } @@ -166,7 +166,7 @@ class TunnelEncapTest : public ::testing::Test { remote_ecmp_vm_ip_, 32, NULL); client->WaitForIdle(); - DelArp("8.8.8.8", "00:00:08:08:08:08", + DelArp("8.8.8.8", "00:00:08:08:08:08", Agent::GetInstance()->fabric_interface_name().c_str()); client->WaitForIdle(); } @@ -179,15 +179,15 @@ class TunnelEncapTest : public ::testing::Test { case TunnelType::VXLAN: { ASSERT_TRUE(path->GetActiveLabel() == path->vxlan_id()); break; - } - case TunnelType::MPLS_GRE: + } + case TunnelType::MPLS_GRE: case TunnelType::MPLS_UDP: { ASSERT_TRUE(path->GetActiveLabel() == path->label()); break; - } + } default: { break; - } + } } } @@ -203,7 +203,7 @@ class TunnelEncapTest : public ::testing::Test { ASSERT_TRUE(type == tnh->GetTunnelType().GetType()); } } - + route = RouteGet(vrf_name_, remote_vm_ip_, 32); for(Route::PathList::iterator it = route->GetPathList().begin(); it != route->GetPathList().end(); it++) { @@ -248,8 +248,8 @@ class TunnelEncapTest : public ::testing::Test { const TunnelNH *tnh = static_cast(nh); ASSERT_TRUE(type == tnh->GetTunnelType().GetType()); } - } - + } + route = L2RouteGet(vrf_name_, remote_vm_mac_); for(Route::PathList::iterator it = route->GetPathList().begin(); it != route->GetPathList().end(); it++) { @@ -260,7 +260,7 @@ class TunnelEncapTest : public ::testing::Test { const TunnelNH *tnh = static_cast(nh); ASSERT_TRUE(type == tnh->GetTunnelType().GetType()); } - } + } } void VerifyMulticastRoutes(TunnelType::Type type) { @@ -361,32 +361,32 @@ TEST_F(TunnelEncapTest, gre_to_vxlan_udp) { } TEST_F(TunnelEncapTest, EncapChange) { - client->Reset(); - VxLanNetworkIdentifierMode(true, "VXLAN", "MPLSoGRE", "MPLSoUDP"); + client->Reset(); + VxLanNetworkIdentifierMode(true, "VXLAN", "MPLSoGRE", "MPLSoUDP"); AddVn(agent->fabric_vn_name().c_str(), 10); AddVrf(agent->fabric_policy_vrf_name().c_str()); AddLink("virtual-network", agent->fabric_vn_name().c_str(), "routing-instance", agent->fabric_policy_vrf_name().c_str()); client->WaitForIdle(); - TaskScheduler *scheduler = TaskScheduler::GetInstance(); - scheduler->Stop(); - - agent->mpls_table()->ReserveMulticastLabel(4000, 5000, 0); - MulticastHandler *mc_handler = static_cast(agent-> - oper_db()->multicast()); - TunnelOlist olist; - olist.push_back(OlistTunnelEntry(nil_uuid(), 10, - IpAddress::from_string("8.8.8.8").to_v4(), - TunnelType::MplsType())); - mc_handler->ModifyFabricMembers(Agent::GetInstance()-> - multicast_tree_builder_peer(), - agent->fabric_policy_vrf_name().c_str(), - IpAddress::from_string("255.255.255.255").to_v4(), - IpAddress::from_string("0.0.0.0").to_v4(), - 4100, olist, 1); - VxLanNetworkIdentifierMode(true, "VXLAN", "MPLSoUDP", "MPLSoGRE"); - scheduler->Start(); + TaskScheduler *scheduler = TaskScheduler::GetInstance(); + scheduler->Stop(); + + agent->mpls_table()->ReserveMulticastLabel(4000, 5000, 0); + MulticastHandler *mc_handler = static_cast(agent-> + oper_db()->multicast()); + TunnelOlist olist; + olist.push_back(OlistTunnelEntry(nil_uuid(), 10, + IpAddress::from_string("8.8.8.8").to_v4(), + TunnelType::MplsType())); + mc_handler->ModifyFabricMembers(Agent::GetInstance()-> + multicast_tree_builder_peer(), + agent->fabric_policy_vrf_name().c_str(), + IpAddress::from_string("255.255.255.255").to_v4(), + IpAddress::from_string("0.0.0.0").to_v4(), + 4100, olist, 1); + VxLanNetworkIdentifierMode(true, "VXLAN", "MPLSoUDP", "MPLSoGRE"); + scheduler->Start(); client->WaitForIdle(); BridgeRouteEntry *mc_route = diff --git a/src/vnsw/agent/test/test_util.cc b/src/vnsw/agent/test/test_util.cc index ee9f79ce7f5..2b5d09581d1 100644 --- a/src/vnsw/agent/test/test_util.cc +++ b/src/vnsw/agent/test/test_util.cc @@ -466,7 +466,7 @@ void AddLink(const char *node_name1, const char *name1, const char *node_name2, const char *name2, const char *mdata) { char buff[1024]; int len = 0; - + AddXmlHdr(buff, len); AddLinkString(buff, len, node_name1, name1, node_name2, name2, mdata); AddXmlTail(buff, len); @@ -653,8 +653,8 @@ void IntfCfgAdd(int intf_id, const string &name, const string ipaddr, void IntfCfgAdd(PortInfo *input, int id) { IntfCfgAdd(input[id].intf_id, input[id].name, input[id].addr, - input[id].vm_id, input[id].vn_id, input[id].mac, - input[id].ip6addr); + input[id].vm_id, input[id].vn_id, input[id].mac, + input[id].ip6addr); } void IntfCfgAddThrift(PortInfo *input, int id) { @@ -2958,19 +2958,19 @@ void AddHealthCheckService(const char *name, int id, void send_icmp(int fd, uint8_t smac, uint8_t dmac, uint32_t sip, uint32_t dip) { uint8_t dummy_dmac[6], dummy_smac[6]; - memset(dummy_dmac, 0, sizeof(dummy_dmac)); - memset(dummy_smac, 0, sizeof(dummy_dmac)); - dummy_dmac[5] = dmac; - dummy_smac[5] = smac; + memset(dummy_dmac, 0, sizeof(dummy_dmac)); + memset(dummy_smac, 0, sizeof(dummy_dmac)); + dummy_dmac[5] = dmac; + dummy_smac[5] = smac; IcmpPacket icmp(dummy_smac, dummy_dmac, sip, dip); int ret = write(fd, icmp.GetPacket(), sizeof(icmp_packet)); LOG(DEBUG, "Written " << ret << " bytes to fd " << fd); if (ret < 0) - { - LOG(ERROR, "Error <" << errno << ": " << strerror(errno) << - "> writing"); - } + { + LOG(ERROR, "Error <" << errno << ": " << strerror(errno) << + "> writing"); + } usleep(3*1000); } diff --git a/src/vnsw/agent/test/test_vhost_ip_change.cc b/src/vnsw/agent/test/test_vhost_ip_change.cc index 7ef9d709ad2..bf1b384523c 100644 --- a/src/vnsw/agent/test/test_vhost_ip_change.cc +++ b/src/vnsw/agent/test/test_vhost_ip_change.cc @@ -50,7 +50,7 @@ int main(int argc, char *argv[]) { GETUSERARGS(); client = TestInit(init_file, ksync_init, true, true, false); IpChangeTest::TestSetup(ksync_init); - + int ret = RUN_ALL_TESTS(); TestShutdown(); delete client; diff --git a/src/vnsw/agent/test/test_vm.cc b/src/vnsw/agent/test/test_vm.cc index 5f5f8c1f517..04483ff656e 100644 --- a/src/vnsw/agent/test/test_vm.cc +++ b/src/vnsw/agent/test/test_vm.cc @@ -66,17 +66,17 @@ TEST_F(CfgTest, VmBasic_1) { //Test for no node and link present AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddNodeString(buff, len, "virtual-machine", "vm1", 1); AddNodeString(buff, len, "virtual-machine-interface", "vnet2", 1); AddLinkString(buff, len, "virtual-machine", "vm1", "virtual-machine-interface", "vnet2"); AddXmlTail(buff, len); ApplyXmlString(buff); CheckVmAdd(1, 1); - + //Try changing key of VN VmEntry *vm = VmGet(1); - VmKey *oldKey = + VmKey *oldKey = new VmKey((static_cast((vm->GetDBRequestKey()).get()))->uuid_); VmKey *newKey = new VmKey(MakeUuid(200)); string s1; diff --git a/src/vnsw/agent/test/test_vmport_cfg.cc b/src/vnsw/agent/test/test_vmport_cfg.cc index e5142119fd9..a1c9fa28979 100644 --- a/src/vnsw/agent/test/test_vmport_cfg.cc +++ b/src/vnsw/agent/test/test_vmport_cfg.cc @@ -727,9 +727,9 @@ TEST_F(CfgTest, VmPortPolicy_2) { DelLink("virtual-network", "vn1", "virtual-machine-interface", "vnet2"); DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet2"); - DelLink("virtual-machine-interface", input[0].name, "instance-ip", + DelLink("virtual-machine-interface", input[0].name, "instance-ip", "instance0"); - DelLink("virtual-machine-interface", input[1].name, "instance-ip", + DelLink("virtual-machine-interface", input[1].name, "instance-ip", "instance1"); // Delete config vm entry - no-op for oper-db. Port is active @@ -891,9 +891,9 @@ TEST_F(CfgTest, VnDepOnVrfAcl_1) { DelLink("virtual-network", "vn1", "virtual-machine-interface", "vnet2"); DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet2"); - DelLink("virtual-machine-interface", input[0].name, "instance-ip", + DelLink("virtual-machine-interface", input[0].name, "instance-ip", "instance0"); - DelLink("virtual-machine-interface", input[1].name, "instance-ip", + DelLink("virtual-machine-interface", input[1].name, "instance-ip", "instance1"); client->WaitForIdle(); @@ -926,7 +926,7 @@ TEST_F(CfgTest, VnDepOnVrfAcl_1) { EXPECT_TRUE(client->PortNotifyWait(2)); EXPECT_FALSE(VmFind(1)); EXPECT_FALSE(VmPortFind(input, 0)); - WAIT_FOR(100, 1000, + WAIT_FOR(100, 1000, (3U == Agent::GetInstance()->interface_table()->Size())); EXPECT_EQ(0U, Agent::GetInstance()->vm_table()->Size()); EXPECT_EQ(1U, Agent::GetInstance()->vn_table()->Size()); @@ -1074,7 +1074,7 @@ TEST_F(CfgTest, FloatingIp_1) { client->WaitForIdle(); DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); client->WaitForIdle(); - DelLink("virtual-machine-interface", input[0].name, "instance-ip", + DelLink("virtual-machine-interface", input[0].name, "instance-ip", "instance1"); client->WaitForIdle(); @@ -1117,7 +1117,7 @@ TEST_F(CfgTest, FloatingIp_1) { IntfCfgDel(input, 0); client->WaitForIdle(); EXPECT_FALSE(VmPortFind(input, 0)); - + #if 0 DelLink("virtual-network", "vn1", "virtual-machine-interface", "vnet1"); @@ -1306,7 +1306,7 @@ TEST_F(CfgTest, Basic_1) { client->WaitForIdle(); DelLink("instance-ip", "instance0", "virtual-machine-interface", "vnet1"); client->WaitForIdle(); - + // Delete virtual-machine-interface to vrf link attribute DelLink("virtual-machine-interface-routing-instance", "vmvrf1", "routing-instance", "default-project:vn5:vn5"); @@ -1380,7 +1380,7 @@ TEST_F(CfgTest, Basic_2) { table = static_cast (Agent::GetInstance()->vrf_table()->GetInet4UnicastRouteTable("vrf1")); - rt = table->FindRoute(addr); + rt = table->FindRoute(addr); EXPECT_TRUE(rt != NULL); if (rt == NULL) { diff --git a/src/vnsw/agent/test/test_vn.cc b/src/vnsw/agent/test/test_vn.cc index 720cf235ce0..647c4e553b7 100644 --- a/src/vnsw/agent/test/test_vn.cc +++ b/src/vnsw/agent/test/test_vn.cc @@ -102,7 +102,7 @@ TEST_F(CfgTest, VnBasic_1) { //Test for no node and link present memset(buff, 0, 4096); AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddNodeString(buff, len, "virtual-machine", "vm1", 1); AddNodeString(buff, len, "virtual-machine-interface", "vnet2", 1); AddLinkString(buff, len, "virtual-network", "vn1", "virtual-machine-interface", "vnet3"); @@ -112,11 +112,11 @@ TEST_F(CfgTest, VnBasic_1) { AddLinkString(buff, len, "virtual-network", "vn1", "virtual-network-network-ipam", "default-network-ipam,vn1"); AddXmlTail(buff, len); ApplyXmlString(buff); - + CheckVnAdd(1, 1); //Try changing key of VN VnEntry *vn = VnGet(1); - VnKey *oldKey = + VnKey *oldKey = new VnKey((static_cast((vn->GetDBRequestKey()).get()))->uuid_); VnKey *newKey = new VnKey(MakeUuid(200)); string s1; @@ -134,7 +134,7 @@ TEST_F(CfgTest, VnBasic_1) { // Send updated Ipam memset(buff, 0, 4096); AddXmlHdr(buff, len); - AddNodeString(buff, len, "virtual-network", "vn1", 1); + AddNodeString(buff, len, "virtual-network", "vn1", 1); AddNodeString(buff, len, "virtual-network-network-ipam", "default-network-ipam,vn1", ipam_updated_info, 3); AddLinkString(buff, len, "virtual-network", "vn1", "virtual-network-network-ipam", "default-network-ipam,vn1"); AddXmlTail(buff, len); @@ -186,7 +186,7 @@ TEST_F(CfgTest, VnDepOnVrfAcl_1) { AddNodeString(buff, len, "routing-instance", "vrf6", 1); AddNodeString(buff, len, "access-control-list", "acl1", 1); AddLinkString(buff, len, "virtual-network", "vn1", "routing-instance", "vrf6"); - AddLinkString(buff, len, "access-control-list", "acl1", "virtual-network", + AddLinkString(buff, len, "access-control-list", "acl1", "virtual-network", "vn1"); AddXmlTail(buff, len); ApplyXmlString(buff); @@ -305,7 +305,7 @@ TEST_F(CfgTest, Global_vxlan_network_identifier_mode_config) { client->WaitForIdle(); EXPECT_TRUE(vn->GetVxLanId() == 1); - //Set to configured and then delete node + //Set to configured and then delete node str << "configured" << endl; AddNode("global-vrouter-config", "vrouter-config", 1, str.str().c_str()); client->WaitForIdle(); @@ -356,7 +356,7 @@ TEST_F(CfgTest, Global_vxlan_network_identifier_mode_config_sandesh) { EXPECT_TRUE(vn->GetVxLanId() == 1); vxlan_req = new VxLanReq(); std::vector result_after_delete = list_of(1); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result_after_delete)); vxlan_req->HandleRequest(); client->WaitForIdle(); @@ -387,7 +387,7 @@ TEST_F(CfgTest, vn_forwarding_mode_changed_0) { client->WaitForIdle(); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); DeleteVmportEnv(input, 1, true); client->WaitForIdle(); @@ -480,7 +480,7 @@ TEST_F(CfgTest, vn_forwarding_mode_changed_1) { EXPECT_TRUE(cnh->ComponentNHCount() == 1); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); DeleteVmportEnv(input, 1, true); client->WaitForIdle(); @@ -583,7 +583,7 @@ TEST_F(CfgTest, vn_forwarding_mode_changed_2) { EXPECT_TRUE(cnh->ComponentNHCount() == 1); client->Reset(); - DelIPAM("vn1"); + DelIPAM("vn1"); client->WaitForIdle(); DeleteVmportEnv(input, 1, true); client->WaitForIdle(); @@ -690,7 +690,7 @@ TEST_F(CfgTest, change_in_gateway) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); @@ -732,7 +732,7 @@ TEST_F(CfgTest, change_in_gatewaywith_no_vrf) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); @@ -958,7 +958,7 @@ TEST_F(CfgTest, multicast_fabric_routes) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); @@ -1008,7 +1008,7 @@ TEST_F(CfgTest, flat_subnet_config) { CreateVmportEnv(input, 1, 0); client->WaitForIdle(); - WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); + WAIT_FOR(1000, 1000, (VmPortActive(input, 0) == true)); AddIPAM("vn1", ipam_info, 1, ipam_attr); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_vrf.cc b/src/vnsw/agent/test/test_vrf.cc index d3a9435904f..1e2055f98c5 100644 --- a/src/vnsw/agent/test/test_vrf.cc +++ b/src/vnsw/agent/test/test_vrf.cc @@ -106,10 +106,10 @@ TEST_F(VrfTest, VrfAddDelTest_1) { VrfAddReq("vrf1"); EXPECT_TRUE(client->VrfNotifyWait(1)); EXPECT_TRUE(DBTableFind("vrf1.uc.route.0")); - + Ip4Address vm1_ip = Ip4Address::from_string("1.1.1.1"); Ip4Address vm2_ip = Ip4Address::from_string("1.1.1.2"); - + client->WaitForIdle(); bgp_peer1->AddRoute("vrf1", "1.1.1.1/32", "10.1.1.10", 10, "vn1"); bgp_peer1->AddRoute("vrf1", "1.1.1.2/32", "10.1.1.10", 10, "vn1"); @@ -127,10 +127,10 @@ TEST_F(VrfTest, VrfAddDelTest_sandesh_test_1) { VrfAddReq("vrf1"); EXPECT_TRUE(client->VrfNotifyWait(1)); EXPECT_TRUE(DBTableFind("vrf1.uc.route.0")); - + Ip4Address vm1_ip = Ip4Address::from_string("1.1.1.1"); Ip4Address vm2_ip = Ip4Address::from_string("1.1.1.2"); - + client->WaitForIdle(); bgp_peer1->AddRoute("vrf1", "1.1.1.1/32", "10.1.1.10", 10, "vn1"); bgp_peer1->AddRoute("vrf1", "1.1.1.2/32", "10.1.1.10", 10, "vn1"); @@ -240,7 +240,7 @@ TEST_F(VrfTest, CheckVrfReuse) { EXPECT_TRUE(vrf->IsDeleted()); EXPECT_TRUE(DBTableFind("vrf1.uc.route.0")); - AddVrf("vrf1", 1); + AddVrf("vrf1", 1); //Release VRF reference vrf_ref = NULL; client->WaitForIdle(); @@ -288,7 +288,7 @@ TEST_F(VrfTest, CheckIntfActivate) { EXPECT_FALSE(VmPortActive(input, 1) == true); EXPECT_FALSE(RouteFind("vrf1", vm1_ip, 32)); EXPECT_FALSE(RouteFind("vrf1", vm2_ip, 32)); - //Release reference to VRF, and expect interface + //Release reference to VRF, and expect interface //to be active vrf_ref = NULL; client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_vxlan_routing.cc b/src/vnsw/agent/test/test_vxlan_routing.cc index 5c2859c759e..fbfbd1b89cb 100644 --- a/src/vnsw/agent/test/test_vxlan_routing.cc +++ b/src/vnsw/agent/test/test_vxlan_routing.cc @@ -91,9 +91,9 @@ class VxlanRoutingTest : public ::testing::Test { CreateVmportEnv(input1, 2); CreateVmportEnv(input2, 1); AddLrVmiPort("lr-vmi-vn1", 91, "1.1.1.99", "vrf1", "vn1", - "instance_ip_1", 1); + "instance_ip_1", 1); AddLrVmiPort("lr-vmi-vn2", 92, "2.2.2.99", "vrf2", "vn2", - "instance_ip_2", 2); + "instance_ip_2", 2); client->WaitForIdle(5); } @@ -104,9 +104,9 @@ class VxlanRoutingTest : public ::testing::Test { DeleteVmportEnv(input1, 2, true); DeleteVmportEnv(input2, 1, true); DelLrVmiPort("lr-vmi-vn1", 91, "1.1.1.99", "vrf1", "vn1", - "instance_ip_1", 1); + "instance_ip_1", 1); DelLrVmiPort("lr-vmi-vn2", 92, "2.2.2.99", "vrf2", "vn2", - "instance_ip_2", 2); + "instance_ip_2", 2); DeleteBgpPeer(bgp_peer_); client->WaitForIdle(5); EXPECT_TRUE(VrfGet("vrf1") == NULL); diff --git a/src/vnsw/agent/test/test_xmpp.cc b/src/vnsw/agent/test/test_xmpp.cc index 398fd1bdfb7..87e95a31146 100644 --- a/src/vnsw/agent/test/test_xmpp.cc +++ b/src/vnsw/agent/test/test_xmpp.cc @@ -20,10 +20,10 @@ #include "xml/xml_pugi.h" -#include "controller/controller_peer.h" -#include "controller/controller_export.h" -#include "controller/controller_vrf_export.h" -#include "controller/controller_types.h" +#include "controller/controller_peer.h" +#include "controller/controller_export.h" +#include "controller/controller_vrf_export.h" +#include "controller/controller_types.h" #include "controller/controller_route_path.h" using namespace pugi; @@ -83,7 +83,7 @@ class ControlNodeMockBgpXmppPeer { void ReceiveUpdate(const XmppStanza::XmppMessage *msg) { rx_count_++; - } + } void HandleXmppChannelEvent(XmppChannel *channel, xmps::PeerState state) { @@ -107,7 +107,7 @@ class ControlNodeMockBgpXmppPeer { } bool SendUpdate(uint8_t *msg, size_t size) { - if (channel_ && + if (channel_ && (channel_->GetPeerState() == xmps::READY)) { return channel_->Send(msg, size, xmps::BGP, boost::bind(&ControlNodeMockBgpXmppPeer::WriteReadyCb, this, _1)); @@ -127,13 +127,13 @@ class ControlNodeMockBgpXmppPeer { }; -class AgentXmppUnitTest : public ::testing::Test { +class AgentXmppUnitTest : public ::testing::Test { protected: AgentXmppUnitTest() : thread_(&evm_), agent_(Agent::GetInstance()) {} - + virtual void SetUp() { //TestInit initilaizes the controller and xmpp, so disconnect that - //and again spawn a new one. Its required since the receive path + //and again spawn a new one. Its required since the receive path //is overridden by mock class. //TODO later use the agent initializer Agent::GetInstance()->controller()->Cleanup(); @@ -147,14 +147,14 @@ class AgentXmppUnitTest : public ::testing::Test { xmpp_init = new XmppInit(); xs->Initialize(0, false); - + thread_.Start(); client->WaitForIdle(); } virtual void TearDown() { xs->Shutdown(); - bgp_peer.reset(); + bgp_peer.reset(); client->WaitForIdle(); Agent::GetInstance()->reset_controller_xmpp_channel(0); agent_->set_controller_ifmap_xmpp_client(NULL, 0); @@ -209,7 +209,7 @@ class AgentXmppUnitTest : public ::testing::Test { cout << "State:" << list[i].state << endl; } cout << "*******************************************************"<append_child("message"); msg.append_attribute("type") = "set"; - msg.append_attribute("from") = XmppInit::kAgentNodeJID; + msg.append_attribute("from") = XmppInit::kAgentNodeJID; string str(XmppInit::kControlNodeJID); str += "/"; str += XmppInit::kBgpPeer; @@ -243,7 +243,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node L2MessageHeader(xml_document *xdoc, std::string vrf) { xml_node msg = xdoc->append_child("message"); msg.append_attribute("type") = "set"; - msg.append_attribute("from") = XmppInit::kAgentNodeJID; + msg.append_attribute("from") = XmppInit::kAgentNodeJID; string str(XmppInit::kControlNodeJID); str += "/"; str += XmppInit::kBgpPeer; @@ -260,7 +260,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendRouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string address, int label, + std::string address, int label, const char *vn = "vn1") { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf); @@ -269,7 +269,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.next_hops.next_hop.push_back(item_nexthop); item.entry.nlri.af = BgpAf::IPv4; @@ -286,7 +286,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendRouteMessageSg(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string address, int label, + std::string address, int label, const char *vn = "vn1") { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf); @@ -295,7 +295,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.nlri.af = BgpAf::IPv4; item.entry.nlri.safi = BgpAf::Unicast; @@ -314,7 +314,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendL2RouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string mac_string, std::string address, int label, + std::string mac_string, std::string address, int label, int ethernet_tag, const char *vn = "vn1", bool is_vxlan = false, const char *peer_ip = NULL) { xml_document xdoc; @@ -322,7 +322,7 @@ class AgentXmppUnitTest : public ::testing::Test { autogen::EnetNextHopType item_nexthop; item_nexthop.af = 1; - if (peer_ip == NULL) + if (peer_ip == NULL) item_nexthop.address = Agent::GetInstance()->router_id().to_string(); else item_nexthop.address = peer_ip; @@ -333,7 +333,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.tunnel_encapsulation_list.tunnel_encapsulation.push_back("gre"); item_nexthop.tunnel_encapsulation_list.tunnel_encapsulation.push_back("udp"); } - + autogen::EnetItemType item; item.entry.nlri.af = 25; item.entry.nlri.safi = 242; @@ -345,7 +345,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); @@ -355,12 +355,12 @@ class AgentXmppUnitTest : public ::testing::Test { WAIT_FOR(1000, 100, (bgp_peer.get()->Count() > count)); client->WaitForIdle(); } - + void SendL2RouteMessage(ControlNodeMockBgpXmppPeer *peer, const string &vrf, const string &mac_string, const string &address, int ethernet_tag) { stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); SendRouteDeleteMessage(peer, vrf, ss.str().c_str()); } @@ -388,7 +388,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node xitems = L2MessageHeader(&xdoc, vrf); xml_node node = xitems.append_child("retract"); stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); @@ -400,29 +400,29 @@ class AgentXmppUnitTest : public ::testing::Test { Agent::GetInstance()->controller()->increment_multicast_sequence_number(); Agent::GetInstance()->set_cn_mcast_builder(NULL); - //Create control-node bgp mock peer + //Create control-node bgp mock peer mock_peer.reset(new ControlNodeMockBgpXmppPeer()); - xs->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + xs->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer.get(), _1, _2)); LOG(DEBUG, "Create xmpp agent client"); - xmppc_cfg = new XmppConfigData; - xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", - xs->GetPort(), - XmppInit::kAgentNodeJID, - XmppInit::kControlNodeJID, true)); - xc->ConfigUpdate(xmppc_cfg); - - // client connection - cchannel = xc->FindChannel(XmppInit::kControlNodeJID); - //Create agent bgp peer + xmppc_cfg = new XmppConfigData; + xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", + xs->GetPort(), + XmppInit::kAgentNodeJID, + XmppInit::kControlNodeJID, true)); + xc->ConfigUpdate(xmppc_cfg); + + // client connection + cchannel = xc->FindChannel(XmppInit::kControlNodeJID); + //Create agent bgp peer bgp_peer.reset(new AgentBgpXmppPeerTest( Agent::GetInstance()->controller_ifmap_xmpp_server(0), 0)); bgp_peer.get()->RegisterXmppChannel(cchannel); - xc->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, - bgp_peer.get(), _2)); + xc->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, + bgp_peer.get(), _2)); agent_->set_controller_xmpp_channel(bgp_peer.get(), 0); agent_->set_controller_ifmap_xmpp_client(xc, 0); agent_->set_controller_ifmap_xmpp_init(xmpp_init, 0); @@ -466,7 +466,7 @@ TEST_F(AgentXmppUnitTest, Connection) { AgentXmppConnectionStatusReq *xmpp_req = new AgentXmppConnectionStatusReq(); std::vector result_beg; result_beg.push_back("127.0.0.1"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result_beg)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result_beg)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); @@ -482,7 +482,7 @@ TEST_F(AgentXmppUnitTest, Connection) { result.push_back("127.0.0.1"); result.push_back("Yes"); result.push_back("Established"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); @@ -955,7 +955,7 @@ TEST_F(AgentXmppUnitTest, CfgServerSelection) { result.push_back("127.0.0.1"); result.push_back("Yes"); result.push_back("Established"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); @@ -974,7 +974,7 @@ TEST_F(AgentXmppUnitTest, CfgServerSelection) { result2.push_back("127.0.0.1"); result2.push_back("No"); result2.push_back("Established"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result2)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result2)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); @@ -999,7 +999,7 @@ TEST_F(AgentXmppUnitTest, ConnectionUpDown) { result.push_back("127.0.0.1"); result.push_back("Yes"); result.push_back("Established"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); @@ -1009,7 +1009,7 @@ TEST_F(AgentXmppUnitTest, ConnectionUpDown) { VxLanNetworkIdentifierMode(false); client->WaitForIdle(); - // Create vm-port in vn1 + // Create vm-port in vn1 struct PortInfo input[] = { {"vnet2", 2, "1.1.1.2", "00:00:00:01:01:02", 1, 2}, }; @@ -1070,7 +1070,7 @@ TEST_F(AgentXmppUnitTest, ConnectionUpDown) { result2.push_back("127.0.0.1"); result2.push_back("No"); result2.push_back("Established"); - Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result2)); + Sandesh::set_response_callback(boost::bind(ValidateSandeshResponse, _1, result2)); xmpp_req->HandleRequest(); client->WaitForIdle(); xmpp_req->Release(); diff --git a/src/vnsw/agent/test/test_xmpp_bcast.cc b/src/vnsw/agent/test/test_xmpp_bcast.cc index 39e98088114..9e24da2555b 100644 --- a/src/vnsw/agent/test/test_xmpp_bcast.cc +++ b/src/vnsw/agent/test/test_xmpp_bcast.cc @@ -208,7 +208,7 @@ class AgentXmppUnitTest : public ::testing::Test { virtual void SetUp() { //TestInit initilaizes the controller and xmpp, so disconnect that - //and again spawn a new one. Its required since the receive path + //and again spawn a new one. Its required since the receive path //is overridden by mock class. //TODO later use the agent initializer Agent::GetInstance()->controller()->Cleanup(); @@ -303,7 +303,7 @@ class AgentXmppUnitTest : public ::testing::Test { return(xitems); } - xml_node MessageHeader(xml_document *xdoc, std::string vrf, bool bcast) + xml_node MessageHeader(xml_document *xdoc, std::string vrf, bool bcast) { return MessageHeaderInternal(xdoc, vrf, bcast, false); } @@ -451,7 +451,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); + ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); @@ -496,7 +496,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); + ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); @@ -549,29 +549,29 @@ class AgentXmppUnitTest : public ::testing::Test { //Create control-node bgp mock peer mock_peer.reset(new ControlNodeMockBgpXmppPeer()); - xs->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + xs->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer.get(), _1, _2)); LOG(DEBUG, "Create xmpp agent client"); - xmppc_cfg = new XmppConfigData; - xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", - xs->GetPort(), "127.0.0.1", + xmppc_cfg = new XmppConfigData; + xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", + xs->GetPort(), "127.0.0.1", "agent-a", - XmppInit::kControlNodeJID, true)); - xc->ConfigUpdate(xmppc_cfg); + XmppInit::kControlNodeJID, true)); + xc->ConfigUpdate(xmppc_cfg); - // client connection - cchannel = xc->FindChannel(XmppInit::kControlNodeJID); - //Create agent bgp peer + // client connection + cchannel = xc->FindChannel(XmppInit::kControlNodeJID); + //Create agent bgp peer bgp_peer.reset(new AgentBgpXmppPeerTest( Agent::GetInstance()->controller_ifmap_xmpp_server(0), Agent::GetInstance()->controller()->fabric_multicast_label_range(0).fabric_multicast_label_range_str, 0)); bgp_peer.get()->RegisterXmppChannel(cchannel); xc->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, - bgp_peer.get(), _2)); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, + bgp_peer.get(), _2)); + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); // server connection WAIT_FOR(1000, 10000, @@ -587,61 +587,61 @@ class AgentXmppUnitTest : public ::testing::Test { void XmppSubnetSetUp() { - //wait for connection establishment - WAIT_FOR(1000, 10000, (sconnection->GetStateMcState() == xmsm::ESTABLISHED)); - WAIT_FOR(1000, 10000, (cchannel->GetPeerState() == xmps::READY)); + //wait for connection establishment + WAIT_FOR(1000, 10000, (sconnection->GetStateMcState() == xmsm::ESTABLISHED)); + WAIT_FOR(1000, 10000, (cchannel->GetPeerState() == xmps::READY)); - //expect subscribe for __default__ at the mock server - WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 1)); + //expect subscribe for __default__ at the mock server + WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 1)); - //IpamInfo for subnet address belonging to vn - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; + //IpamInfo for subnet address belonging to vn + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; - client->Reset(); + client->Reset(); VxLanNetworkIdentifierMode(false); - client->WaitForIdle(); + client->WaitForIdle(); CreateVmportEnv(input, 2, 0); - client->WaitForIdle(); + client->WaitForIdle(); AddIPAM("vn1", ipam_info, 1); - client->WaitForIdle(); + client->WaitForIdle(); - // expect subscribe message + 2 VM routes+ subnet bcast + - // v4 bcast route at the mock server + 1/2 l2 uc routes + // expect subscribe message + 2 VM routes+ subnet bcast + + // v4 bcast route at the mock server + 1/2 l2 uc routes // For broadcast request from IPv4 and L2 will be treated as // one export and not two. - WAIT_FOR(1000, 10000, (mock_peer.get()->all_seen() == true)); + WAIT_FOR(1000, 10000, (mock_peer.get()->all_seen() == true)); WAIT_FOR(1000, 10000, (Agent::GetInstance()->interface_table()->Size() == 5)); - Ip4Address addr = Ip4Address::from_string("1.1.1.1"); - EXPECT_TRUE(VmPortActive(input, 0)); - EXPECT_TRUE(RouteFind("vrf1", addr, 32)); - InetUnicastRouteEntry *rt = RouteGet("vrf1", addr, 32); - EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); - - // Send route, back to vrf1 - SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.1/32", - MplsTable::kStartLabel); - // Route reflected to vrf1 - WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 1)); - - addr = Ip4Address::from_string("1.1.1.2"); - EXPECT_TRUE(VmPortActive(input, 1)); - EXPECT_TRUE(RouteFind("vrf1", addr, 32)); - rt = RouteGet("vrf1", addr, 32); + Ip4Address addr = Ip4Address::from_string("1.1.1.1"); + EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(RouteFind("vrf1", addr, 32)); + InetUnicastRouteEntry *rt = RouteGet("vrf1", addr, 32); + EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); + + // Send route, back to vrf1 + SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.1/32", + MplsTable::kStartLabel); + // Route reflected to vrf1 + WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 1)); + + addr = Ip4Address::from_string("1.1.1.2"); + EXPECT_TRUE(VmPortActive(input, 1)); + EXPECT_TRUE(RouteFind("vrf1", addr, 32)); + rt = RouteGet("vrf1", addr, 32); WAIT_FOR(1000, 10000, (rt->GetActivePath() != NULL)); WAIT_FOR(1000, 10000, rt->dest_vn_name().size() > 0); - EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); + EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); - // Send route, back to vrf1 - SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.2/32", + // Send route, back to vrf1 + SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.2/32", rt->FindLocalVmPortPath()->label()); - //MplsTable::kStartLabel+1); - // Route reflected to vrf1 - WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 2)); - ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); + //MplsTable::kStartLabel+1); + // Route reflected to vrf1 + WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 2)); + ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); } void XmppL2SetUp() { @@ -798,7 +798,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_VmDeActivate) { IntfCfgDel(input, 0); client->CompositeNHWait(10); WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 2)); - // Route delete send to control-node + // Route delete send to control-node WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 10)); //Send route delete @@ -817,7 +817,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_VmDeActivate) { //Send route delete SendRouteDeleteMessage(mock_peer.get(), "1.1.1.2/32", "vrf1"); - // Route delete for vrf1 + // Route delete for vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); client->MplsDelWait(4); client->CompositeNHDelWait(4); @@ -832,9 +832,9 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_VmDeActivate) { // send route-delete even though route-deleted at agent SendBcastRouteDelete(mock_peer.get(), "vrf1", "255.255.255.255", "127.0.0.1"); - // Subnet Bcast Route delete for vrf1 + // Subnet Bcast Route delete for vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 5)); - + //Verify label deallocated from Mpls Table WAIT_FOR(1000, 10000, (Agent::GetInstance()->mpls_table()->Size() == 0)); @@ -874,7 +874,7 @@ TEST_F(AgentXmppUnitTest, DISABLED_L2OnlyBcast_Test_SessionDownUp) { MacAddress mac_2("00:00:00:02:02:02"); //ensure route learnt via control-node, path is updated - client->WaitForIdle(); + client->WaitForIdle(); //bring-up the channel bgp_peer.get()->HandleXmppChannelEvent(xmps::READY); @@ -888,13 +888,13 @@ TEST_F(AgentXmppUnitTest, DISABLED_L2OnlyBcast_Test_SessionDownUp) { // Send route, back to vrf1 SendL2RouteMessage(mock_peer.get(), "vrf1", mac_1, "1.1.1.1/32", - MplsTable::kStartLabel); + MplsTable::kStartLabel); // Route reflected to vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); // Send route, back to vrf1 SendL2RouteMessage(mock_peer.get(), "vrf1", mac_2, "1.1.1.2/32", - MplsTable::kStartLabel+1); + MplsTable::kStartLabel+1); // Route reflected to vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 5)); @@ -902,7 +902,7 @@ TEST_F(AgentXmppUnitTest, DISABLED_L2OnlyBcast_Test_SessionDownUp) { int alloc_label = GetStartLabel(); SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+1, + "255.255.255.255", alloc_label+1, "127.0.0.1", alloc_label+10); // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 7)); @@ -933,7 +933,7 @@ TEST_F(AgentXmppUnitTest, DISABLED_L2OnlyBcast_Test_SessionDownUp) { IntfCfgDel(input, 1); client->WaitForIdle(5); - //cleanup all config links via config + //cleanup all config links via config SendBcastRouteDelete(mock_peer.get(), "vrf1", "255.255.255.255", "127.0.0.1"); @@ -986,7 +986,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_SessionDownUp) { rt = RouteGet("vrf1", addr, 32); if (Agent::GetInstance()->headless_agent_mode()) { WAIT_FOR(1000, 10000, (rt->FindPath(bgp_peer_id)->is_stale())); - WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 2)); + WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 2)); client->CompositeNHWait(6); } else { WAIT_FOR(1000, 10000, (rt->FindPath(bgp_peer_id) == NULL)); @@ -1010,27 +1010,27 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_SessionDownUp) { WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 16)); // Send route, back to vrf1 - SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.1/32", - MplsTable::kStartLabel); + SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.1/32", + MplsTable::kStartLabel); // Route reflected to vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 3)); // Send route, back to vrf1 - SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.2/32", - MplsTable::kStartLabel+1); + SendRouteMessage(mock_peer.get(), "vrf1", "1.1.1.2/32", + MplsTable::kStartLabel+1); // Route reflected to vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); //Verify mpls table int alloc_label = GetStartLabel(); - MplsLabel *mpls = - Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label); + MplsLabel *mpls = + Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label); ASSERT_TRUE(mpls == NULL); ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); //Send All bcast route SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+1, + "255.255.255.255", alloc_label+1, "127.0.0.1", alloc_label+10); // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 5)); @@ -1038,7 +1038,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_SessionDownUp) { client->CompositeNHWait(9); client->MplsWait(5); - //ensure route learnt via control-node is updated + //ensure route learnt via control-node is updated EXPECT_TRUE((GetL2FloodRoute("vrf1") != NULL)); BridgeRouteEntry *rt_m = GetL2FloodRoute("vrf1"); NextHop *nh = const_cast(rt_m->GetActiveNextHop()); @@ -1077,17 +1077,17 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_SessionDownUp) { TEST_F(AgentXmppUnitTest, Test_mcast_peer_identifier) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); EXPECT_TRUE(Agent::GetInstance()->mulitcast_builder() != NULL); EXPECT_STREQ(Agent::GetInstance()->mulitcast_builder()->GetXmppServer().c_str(), "127.0.0.1"); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; - + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; + AddIPAM("vn1", ipam_info, 1); Ip4Address addr = Ip4Address::from_string("255.255.255.255"); BridgeRouteEntry *rt = GetL2FloodRoute("vrf1"); @@ -1123,7 +1123,7 @@ TEST_F(AgentXmppUnitTest, Test_mcast_peer_identifier) { client->WaitForIdle(); SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", 9000, "127.0.0.1", 9012, 9013); + "255.255.255.255", 9000, "127.0.0.1", 9012, 9013); BridgeRouteEntry *mc_rt = GetL2FloodRoute("vrf1"); EXPECT_TRUE(mc_rt != NULL); obj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); @@ -1164,11 +1164,11 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_MultipleRetracts) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); // remote-VM deactivated resulting in - // route-delete for subnet and all broadcast route + // route-delete for subnet and all broadcast route SendBcastRouteDelete(mock_peer.get(), "vrf1", "255.255.255.255", "127.0.0.1"); @@ -1176,7 +1176,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_MultipleRetracts) { WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 3)); WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()->Size() == 4)); - //ensure route learnt via control-node, path is updated + //ensure route learnt via control-node, path is updated BridgeRouteEntry *rt = GetL2FloodRoute("vrf1"); NextHop *nh = const_cast(rt->GetActiveNextHop()); @@ -1206,7 +1206,7 @@ TEST_F(AgentXmppUnitTest, Test_Update_Olist_Src_Label) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); //Verify sub-nh count @@ -1222,8 +1222,8 @@ TEST_F(AgentXmppUnitTest, Test_Update_Olist_Src_Label) { //TODO pick it up from path //ASSERT_TRUE(obj->GetSourceMPLSLabel() == static_cast(alloc_label)); //Verify mpls table - MplsLabel *mpls = - Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label); + MplsLabel *mpls = + Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label); ASSERT_TRUE(mpls == NULL); ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); @@ -1243,10 +1243,10 @@ TEST_F(AgentXmppUnitTest, Test_Update_Olist_Src_Label) { mpls = Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label+1); ASSERT_TRUE(mpls == NULL); WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()->Size() == 4)); - + //Send All bcast route SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label + 3, + "255.255.255.255", alloc_label + 3, "127.0.0.1", alloc_label+13); // Bcast Route with updated olist WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 3)); @@ -1267,7 +1267,7 @@ TEST_F(AgentXmppUnitTest, Test_Update_Olist_Src_Label) { mpls = Agent::GetInstance()->mpls_table()->FindMplsLabel(alloc_label+3); ASSERT_TRUE(mpls == NULL); - WAIT_FOR(1000, 1000, + WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()->Size() == 5)); SendBcastRouteDelete(mock_peer.get(), "vrf1", @@ -1290,7 +1290,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); //Verify all-broadcast @@ -1299,7 +1299,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { ASSERT_TRUE(nh != NULL); ASSERT_TRUE(nh->GetType() == NextHop::COMPOSITE); CompositeNH *cnh = static_cast(nh); - ASSERT_TRUE(cnh->ComponentNHCount() == 1); + ASSERT_TRUE(cnh->ComponentNHCount() == 1); const CompositeNH *intf_cnh = static_cast(cnh->GetNH(0)); EXPECT_TRUE(intf_cnh->ComponentNHCount() == 2); //TODO pick it up from path @@ -1314,17 +1314,17 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { //Send Updated olist label, src-nh label SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+1, - "127.0.0.1", + "255.255.255.255", alloc_label+1, + "127.0.0.1", alloc_label + 15, alloc_label + 16); - // Bcast Route with updated olist + // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 3)); WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 3)); client->CompositeNHWait(9); client->MplsWait(5); - //verify sub-nh list count ( 2 local-VMs in intf comp + + //verify sub-nh list count ( 2 local-VMs in intf comp + //1 fabric members in olist + 1 evpn comp nh) nh = const_cast(rt_m->GetActiveNextHop()); ASSERT_TRUE(nh != NULL); @@ -1351,7 +1351,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { //Send Updated olist label, src-nh label SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+1, + "255.255.255.255", alloc_label+1, "127.0.0.1", alloc_label + 17); // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); @@ -1364,7 +1364,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { client->CompositeNHWait(11); client->MplsWait(5); - //verify sub-nh list count ( 2 local-VMs in intf comp + + //verify sub-nh list count ( 2 local-VMs in intf comp + //1 fabric members in olist + 1 evpn comp nh) ASSERT_TRUE(cnh->ComponentNHCount() == 2); intf_cnh = static_cast(cnh->GetNH(1)); @@ -1382,7 +1382,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change) { ASSERT_TRUE(mpls == NULL); // Detect mpls label leaks WAIT_FOR(1000, 10000, (Agent::GetInstance()->mpls_table()->Size() == 5)); - + SendBcastRouteDelete(mock_peer.get(), "vrf1", "255.255.255.255", @@ -1404,7 +1404,7 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change_with_same_label) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); int alloc_label = GetStartLabel(); @@ -1429,11 +1429,11 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change_with_same_label) { //Send Updated olist label, src-nh label SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+50, - "127.0.0.1", + "255.255.255.255", alloc_label+50, + "127.0.0.1", alloc_label + 15, alloc_label + 15); - // Bcast Route with updated olist + // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 3)); WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 3)); client->CompositeNHWait(9); @@ -1463,13 +1463,13 @@ TEST_F(AgentXmppUnitTest, Test_Olist_change_with_same_label) { //Send Updated olist label, src-nh label SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label+51, + "255.255.255.255", alloc_label+51, "127.0.0.1", alloc_label + 17); nh = const_cast(rt_m->GetActiveNextHop()); ASSERT_TRUE(nh != NULL); ASSERT_TRUE(nh->GetType() == NextHop::COMPOSITE); cnh = static_cast(nh); - // Bcast Route with updated olist + // Bcast Route with updated olist WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 3)); client->CompositeNHWait(11); @@ -1527,7 +1527,7 @@ TEST_F(AgentXmppUnitTest, multicast_fabric_path_delete_on_vrf_delete) { //Send fabric tree, and dont delete SendBcastRouteMessage(mock_peer.get(), "vrf1", - "255.255.255.255", alloc_label, + "255.255.255.255", alloc_label, "127.0.0.1", alloc_label + 1, alloc_label + 2); @@ -1560,7 +1560,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Retract_from_non_mcast_tree_builder) { client->Reset(); XmppConnectionSetUp(true); client->WaitForIdle(); - + XmppServer *xs_s; XmppClient *xc_s; XmppConnection *sconnection_s; @@ -1572,45 +1572,45 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Retract_from_non_mcast_tree_builder) { xs_s->Initialize(0, false); xc_s = new XmppClient(&evm_); - //Create control-node bgp mock peer + //Create control-node bgp mock peer mock_peer_s.reset(new ControlNodeMockBgpXmppPeer()); - xs_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + xs_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer_s.get(), _1, _2)); //Create an xmpp client XmppConfigData *xmppc_s_cfg = new XmppConfigData; - LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); - xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.2", + LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); + xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.2", xs_s->GetPort(), "127.0.0.2", "agent-a", XmppInit::kControlNodeJID, true)); - xc_s->ConfigUpdate(xmppc_s_cfg); + xc_s->ConfigUpdate(xmppc_s_cfg); cchannel_s = xc_s->FindChannel(XmppInit::kControlNodeJID); //Create agent bgp peer - bgp_peer_s.reset(new AgentBgpXmppPeerTest( - Agent::GetInstance()->controller_ifmap_xmpp_server(1), + bgp_peer_s.reset(new AgentBgpXmppPeerTest( + Agent::GetInstance()->controller_ifmap_xmpp_server(1), Agent::GetInstance()->controller()->fabric_multicast_label_range(1).fabric_multicast_label_range_str, 1)); bgp_peer_s.get()->RegisterXmppChannel(cchannel_s); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); - xc_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); + xc_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer_s.get(), _2)); - // server connection + // server connection WAIT_FOR(1000, 10000, ((sconnection_s = xs_s->FindConnection("agent-a")) != NULL)); assert(sconnection_s); // remote-VM deactivated resulting in - // route-delete for subnet and all broadcast route + // route-delete for subnet and all broadcast route SendBcastRouteDelete(mock_peer_s.get(), "vrf1", "255.255.255.255", "127.0.0.1"); client->WaitForIdle(); - //Verify mpls table, shud not be deleted when retract message comes from + //Verify mpls table, shud not be deleted when retract message comes from //non multicast tree builder peer - ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); + ASSERT_TRUE(Agent::GetInstance()->mpls_table()->Size() == 4); client->WaitForIdle(); XmppSubnetTearDown(); @@ -1640,17 +1640,17 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_sessiondown_after_vn_vrf_link_del) { client->Reset(); client->WaitForIdle(); - + XmppConnectionSetUp(true); EXPECT_TRUE(Agent::GetInstance()->mulitcast_builder() != NULL); EXPECT_STREQ(Agent::GetInstance()->mulitcast_builder()->GetXmppServer().c_str(), "127.0.0.1"); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; - + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; + AddIPAM("vn1", ipam_info, 1); client->WaitForIdle(); diff --git a/src/vnsw/agent/test/test_xmpp_hv.cc b/src/vnsw/agent/test/test_xmpp_hv.cc index d19e060585a..34edb4676bb 100644 --- a/src/vnsw/agent/test/test_xmpp_hv.cc +++ b/src/vnsw/agent/test/test_xmpp_hv.cc @@ -61,9 +61,9 @@ TEST_F(AgentBasicScaleTest, Basic) { XmppConnectionSetUp(); BuildVmPortEnvironment(); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; AddIPAM("vn1", ipam_info, 1); WAIT_FOR(1000, 10000, RouteFind("vrf1", Ip4Address::from_string("1.1.1.255"), 32)); @@ -92,9 +92,9 @@ TEST_F(AgentBasicScaleTest, multicast_one_channel_down_up) { XmppConnectionSetUp(); BuildVmPortEnvironment(); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; AddIPAM("vn1", ipam_info, 1); WAIT_FOR(1000, 10000, RouteFind("vrf1", Ip4Address::from_string("1.1.1.255"), 32)); @@ -181,9 +181,9 @@ TEST_F(AgentBasicScaleTest, multicast_one_channel_down_up_skip_route_from_peer) XmppConnectionSetUp(); BuildVmPortEnvironment(); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; AddIPAM("vn1", ipam_info, 1); WAIT_FOR(1000, 10000, RouteFind("vrf1", Ip4Address::from_string("1.1.1.255"), 32)); @@ -451,9 +451,9 @@ TEST_F(AgentBasicScaleTest, unicast_one_channel_down_up_skip_route_from_peer) { XmppConnectionSetUp(); BuildVmPortEnvironment(); - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; AddIPAM("vn1", ipam_info, 1); WAIT_FOR(1000, 10000, RouteFind("vrf1", Ip4Address::from_string("1.1.1.255"), 32)); diff --git a/src/vnsw/agent/test/test_xmpp_ifmap.cc b/src/vnsw/agent/test/test_xmpp_ifmap.cc index 50c5ee00722..ec543dc64e8 100644 --- a/src/vnsw/agent/test/test_xmpp_ifmap.cc +++ b/src/vnsw/agent/test/test_xmpp_ifmap.cc @@ -67,10 +67,10 @@ class ControlNodeMockIFMapXmppPeer { void ReceiveUpdate(const XmppStanza::XmppMessage *msg) { rx_count_++; - } + } bool SendUpdate(uint8_t *msg, size_t size) { - if (channel_ && + if (channel_ && (channel_->GetPeerState() == xmps::READY)) { return channel_->Send(msg, size, xmps::CONFIG, boost::bind(&ControlNodeMockIFMapXmppPeer::WriteReadyCb, this, _1)); @@ -265,7 +265,7 @@ class AgentIFMapXmppUnitTest : public ::testing::Test { ((sconnection = xs->FindConnection( boost::asio::ip::host_name())) != NULL)); - //Create control-node bgp mock peer + //Create control-node bgp mock peer mock_ifmap_peer.reset(new ControlNodeMockIFMapXmppPeer(sconnection->ChannelMux())); } @@ -463,7 +463,7 @@ TEST_F(AgentIFMapXmppUnitTest, vn_vm_vrf_test) { VnEntry *oper_vn = VnGet(1); VrfEntry *oper_vrf = VrfGet("vrf2"); EXPECT_EQ(oper_vn->GetVrf(), oper_vrf); - + // Delete the VN to RI linka xml_document doc; xitems = MessageHeader(&doc, false); diff --git a/src/vnsw/agent/test/test_xmpp_non_hv.cc b/src/vnsw/agent/test/test_xmpp_non_hv.cc index 0fdeb500e71..d167f79ee48 100644 --- a/src/vnsw/agent/test/test_xmpp_non_hv.cc +++ b/src/vnsw/agent/test/test_xmpp_non_hv.cc @@ -10,7 +10,7 @@ int main(int argc, char **argv) { LoggingInit(); Sandesh::SetLocalLogging(true); - Sandesh::SetLoggingLevel(SandeshLevel::UT_DEBUG); + Sandesh::SetLoggingLevel(SandeshLevel::UT_DEBUG); Agent::GetInstance()->set_headless_agent_mode(false); int ret = RUN_ALL_TESTS(); diff --git a/src/vnsw/agent/test/test_xmpp_v6.cc b/src/vnsw/agent/test/test_xmpp_v6.cc index 74070946594..3f70b0120cf 100644 --- a/src/vnsw/agent/test/test_xmpp_v6.cc +++ b/src/vnsw/agent/test/test_xmpp_v6.cc @@ -136,7 +136,7 @@ class ControlNodeMockBgpXmppPeer { } bool SendUpdate(uint8_t *msg, size_t size) { - if (channel_ && + if (channel_ && (channel_->GetPeerState() == xmps::READY)) { return channel_->Send(msg, size, xmps::BGP, boost::bind(&ControlNodeMockBgpXmppPeer::WriteReadyCb, this, _1)); @@ -156,22 +156,22 @@ class ControlNodeMockBgpXmppPeer { }; -class AgentXmppUnitTest : public ::testing::Test { +class AgentXmppUnitTest : public ::testing::Test { protected: AgentXmppUnitTest() : thread_(&evm_), agent_(Agent::GetInstance()) {} - + virtual void SetUp() { xs = new XmppServer(&evm_, XmppInit::kControlNodeJID); xc = new XmppClient(&evm_); xs->Initialize(0, false); - + thread_.Start(); } virtual void TearDown() { xs->Shutdown(); - bgp_peer.reset(); + bgp_peer.reset(); client->WaitForIdle(); xc->Shutdown(); client->WaitForIdle(); @@ -214,7 +214,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node MessageHeader(xml_document *xdoc, std::string vrf, std::string family="v4") { xml_node msg = xdoc->append_child("message"); msg.append_attribute("type") = "set"; - msg.append_attribute("from") = XmppInit::kAgentNodeJID; + msg.append_attribute("from") = XmppInit::kAgentNodeJID; string str(XmppInit::kControlNodeJID); str += "/"; str += XmppInit::kBgpPeer; @@ -236,7 +236,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node L2MessageHeader(xml_document *xdoc, std::string vrf) { xml_node msg = xdoc->append_child("message"); msg.append_attribute("type") = "set"; - msg.append_attribute("from") = XmppInit::kAgentNodeJID; + msg.append_attribute("from") = XmppInit::kAgentNodeJID; string str(XmppInit::kControlNodeJID); str += "/"; str += XmppInit::kBgpPeer; @@ -253,7 +253,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendRouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string address, int label, + std::string address, int label, const char *vn = "vn1") { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf); @@ -262,7 +262,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.next_hops.next_hop.push_back(item_nexthop); item.entry.nlri.af = BgpAf::IPv4; @@ -279,7 +279,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendRouteV6Message(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string address, int label, + std::string address, int label, const char *vn = "vn1") { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf, "v6"); @@ -288,7 +288,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.next_hops.next_hop.push_back(item_nexthop); item.entry.nlri.af = BgpAf::IPv6; @@ -305,7 +305,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendRouteMessageSg(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string address, int label, + std::string address, int label, const char *vn = "vn1") { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf); @@ -314,7 +314,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.nlri.af = BgpAf::IPv4; item.entry.nlri.safi = BgpAf::Unicast; @@ -333,7 +333,7 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendL2RouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string mac_string, std::string address, int label, + std::string mac_string, std::string address, int label, const char *vn = "vn1", bool is_vxlan = false) { xml_document xdoc; xml_node xitems = L2MessageHeader(&xdoc, vrf); @@ -348,7 +348,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.tunnel_encapsulation_list.tunnel_encapsulation.push_back("gre"); item_nexthop.tunnel_encapsulation_list.tunnel_encapsulation.push_back("udp"); } - + autogen::EnetItemType item; item.entry.nlri.af = 25; item.entry.nlri.safi = 242; @@ -359,14 +359,14 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); SendDocument(xdoc, peer); } - + void SendRouteDeleteMessage(ControlNodeMockBgpXmppPeer *peer, std::string address, std::string vrf, std::string family="v4") { @@ -385,7 +385,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node xitems = L2MessageHeader(&xdoc, vrf); xml_node node = xitems.append_child("retract"); stringstream ss; - ss << mac_string.c_str() << "," << address.c_str(); + ss << mac_string.c_str() << "," << address.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); @@ -398,29 +398,29 @@ class AgentXmppUnitTest : public ::testing::Test { Agent::GetInstance()->controller()->increment_multicast_sequence_number(); Agent::GetInstance()->set_cn_mcast_builder(NULL); - //Create control-node bgp mock peer + //Create control-node bgp mock peer mock_peer.reset(new ControlNodeMockBgpXmppPeer()); - xs->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + xs->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer.get(), _1, _2)); LOG(DEBUG, "Create xmpp agent client"); - xmppc_cfg = new XmppConfigData; - xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", - xs->GetPort(), - XmppInit::kAgentNodeJID, - XmppInit::kControlNodeJID, true)); - xc->ConfigUpdate(xmppc_cfg); - - // client connection - cchannel = xc->FindChannel(XmppInit::kControlNodeJID); - //Create agent bgp peer + xmppc_cfg = new XmppConfigData; + xmppc_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", + xs->GetPort(), + XmppInit::kAgentNodeJID, + XmppInit::kControlNodeJID, true)); + xc->ConfigUpdate(xmppc_cfg); + + // client connection + cchannel = xc->FindChannel(XmppInit::kControlNodeJID); + //Create agent bgp peer bgp_peer.reset(new AgentBgpXmppPeerTest(cchannel, Agent::GetInstance()->controller_ifmap_xmpp_server(0), 0)); - xc->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, - bgp_peer.get(), _2)); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); + xc->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, + bgp_peer.get(), _2)); + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); // server connection WAIT_FOR(1000, 10000, diff --git a/src/vnsw/agent/test/test_xmppcs.cc b/src/vnsw/agent/test/test_xmppcs.cc index fecc2f43288..cd0b1bd3be1 100644 --- a/src/vnsw/agent/test/test_xmppcs.cc +++ b/src/vnsw/agent/test/test_xmppcs.cc @@ -36,9 +36,9 @@ #include "xml/xml_pugi.h" -#include "controller/controller_peer.h" -#include "controller/controller_export.h" -#include "controller/controller_vrf_export.h" +#include "controller/controller_peer.h" +#include "controller/controller_export.h" +#include "controller/controller_vrf_export.h" #include "controller/controller_types.h" using namespace pugi; @@ -125,10 +125,10 @@ class ControlNodeMockBgpXmppPeer { }; -class AgentXmppUnitTest : public ::testing::Test { +class AgentXmppUnitTest : public ::testing::Test { protected: AgentXmppUnitTest() : thread_(&evm_) {} - + virtual void SetUp() { Agent::GetInstance()->controller()->Cleanup(); client->WaitForIdle(); @@ -146,7 +146,7 @@ class AgentXmppUnitTest : public ::testing::Test { xs_p->Initialize(0, false); xs_s->Initialize(0, false); - + thread_.Start(); XmppConnectionSetUp(); } @@ -159,8 +159,8 @@ class AgentXmppUnitTest : public ::testing::Test { xc_p->ConfigUpdate(new XmppConfigData()); xc_s->ConfigUpdate(new XmppConfigData()); client->WaitForIdle(); - bgp_peer.reset(); - bgp_peer_s.reset(); + bgp_peer.reset(); + bgp_peer_s.reset(); client->WaitForIdle(); Agent::GetInstance()->reset_controller_xmpp_channel(0); Agent::GetInstance()->set_controller_ifmap_xmpp_client(NULL, 0); @@ -280,59 +280,59 @@ class AgentXmppUnitTest : public ::testing::Test { Agent::GetInstance()->controller()->increment_multicast_sequence_number(); Agent::GetInstance()->set_cn_mcast_builder(NULL); - //Create an xmpp client - XmppConfigData *xmppc_p_cfg = new XmppConfigData; - LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_p->GetPort()); - xmppc_p_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", - xs_p->GetPort(), - XmppInit::kAgentNodeJID, - XmppInit::kControlNodeJID, true)); - xc_p->ConfigUpdate(xmppc_p_cfg); - cchannel_p = xc_p->FindChannel(XmppInit::kControlNodeJID); + //Create an xmpp client + XmppConfigData *xmppc_p_cfg = new XmppConfigData; + LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_p->GetPort()); + xmppc_p_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.1", + xs_p->GetPort(), + XmppInit::kAgentNodeJID, + XmppInit::kControlNodeJID, true)); + xc_p->ConfigUpdate(xmppc_p_cfg); + cchannel_p = xc_p->FindChannel(XmppInit::kControlNodeJID); //Create agent bgp peer - bgp_peer.reset(new AgentBgpXmppPeerTest( + bgp_peer.reset(new AgentBgpXmppPeerTest( Agent::GetInstance()->controller_ifmap_xmpp_server(0), 0)); bgp_peer.get()->RegisterXmppChannel(cchannel_p); - xc_p->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer.get(), _2)); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); + xc_p->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer.get(), _2)); + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); - - //Create control-node bgp mock peer - mock_peer.reset(new ControlNodeMockBgpXmppPeer()); - xs_p->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + + //Create control-node bgp mock peer + mock_peer.reset(new ControlNodeMockBgpXmppPeer()); + xs_p->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer.get(), _1, _2)); - // server connection + // server connection WAIT_FOR(1000, 10000, ((sconnection = xs_p->FindConnection(XmppInit::kAgentNodeJID)) != NULL)); assert(sconnection); - //Create control-node bgp mock peer - mock_peer_s.reset(new ControlNodeMockBgpXmppPeer()); - xs_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + //Create control-node bgp mock peer + mock_peer_s.reset(new ControlNodeMockBgpXmppPeer()); + xs_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer_s.get(), _1, _2)); //Create an xmpp client - XmppConfigData *xmppc_s_cfg = new XmppConfigData; - LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); - xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.2", - xs_s->GetPort(), - XmppInit::kAgentNodeJID, - XmppInit::kControlNodeJID, true)); - xc_s->ConfigUpdate(xmppc_s_cfg); + XmppConfigData *xmppc_s_cfg = new XmppConfigData; + LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); + xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg("127.0.0.2", + xs_s->GetPort(), + XmppInit::kAgentNodeJID, + XmppInit::kControlNodeJID, true)); + xc_s->ConfigUpdate(xmppc_s_cfg); cchannel_s = xc_s->FindChannel(XmppInit::kControlNodeJID); //Create agent bgp peer - bgp_peer_s.reset(new AgentBgpXmppPeerTest( + bgp_peer_s.reset(new AgentBgpXmppPeerTest( Agent::GetInstance()->controller_ifmap_xmpp_server(1), 1)); bgp_peer_s.get()->RegisterXmppChannel(cchannel_s); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); - xc_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer_s.get(), _2)); + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); + xc_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer_s.get(), _2)); - // server connection + // server connection WAIT_FOR(1000, 10000, ((sconnection_s = xs_s->FindConnection(XmppInit::kAgentNodeJID)) != NULL)); assert(sconnection_s); @@ -385,7 +385,7 @@ TEST_F(AgentXmppUnitTest, Connection) { xmpp_req->Release(); VxLanNetworkIdentifierMode(false); - client->WaitForIdle(); + client->WaitForIdle(); // Create vm-port and vn struct PortInfo input[] = { {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, @@ -400,14 +400,14 @@ TEST_F(AgentXmppUnitTest, Connection) { VrfAddReq("vrf2"); VnAddReq(2, "vn2", 0, "vrf2"); - n++; - n_s++; + n++; + n_s++; //expect subscribe vrf2 message at the mock server WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == n)); //expect subscribe vrf2 message at the secondary mock server WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == n_s)); - //Create vm-port and route entry in vrf1 + //Create vm-port and route entry in vrf1 CreateVmportEnv(input, 1); client->WaitForIdle(); @@ -417,7 +417,7 @@ TEST_F(AgentXmppUnitTest, Connection) { InetUnicastRouteEntry *rt = RouteGet("vrf1", addr, 32); EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); //ensure active path is local-vm - EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() + EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() == Peer::LOCAL_VM_PORT_PEER); n++; n++; n++; n++; n++; @@ -434,7 +434,7 @@ TEST_F(AgentXmppUnitTest, Connection) { // Route reflected to vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 1)); //ensure active path is local-vm - EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() + EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() == Peer::BGP_PEER); // Send route, leak to vrf2 @@ -468,17 +468,17 @@ TEST_F(AgentXmppUnitTest, Connection) { // Route leaked to vrf2, check entry in route-table, check paths WAIT_FOR(1000, 10000, (rt2->FindPath(bgp_peer_s->bgp_peer_id()) != NULL)); client->WaitForIdle(); - + //ensure active path is local-vm - EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() + EXPECT_TRUE(rt->GetActivePath()->peer()->GetType() == Peer::BGP_PEER); //Delete vm-port and route entry in vrf1 IntfCfgDel(input, 0); VmDelReq(1); client->WaitForIdle(); - // Route delete - n++; n_s++; + // Route delete + n++; n_s++; n++; n_s++; n++; n_s++; n++; @@ -487,12 +487,12 @@ TEST_F(AgentXmppUnitTest, Connection) { //Send route-reflect delete SendRouteDeleteMessage(mock_peer.get(), "vrf1"); - // Route delete for vrf1 + // Route delete for vrf1 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 3)); //Send route-leak delete SendRouteDeleteMessage(mock_peer.get(), "vrf2"); - // Route delete for vrf2 + // Route delete for vrf2 WAIT_FOR(1000, 10000, (bgp_peer.get()->Count() == 4)); InetUnicastRouteEntry *rt4 = RouteGet("vrf1", addr, 32); @@ -502,12 +502,12 @@ TEST_F(AgentXmppUnitTest, Connection) { //Send route-reflect delete from seconday control-node SendRouteDeleteMessage(mock_peer_s.get(), "vrf1"); - // Route delete for vrf1 + // Route delete for vrf1 WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 3)); //Send route-leak delete SendRouteDeleteMessage(mock_peer_s.get(), "vrf2"); - // Route delete for vrf2 + // Route delete for vrf2 WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 4)); client->WaitForIdle(); @@ -586,7 +586,7 @@ TEST_F(AgentXmppUnitTest, CfgServerSelection) { client->WaitForIdle(); xmpp_req->Release(); - + xc_p->ConfigUpdate(new XmppConfigData()); client->WaitForIdle(); xc_s->ConfigUpdate(new XmppConfigData()); diff --git a/src/vnsw/agent/test/test_xmppcs_bcast.cc b/src/vnsw/agent/test/test_xmppcs_bcast.cc index 8675191664b..5d922c8e668 100644 --- a/src/vnsw/agent/test/test_xmppcs_bcast.cc +++ b/src/vnsw/agent/test/test_xmppcs_bcast.cc @@ -39,9 +39,9 @@ #include "xmpp_multicast_types.h" #include "xml/xml_pugi.h" -#include "controller/controller_peer.h" -#include "controller/controller_export.h" -#include "controller/controller_vrf_export.h" +#include "controller/controller_peer.h" +#include "controller/controller_export.h" +#include "controller/controller_vrf_export.h" using namespace pugi; @@ -69,13 +69,13 @@ class AgentBgpXmppPeerTest : public AgentXmppChannel { AgentXmppChannel::ReceiveUpdate(msg); } - bool ProcessChannelEvent(xmps::PeerState state) { + bool ProcessChannelEvent(xmps::PeerState state) { AgentXmppChannel::HandleAgentXmppClientChannelEvent(static_cast(this), state); return true; } void HandleXmppChannelEvent(xmps::PeerState state) { - rx_channel_event_queue_.Enqueue(state); + rx_channel_event_queue_.Enqueue(state); } size_t Count() const { return rx_count_; } @@ -143,10 +143,10 @@ class ControlNodeMockBgpXmppPeer { }; -class AgentXmppUnitTest : public ::testing::Test { +class AgentXmppUnitTest : public ::testing::Test { protected: AgentXmppUnitTest() : thread_(&evm_) {} - + virtual void SetUp() { Agent::GetInstance()->controller()->Cleanup(); client->WaitForIdle(); @@ -164,17 +164,17 @@ class AgentXmppUnitTest : public ::testing::Test { xs_p->Initialize(0, false); xs_s->Initialize(0, false); - + thread_.Start(); XmppConnectionSetUp(); } virtual void TearDown() { xs_p->Shutdown(); - bgp_peer.reset(); + bgp_peer.reset(); client->WaitForIdle(); xs_s->Shutdown(); - bgp_peer_s.reset(); + bgp_peer_s.reset(); client->WaitForIdle(); Agent::GetInstance()->reset_controller_xmpp_channel(0); @@ -188,7 +188,7 @@ class AgentXmppUnitTest : public ::testing::Test { xc_s->Shutdown(); client->WaitForIdle(); - ShutdownAgentController(Agent::GetInstance()); + ShutdownAgentController(Agent::GetInstance()); mock_peer.reset(); mock_peer_s.reset(); @@ -265,7 +265,7 @@ class AgentXmppUnitTest : public ::testing::Test { item_nexthop.af = BgpAf::IPv4; item_nexthop.address = Agent::GetInstance()->router_id().to_string();; item_nexthop.label = label; - + autogen::ItemType item; item.entry.next_hops.next_hop.push_back(item_nexthop); item.entry.nlri.af = BgpAf::IPv4; @@ -280,7 +280,7 @@ class AgentXmppUnitTest : public ::testing::Test { SendDocument(xdoc, peer); } - void SendRouteDeleteMessage(ControlNodeMockBgpXmppPeer *peer, + void SendRouteDeleteMessage(ControlNodeMockBgpXmppPeer *peer, std::string address, std::string vrf) { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf, false); @@ -291,8 +291,8 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendBcastRouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string subnet_addr, int src_label, - std::string agent_addr, + std::string subnet_addr, int src_label, + std::string agent_addr, int dest_label) { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf, true); @@ -309,7 +309,7 @@ class AgentXmppUnitTest : public ::testing::Test { nh.address = "127.0.0.2"; // agent-b, does not exist stringstream label; label << dest_label; - nh.label = label.str(); + nh.label = label.str(); //Add to olist item.entry.olist.next_hop.push_back(nh); @@ -317,7 +317,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); + ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); @@ -326,8 +326,8 @@ class AgentXmppUnitTest : public ::testing::Test { } void SendBcastRouteMessage(ControlNodeMockBgpXmppPeer *peer, std::string vrf, - std::string subnet_addr, int src_label, - std::string agent_addr, + std::string subnet_addr, int src_label, + std::string agent_addr, int dest_label1, int dest_label2) { xml_document xdoc; xml_node xitems = MessageHeader(&xdoc, vrf, true); @@ -344,7 +344,7 @@ class AgentXmppUnitTest : public ::testing::Test { nh.address = "127.0.0.2"; // agent-b, does not exist stringstream label1; label1 << dest_label1; - nh.label = label1.str(); + nh.label = label1.str(); //Add to olist item.entry.olist.next_hop.push_back(nh); @@ -354,7 +354,7 @@ class AgentXmppUnitTest : public ::testing::Test { nh2.address = "127.0.0.3"; // agent-c, does not exist stringstream label2; label2 << dest_label2; - nh2.label = label2.str(); + nh2.label = label2.str(); //Add to olist item.entry.olist.next_hop.push_back(nh2); @@ -362,7 +362,7 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("item"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); + ss << agent_addr.c_str() << ":" << "65535:" << subnet_addr.c_str(); string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); item.Encode(&node); @@ -376,8 +376,8 @@ class AgentXmppUnitTest : public ::testing::Test { xml_node node = xitems.append_child("retract"); //Route-Distinguisher stringstream ss; - ss << agent_addr.c_str() << ":" << "65535:" << addr.c_str() - << "," << "0.0.0.0"; + ss << agent_addr.c_str() << ":" << "65535:" << addr.c_str() + << "," << "0.0.0.0"; string node_str(ss.str()); node.append_attribute("id") = node_str.c_str(); @@ -390,58 +390,58 @@ class AgentXmppUnitTest : public ::testing::Test { Agent::GetInstance()->controller()->increment_multicast_sequence_number(); Agent::GetInstance()->set_cn_mcast_builder(NULL); - //Create control-node bgp mock peer - mock_peer.reset(new ControlNodeMockBgpXmppPeer()); - xs_p->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + //Create control-node bgp mock peer + mock_peer.reset(new ControlNodeMockBgpXmppPeer()); + xs_p->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer.get(), _1, _2)); - //Create an xmpp client - XmppConfigData *xmppc_p_cfg = new XmppConfigData; - LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_p->GetPort()); - xmppc_p_cfg->AddXmppChannelConfig(CreateXmppChannelCfg( - "127.0.0.2", xs_p->GetPort(), - "127.0.0.1", "agent-a" , - XmppInit::kControlNodeJID, true)); - xc_p->ConfigUpdate(xmppc_p_cfg); - cchannel_p = xc_p->FindChannel(XmppInit::kControlNodeJID); + //Create an xmpp client + XmppConfigData *xmppc_p_cfg = new XmppConfigData; + LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_p->GetPort()); + xmppc_p_cfg->AddXmppChannelConfig(CreateXmppChannelCfg( + "127.0.0.2", xs_p->GetPort(), + "127.0.0.1", "agent-a" , + XmppInit::kControlNodeJID, true)); + xc_p->ConfigUpdate(xmppc_p_cfg); + cchannel_p = xc_p->FindChannel(XmppInit::kControlNodeJID); //Create agent bgp peer - bgp_peer.reset(new AgentBgpXmppPeerTest( - Agent::GetInstance()->controller_ifmap_xmpp_server(0), + bgp_peer.reset(new AgentBgpXmppPeerTest( + Agent::GetInstance()->controller_ifmap_xmpp_server(0), Agent::GetInstance()->controller()->fabric_multicast_label_range(0).fabric_multicast_label_range_str, 0)); bgp_peer.get()->RegisterXmppChannel(cchannel_p); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); - xc_p->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer.get(), _2)); - - // server connection + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer.get(), 0); + xc_p->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer.get(), _2)); + + // server connection WAIT_FOR(1000, 10000, ((sconnection = xs_p->FindConnection("agent-a")) != NULL)); assert(sconnection); - //Create control-node bgp mock peer - mock_peer_s.reset(new ControlNodeMockBgpXmppPeer()); - xs_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, + //Create control-node bgp mock peer + mock_peer_s.reset(new ControlNodeMockBgpXmppPeer()); + xs_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&ControlNodeMockBgpXmppPeer::HandleXmppChannelEvent, mock_peer_s.get(), _1, _2)); //Create an xmpp client - XmppConfigData *xmppc_s_cfg = new XmppConfigData; - LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); - xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg( - "127.0.0.1", xs_s->GetPort(), - "127.0.0.1", "agent-bb", - XmppInit::kControlNodeJID, true)); - xc_s->ConfigUpdate(xmppc_s_cfg); + XmppConfigData *xmppc_s_cfg = new XmppConfigData; + LOG(DEBUG, "Create an xmpp client connect to Server port " << xs_s->GetPort()); + xmppc_s_cfg->AddXmppChannelConfig(CreateXmppChannelCfg( + "127.0.0.1", xs_s->GetPort(), + "127.0.0.1", "agent-bb", + XmppInit::kControlNodeJID, true)); + xc_s->ConfigUpdate(xmppc_s_cfg); cchannel_s = xc_s->FindChannel(XmppInit::kControlNodeJID); //Create agent bgp peer - bgp_peer_s.reset(new AgentBgpXmppPeerTest( - Agent::GetInstance()->controller_ifmap_xmpp_server(1), + bgp_peer_s.reset(new AgentBgpXmppPeerTest( + Agent::GetInstance()->controller_ifmap_xmpp_server(1), Agent::GetInstance()->controller()->fabric_multicast_label_range(1).fabric_multicast_label_range_str, 1)); bgp_peer_s.get()->RegisterXmppChannel(cchannel_s); - Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); - xc_s->RegisterConnectionEvent(xmps::BGP, - boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer_s.get(), _2)); + Agent::GetInstance()->set_controller_xmpp_channel(bgp_peer_s.get(), 1); + xc_s->RegisterConnectionEvent(xmps::BGP, + boost::bind(&AgentBgpXmppPeerTest::HandleXmppChannelEvent, bgp_peer_s.get(), _2)); - // server connection + // server connection WAIT_FOR(1000, 10000, ((sconnection_s = xs_s->FindConnection("agent-bb")) != NULL)); assert(sconnection_s); @@ -451,99 +451,99 @@ class AgentXmppUnitTest : public ::testing::Test { void XmppSubnetSetUp() { - //wait for connection establishment + //wait for connection establishment WAIT_FOR(1000, 10000, (sconnection->GetStateMcState() == xmsm::ESTABLISHED)); WAIT_FOR(1000, 10000, (cchannel_p->GetPeerState() == xmps::READY)); WAIT_FOR(1000, 10000, (sconnection_s->GetStateMcState() == xmsm::ESTABLISHED)); WAIT_FOR(1000, 10000, (cchannel_s->GetPeerState() == xmps::READY)); - //expect subscribe for __default__ at the mock server - WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 1)); - WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == 1)); + //expect subscribe for __default__ at the mock server + WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 1)); + WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == 1)); - //IpamInfo for subnet address belonging to vn - IpamInfo ipam_info[] = { - {"1.1.1.0", 24, "1.1.1.200", true} - }; - - client->Reset(); + //IpamInfo for subnet address belonging to vn + IpamInfo ipam_info[] = { + {"1.1.1.0", 24, "1.1.1.200", true} + }; + + client->Reset(); VxLanNetworkIdentifierMode(false); - client->WaitForIdle(); + client->WaitForIdle(); CreateVmportEnv(input, 2, 0); - client->WaitForIdle(); + client->WaitForIdle(); - client->Reset(); + client->Reset(); AddIPAM("vn1", ipam_info, 1); - client->WaitForIdle(5); - - // expect subscribe message + 2 VM l2 routes + - // bcast route at the mock server + evpn - WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == 8)); - // expect subscribe message + 2 VM v4 routes at the mock server + - // 2 VM l2 routes + bcast + evpn - WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 7)); - - Ip4Address addr = Ip4Address::from_string("1.1.1.1"); - EXPECT_TRUE(VmPortActive(input, 0)); - EXPECT_TRUE(RouteFind("vrf1", addr, 32)); - InetUnicastRouteEntry *rt = RouteGet("vrf1", addr, 32); - EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); - - // Send route, back to vrf1 - SendRouteMessage(mock_peer_s.get(), "vrf1", "1.1.1.1/32", - MplsTable::kStartLabel); - // Route reflected to vrf1 - WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 1)); + client->WaitForIdle(5); + + // expect subscribe message + 2 VM l2 routes + + // bcast route at the mock server + evpn + WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == 8)); + // expect subscribe message + 2 VM v4 routes at the mock server + + // 2 VM l2 routes + bcast + evpn + WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 7)); + + Ip4Address addr = Ip4Address::from_string("1.1.1.1"); + EXPECT_TRUE(VmPortActive(input, 0)); + EXPECT_TRUE(RouteFind("vrf1", addr, 32)); + InetUnicastRouteEntry *rt = RouteGet("vrf1", addr, 32); + EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); + + // Send route, back to vrf1 + SendRouteMessage(mock_peer_s.get(), "vrf1", "1.1.1.1/32", + MplsTable::kStartLabel); + // Route reflected to vrf1 + WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 1)); // Unicast route will be reflected by mock_peer - addr = Ip4Address::from_string("1.1.1.2"); - EXPECT_TRUE(VmPortActive(input, 1)); - EXPECT_TRUE(RouteFind("vrf1", addr, 32)); - rt = RouteGet("vrf1", addr, 32); + addr = Ip4Address::from_string("1.1.1.2"); + EXPECT_TRUE(VmPortActive(input, 1)); + EXPECT_TRUE(RouteFind("vrf1", addr, 32)); + rt = RouteGet("vrf1", addr, 32); WAIT_FOR(1000, 10000, (rt->GetActivePath() != NULL)); WAIT_FOR(1000, 10000, rt->dest_vn_name().size() > 0); - EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); + EXPECT_STREQ(rt->dest_vn_name().c_str(), "vn1"); - // Send route, back to vrf1 - SendRouteMessage(mock_peer_s.get(), "vrf1", "1.1.1.2/32", - MplsTable::kStartLabel+1); - // Route reflected to vrf1 - WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 2)); + // Send route, back to vrf1 + SendRouteMessage(mock_peer_s.get(), "vrf1", "1.1.1.2/32", + MplsTable::kStartLabel+1); + // Route reflected to vrf1 + WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 2)); - // Unicast route will be reflected by mock_peer + // Unicast route will be reflected by mock_peer - // Verify presence of all broadcast route in mcast table - addr = Ip4Address::from_string("255.255.255.255"); + // Verify presence of all broadcast route in mcast table + addr = Ip4Address::from_string("255.255.255.255"); BridgeRouteEntry *rt_m = GetL2FloodRoute("vrf1"); ASSERT_TRUE(rt_m != NULL); int alloc_label = GetStartLabel_XmppServer(1); - //Send All bcast route - SendBcastRouteMessage(mock_peer_s.get(), "vrf1", - "255.255.255.255", alloc_label+1, + //Send All bcast route + SendBcastRouteMessage(mock_peer_s.get(), "vrf1", + "255.255.255.255", alloc_label+1, "127.0.0.4", alloc_label + 11); client->WaitForIdle(); - // Bcast Route with updated olist - WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 3)); + // Bcast Route with updated olist + WAIT_FOR(1000, 10000, (bgp_peer_s.get()->Count() == 3)); WAIT_FOR(1000, 10000, (client->CompositeNHCount() == 3)); - NextHop *nh = const_cast(rt_m->GetActiveNextHop()); - ASSERT_TRUE(nh != NULL); - ASSERT_TRUE(nh->GetType() == NextHop::COMPOSITE); - CompositeNH *cnh = static_cast(nh); - //obj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); - //WAIT_FOR(1000, 1000, (obj->GetSourceMPLSLabel() != 0)); + NextHop *nh = const_cast(rt_m->GetActiveNextHop()); + ASSERT_TRUE(nh != NULL); + ASSERT_TRUE(nh->GetType() == NextHop::COMPOSITE); + CompositeNH *cnh = static_cast(nh); + //obj = MulticastHandler::GetInstance()->FindGroupObject("vrf1", addr); + //WAIT_FOR(1000, 1000, (obj->GetSourceMPLSLabel() != 0)); ASSERT_TRUE(cnh->ComponentNHCount() == 2); const CompositeNH *intf_cnh = static_cast(cnh->GetNH(1)); EXPECT_TRUE(intf_cnh->ComponentNHCount() == 2); - //Verify mpls table - WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()-> + //Verify mpls table + WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()-> FindMplsLabel(alloc_label+ 1) == NULL)); - WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()->Size() == 7)); + WAIT_FOR(1000, 1000, (Agent::GetInstance()->mpls_table()->Size() == 7)); } void XmppSubnetTearDown() { @@ -586,7 +586,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { client->Reset(); client->WaitForIdle(); - + AgentXmppChannel *ch = Agent::GetInstance()->mulitcast_builder(); EXPECT_TRUE(ch != NULL); EXPECT_TRUE(ch->GetXmppServer().size() != 0); @@ -594,7 +594,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { //bring-down the channel, which is the elected //multicast tree builder (i.e 127.0.0.1) - bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::NOT_READY); + bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::NOT_READY); WAIT_FOR(1000, 10000, (Agent::GetInstance()-> mulitcast_builder() != NULL)); client->WaitForIdle(); @@ -604,7 +604,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { EXPECT_TRUE(ch->GetXmppServer().size() != 0); EXPECT_STREQ(ch->GetXmppServer().c_str(), "127.0.0.2"); - //ensure route learnt via control-node is cleaned/updated + //ensure route learnt via control-node is cleaned/updated BridgeRouteEntry *rt_m = GetL2FloodRoute("vrf1"); NextHop *nh = const_cast(rt_m->GetActiveNextHop()); ASSERT_TRUE(nh != NULL); @@ -630,7 +630,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { //Now bring-up the multicast tree builder with //the lower-ip - bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); + bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); WAIT_FOR(1000, 10000, (Agent::GetInstance()-> mulitcast_builder() != NULL)); client->WaitForIdle(); @@ -647,7 +647,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { WAIT_FOR(1000, 10000, (mock_peer.get()->Count() == 12)); } - //expect subscribe, 2VM routes, + //expect subscribe, 2VM routes, //subnet and all braodcast routes to newly elected //multicast builder WAIT_FOR(1000, 10000, (mock_peer_s.get()->Count() == 16)); @@ -670,7 +670,7 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_Test_FailOver) { //bring-up non multicast builder - bgp_peer.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); + bgp_peer.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); WAIT_FOR(1000, 10000, (Agent::GetInstance()-> mulitcast_builder() != NULL)); client->WaitForIdle(5); @@ -706,10 +706,10 @@ TEST_F(AgentXmppUnitTest, SubnetBcast_DBWalk_Cancel) { //bring-down the channel, which is the elected //multicast tree builder (i.e 127.0.0.1) - bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::NOT_READY); + bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::NOT_READY); client->WaitForIdle(); - bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); + bgp_peer_s.get()->AgentBgpXmppPeerTest::HandleXmppChannelEvent(xmps::READY); client->WaitForIdle(); //cleanup all config links via config diff --git a/src/vnsw/agent/test/test_xmppcs_ifmap.cc b/src/vnsw/agent/test/test_xmppcs_ifmap.cc index 4fc09db9062..1b2e35ac1a5 100644 --- a/src/vnsw/agent/test/test_xmppcs_ifmap.cc +++ b/src/vnsw/agent/test/test_xmppcs_ifmap.cc @@ -40,7 +40,7 @@ #include "xml/xml_pugi.h" -#include "controller/controller_ifmap.h" +#include "controller/controller_ifmap.h" using namespace pugi; const char *init_file_local; @@ -65,10 +65,10 @@ class ControlNodeMockIFMapXmppPeer { void ReceiveUpdate(const XmppStanza::XmppMessage *msg) { rx_count_++; - } + } bool SendUpdate(uint8_t *msg, size_t size) { - if (channel_ && + if (channel_ && (channel_->GetPeerState() == xmps::READY)) { return channel_->Send(msg, size, xmps::CONFIG, boost::bind(&ControlNodeMockIFMapXmppPeer::WriteReadyCb, this, _1)); @@ -86,7 +86,7 @@ class ControlNodeMockIFMapXmppPeer { }; -class AgentIFMapXmppUnitTest : public ::testing::Test { +class AgentIFMapXmppUnitTest : public ::testing::Test { protected: virtual void SetUp() { @@ -182,7 +182,7 @@ class AgentIFMapXmppUnitTest : public ::testing::Test { WAIT_FOR(100, 10000, ((sconnection[id] = xs[id]->FindConnection(boost::asio::ip::host_name())) != NULL)); - mock_ifmap_peer[id].reset(new + mock_ifmap_peer[id].reset(new ControlNodeMockIFMapXmppPeer(sconnection[id]->ChannelMux())); } @@ -265,7 +265,7 @@ TEST_F(AgentIFMapXmppUnitTest, LinkTest) { VnEntry *oper_vn = VnGet(4); VrfEntry *oper_vrf = VrfGet("vrf4"); EXPECT_EQ(oper_vn->GetVrf(), oper_vrf); - + //DeleteVmportEnv(input2, 2, 0); client->WaitForIdle(); diff --git a/src/vnsw/agent/uve/mock_generator.cc b/src/vnsw/agent/uve/mock_generator.cc index e96ea71a65d..42c7932ab81 100644 --- a/src/vnsw/agent/uve/mock_generator.cc +++ b/src/vnsw/agent/uve/mock_generator.cc @@ -274,7 +274,7 @@ class MockGenerator { reverse_flow_info.set_sampled_bytes(reverse_pkts * mgen_->dBytesPerPacket(mgen_->rgen_)); sess_agg_info.set_sampled_forward_pkts( - sess_agg_info.get_sampled_forward_pkts() + + sess_agg_info.get_sampled_forward_pkts() + forward_pkts); sess_agg_info.set_sampled_forward_bytes( sess_agg_info.get_sampled_forward_bytes() + @@ -591,7 +591,7 @@ int main(int argc, char *argv[]) { instance_id, http_server_port, start_vn, end_vn, other_vn, num_networks, instance_iterations, collectors, ip_vns, start_ip_index, num_vrouter_error_messages_per_sec, - num_sessions_per_instance, num_session_samples_per_sec, + num_sessions_per_instance, num_session_samples_per_sec, num_session_samples_in_message, &evm); mock_generator.Run(); evm.Run(); diff --git a/src/vnsw/agent/uve/test/agent_param_test.h b/src/vnsw/agent/uve/test/agent_param_test.h index b0e3568128a..3073ac0042b 100644 --- a/src/vnsw/agent/uve/test/agent_param_test.h +++ b/src/vnsw/agent/uve/test/agent_param_test.h @@ -8,7 +8,7 @@ #include #include -// Class handling agent configuration parameters from config file and +// Class handling agent configuration parameters from config file and // arguments class AgentParamTest { public: diff --git a/src/vnsw/agent/uve/test/agent_stats_collector_test.cc b/src/vnsw/agent/uve/test/agent_stats_collector_test.cc index 60422a35ba0..75a196fed93 100644 --- a/src/vnsw/agent/uve/test/agent_stats_collector_test.cc +++ b/src/vnsw/agent/uve/test/agent_stats_collector_test.cc @@ -25,18 +25,18 @@ IoContext *AgentStatsCollectorTest::AllocateIoContext(char* buf, uint32_t buf_le StatsType type, uint32_t seq) { switch (type) { case InterfaceStatsType: - return (new InterfaceStatsIoContextTest(buf_len, buf, seq, + return (new InterfaceStatsIoContextTest(buf_len, buf, seq, intf_stats_sandesh_ctx_.get(), IoContext::IOC_UVE)); break; case VrfStatsType: - return (new VrfStatsIoContextTest(buf_len, buf, seq, - vrf_stats_sandesh_ctx_.get(), + return (new VrfStatsIoContextTest(buf_len, buf, seq, + vrf_stats_sandesh_ctx_.get(), IoContext::IOC_UVE)); break; case DropStatsType: - return (new DropStatsIoContextTest(buf_len, buf, seq, - drop_stats_sandesh_ctx_.get(), + return (new DropStatsIoContextTest(buf_len, buf, seq, + drop_stats_sandesh_ctx_.get(), IoContext::IOC_UVE)); break; default: diff --git a/src/vnsw/agent/uve/test/agent_stats_collector_test.h b/src/vnsw/agent/uve/test/agent_stats_collector_test.h index 9f97e62f833..246b5009470 100644 --- a/src/vnsw/agent/uve/test/agent_stats_collector_test.h +++ b/src/vnsw/agent/uve/test/agent_stats_collector_test.h @@ -24,7 +24,7 @@ class AgentStatsCollectorTest : public AgentStatsCollector { public: AgentStatsCollectorTest(boost::asio::io_service &io, Agent *agent) : AgentStatsCollector(io, agent), interface_stats_responses_(0), - vrf_stats_responses_(0), drop_stats_responses_(0), + vrf_stats_responses_(0), drop_stats_responses_(0), interface_stats_errors_(0), vrf_stats_errors_(0), drop_stats_errors_(0) { } virtual ~AgentStatsCollectorTest() { @@ -43,8 +43,8 @@ class AgentStatsCollectorTest : public AgentStatsCollector { class InterfaceStatsIoContextTest: public InterfaceStatsIoContext { public: - InterfaceStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, - AgentStatsSandeshContext *ctx, + InterfaceStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, + AgentStatsSandeshContext *ctx, IoContext::Type type) : InterfaceStatsIoContext(msg_len, msg, seqno, ctx, type) {} virtual ~InterfaceStatsIoContextTest() {} @@ -56,9 +56,9 @@ class InterfaceStatsIoContextTest: public InterfaceStatsIoContext { class VrfStatsIoContextTest: public VrfStatsIoContext { public: - VrfStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, - AgentStatsSandeshContext *ctx, - IoContext::Type type) + VrfStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, + AgentStatsSandeshContext *ctx, + IoContext::Type type) : VrfStatsIoContext(msg_len, msg, seqno, ctx, type) {} virtual ~VrfStatsIoContextTest() {} void Handler(); @@ -69,8 +69,8 @@ class VrfStatsIoContextTest: public VrfStatsIoContext { class DropStatsIoContextTest: public DropStatsIoContext { public: - DropStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, - AgentStatsSandeshContext *ctx, + DropStatsIoContextTest(int msg_len, char *msg, uint32_t seqno, + AgentStatsSandeshContext *ctx, IoContext::Type type) : DropStatsIoContext(msg_len, msg, seqno, ctx, type) {} virtual ~DropStatsIoContextTest() {} diff --git a/src/vnsw/agent/uve/test/interface_uve_table_test.cc b/src/vnsw/agent/uve/test/interface_uve_table_test.cc index 98f8d83ee25..3e30f4ef4ae 100644 --- a/src/vnsw/agent/uve/test/interface_uve_table_test.cc +++ b/src/vnsw/agent/uve/test/interface_uve_table_test.cc @@ -15,7 +15,7 @@ InterfaceUveTableTest::InterfaceUveTableTest(Agent *agent, uint32_t intvl) : } void InterfaceUveTableTest::DispatchInterfaceMsg(const UveVMInterfaceAgent &u) { - send_count_++; + send_count_++; if (u.get_deleted()) { delete_count_++; } @@ -72,7 +72,7 @@ const InterfaceUveTable::FloatingIp *InterfaceUveTableTest::GetVmIntfFip return NULL; } -InterfaceUveTable::UveInterfaceEntry* +InterfaceUveTable::UveInterfaceEntry* InterfaceUveTableTest::GetUveInterfaceEntry(const string &name) { InterfaceMap::iterator it = interface_tree_.find(name); if (it == interface_tree_.end()) { diff --git a/src/vnsw/agent/uve/test/prouter_uve_table_test.cc b/src/vnsw/agent/uve/test/prouter_uve_table_test.cc index b0bec8f884a..8bc22a2ce35 100644 --- a/src/vnsw/agent/uve/test/prouter_uve_table_test.cc +++ b/src/vnsw/agent/uve/test/prouter_uve_table_test.cc @@ -12,7 +12,7 @@ ProuterUveTableTest::~ProuterUveTableTest() { } void ProuterUveTableTest::DispatchProuterMsg(const ProuterData &uve) { - send_count_++; + send_count_++; if (uve.get_deleted()) { delete_count_++; } diff --git a/src/vnsw/agent/uve/test/test_interface_uve.cc b/src/vnsw/agent/uve/test/test_interface_uve.cc index 783a5d98724..b71e155ff23 100644 --- a/src/vnsw/agent/uve/test/test_interface_uve.cc +++ b/src/vnsw/agent/uve/test/test_interface_uve.cc @@ -354,7 +354,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_1) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE const VmInterface *vmi = VmInterfaceGet(input[0].intf_id); EXPECT_TRUE(vmi != NULL); const UveVMInterfaceAgent uve1 = vmut->last_sent_uve(); @@ -395,7 +395,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_1) { client->WaitForIdle(); WAIT_FOR(1000, 500, ((vmut->InterfaceUveCount() == 0U))); - //Verify UVE + //Verify UVE EXPECT_EQ(1U, vmut->delete_count()); //clear counters at the end of test case @@ -560,7 +560,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_EQ(2U, vmut->send_count()); //Disassociate VM from VMI and delete the VM @@ -574,7 +574,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { //Verify that no additional interface UVEs are sent EXPECT_TRUE((vmut->send_count() == 3U)); EXPECT_EQ(0U, vmut->delete_count()); - + //Add the VM back and re-associate it with same VMI util_.VmAdd(input[0].vm_id); AddLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); @@ -583,7 +583,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 4U)); // Delete virtual-machine-interface to vrf link attribute @@ -599,7 +599,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 5U)); //Activate the interface again @@ -612,7 +612,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 6U)); // Delete virtual-machine-interface to vrf link attribute @@ -628,7 +628,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmiUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 7U)); //other cleanup @@ -655,7 +655,7 @@ TEST_F(InterfaceUveTest, VmIntfAddDel_2) { client->WaitForIdle(); WAIT_FOR(1000, 500, ((vmut->InterfaceUveCount() == 0U))); - //Verify UVE + //Verify UVE EXPECT_EQ(1U, vmut->delete_count()); //clear counters at the end of test case diff --git a/src/vnsw/agent/uve/test/test_prouter_uve.cc b/src/vnsw/agent/uve/test/test_prouter_uve.cc index 53b19ff6ed9..73a051b3368 100644 --- a/src/vnsw/agent/uve/test/test_prouter_uve.cc +++ b/src/vnsw/agent/uve/test/test_prouter_uve.cc @@ -784,7 +784,7 @@ TEST_F(UveProuterUveTest, VMIAddDel_2) { WAIT_FOR(1000, 500, (pr->last_sent_uve().get_physical_interface_list(). size() == 1U)); - + uint32_t send_count = pr->send_count(); //Disassociate VMI from logical-interface DelLink("virtual-machine-interface", "vmi1", "logical-interface", "li1"); diff --git a/src/vnsw/agent/uve/test/test_stats_mock.cc b/src/vnsw/agent/uve/test/test_stats_mock.cc index 5369680d430..40445f358ec 100644 --- a/src/vnsw/agent/uve/test/test_stats_mock.cc +++ b/src/vnsw/agent/uve/test/test_stats_mock.cc @@ -231,7 +231,7 @@ TEST_F(StatsTestMock, FlowStatsTest) { TxTcpPacketUtil(flow1->id(), "1.1.1.2", "1.1.1.1", 200, 1000, f2_rev->flow_handle()); client->WaitForIdle(10); - EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 200, 1000, true, + EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 200, 1000, true, "vn5", "vn5", f2_rev->flow_handle(), flow1->flow_key_nh()->id(), flow0->flow_key_nh()->id())); @@ -300,7 +300,7 @@ TEST_F(StatsTestMock, FlowStatsOverflowTest) { TxTcpPacketUtil(flow1->id(), "1.1.1.2", "1.1.1.1", 200, 1000, f1_rev->flow_handle()); client->WaitForIdle(10); - EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 200, 1000, true, + EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 200, 1000, true, "vn5", "vn5", f1_rev->flow_handle(), flow1->flow_key_nh()->id(), flow0->flow_key_nh()->id())); @@ -533,8 +533,8 @@ TEST_F(StatsTestMock, IntfStatsTest) { WAIT_FOR(100, 1000, (collector->interface_stats_responses_ >= 1)); client->WaitForIdle(3); - EXPECT_TRUE(VmPortStatsMatch(test0, 0,0,0,0)); - EXPECT_TRUE(VmPortStatsMatch(test1, 0,0,0,0)); + EXPECT_TRUE(VmPortStatsMatch(test0, 0,0,0,0)); + EXPECT_TRUE(VmPortStatsMatch(test1, 0,0,0,0)); //Change the stats KSyncSockTypeMap::IfStatsUpdate(test0->id(), 1, 50, 0, 1, 20, 0); @@ -549,8 +549,8 @@ TEST_F(StatsTestMock, IntfStatsTest) { client->WaitForIdle(3); //Verify the updated flow stats - EXPECT_TRUE(VmPortStatsMatch(test0, 1, 50, 1, 20)); - EXPECT_TRUE(VmPortStatsMatch(test1, 1, 50, 1, 20)); + EXPECT_TRUE(VmPortStatsMatch(test0, 1, 50, 1, 20)); + EXPECT_TRUE(VmPortStatsMatch(test1, 1, 50, 1, 20)); //Reset the stats so that repeat of this test case works KSyncSockTypeMap::IfStatsSet(test0->id(), 0, 0, 0, 0, 0, 0); @@ -571,7 +571,7 @@ TEST_F(StatsTestMock, InterVnStatsTest) { TxTcpPacketUtil(flow0->id(), "1.1.1.1", "1.1.1.2", 30, 40, hash_id); client->WaitForIdle(10); - EXPECT_TRUE(FlowGet("vrf5", "1.1.1.1", "1.1.1.2", 6, 30, 40, false, + EXPECT_TRUE(FlowGet("vrf5", "1.1.1.1", "1.1.1.2", 6, 30, 40, false, "vn5", "vn5", hash_id++, flow0->flow_key_nh()->id())); //Invoke FlowStatsCollector to update the stats @@ -599,7 +599,7 @@ TEST_F(StatsTestMock, InterVnStatsTest) { f1_rev->flow_handle()); client->WaitForIdle(10); client->WaitForIdle(10); - EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 40, 30, true, + EXPECT_TRUE(FlowGet("vrf5", "1.1.1.2", "1.1.1.1", 6, 40, 30, true, "vn5", "vn5", f1_rev->flow_handle(), flow1->flow_key_nh()->id(), flow0->flow_key_nh()->id())); @@ -636,7 +636,7 @@ TEST_F(StatsTestMock, InterVnStatsTest) { client->WaitForIdle(10); // A short flow would be created with Source VN as "vn5" and dest-vn as "Unknown". - // Not checking for creation of short flow because it will get removed during + // Not checking for creation of short flow because it will get removed during // the next flow-age evaluation cycle //Invoke FlowStatsCollector to update the stats @@ -801,7 +801,7 @@ TEST_F(StatsTestMock, VrfStatsTest) { EXPECT_TRUE(VrfStatsMatch(vrf41_id, string("vrf41"), true, match_req)); EXPECT_TRUE(VrfStatsMatch(vrf42_id, string("vrf42"), true, match_req)); - //Cleanup-Remove the VRFs added + //Cleanup-Remove the VRFs added VrfDelReq("vrf41"); client->WaitForIdle(); WAIT_FOR(100, 10000, (VrfFind("vrf41")== false)); diff --git a/src/vnsw/agent/uve/test/test_uve.cc b/src/vnsw/agent/uve/test/test_uve.cc index c7e2b508089..15c8c90bd68 100644 --- a/src/vnsw/agent/uve/test/test_uve.cc +++ b/src/vnsw/agent/uve/test/test_uve.cc @@ -133,7 +133,7 @@ class UveTest : public ::testing::Test { } void GetAgentStatsResponse(Sandesh *sandesh) { - if (memcmp(sandesh->Name(), "AgentStatsIntervalResp_InSeconds", + if (memcmp(sandesh->Name(), "AgentStatsIntervalResp_InSeconds", strlen("AgentStatsIntervalResp_InSeconds")) == 0) { success_responses_++; AgentStatsIntervalResp_InSeconds *resp = static_cast @@ -152,7 +152,7 @@ class UveTest : public ::testing::Test { } void GetFlowStatsResponse(Sandesh *sandesh) { - if (memcmp(sandesh->Name(), "FlowStatsIntervalResp_InSeconds", + if (memcmp(sandesh->Name(), "FlowStatsIntervalResp_InSeconds", strlen("FlowStatsIntervalResp_InSeconds")) == 0) { success_responses_++; FlowStatsIntervalResp_InSeconds *resp = static_cast @@ -227,7 +227,7 @@ TEST_F(UveTest, VmAddDelTest1) { client->WaitForIdle(2); client->VnDelNotifyWait(2); client->PortDelNotifyWait(2); - + WAIT_FOR(100, 1000, (PortSubscribeSize(agent_) == 0)); WAIT_FOR(100, 1000, (Agent::GetInstance()->vm_table()->Size() == 0)); WAIT_FOR(100, 1000, (Agent::GetInstance()->vn_table()->Size() == 0)); @@ -367,13 +367,13 @@ TEST_F(UveTest, VrfAddDelTest_1) { client->WaitForIdle(); WAIT_FOR(100, 10000, (VrfFind("vrf11")== true)); EXPECT_TRUE(DBTableFind("vrf11.uc.route.0")); - + VrfEntry *vrf = Agent::GetInstance()->vrf_table()->FindVrfFromName("vrf11"); EXPECT_TRUE(vrf != NULL); int vrf11_id = vrf->vrf_id(); vr_vrf_stats_req zero_stats; - //Verify that vrf_stats entry is added vrf_stats_tree of + //Verify that vrf_stats entry is added vrf_stats_tree of //agent_stats_collector EXPECT_TRUE(VrfStatsMatch(vrf11_id, string("vrf11"), true, zero_stats)); @@ -383,7 +383,7 @@ TEST_F(UveTest, VrfAddDelTest_1) { WAIT_FOR(100, 10000, (VrfFind("vrf11")== false)); EXPECT_FALSE(DBTableFind("vrf11.uc.route.0")); - //Verify that vrf_stats entry is not removed from vrf_stats_tree of + //Verify that vrf_stats entry is not removed from vrf_stats_tree of //agent_stats_collector after deletion of vrf EXPECT_TRUE(VrfStatsMatch(vrf11_id, string("vrf11"), true, zero_stats)); @@ -391,7 +391,7 @@ TEST_F(UveTest, VrfAddDelTest_1) { VrfAddReq("vrf21"); client->WaitForIdle(); EXPECT_TRUE(DBTableFind("vrf21.uc.route.0")); - + vrf = Agent::GetInstance()->vrf_table()->FindVrfFromName("vrf21"); EXPECT_TRUE(vrf != NULL); int vrf21_id = vrf->vrf_id(); diff --git a/src/vnsw/agent/uve/test/test_vm_uve.cc b/src/vnsw/agent/uve/test/test_vm_uve.cc index 6f53ddeb1f9..62466c6870f 100644 --- a/src/vnsw/agent/uve/test/test_vm_uve.cc +++ b/src/vnsw/agent/uve/test/test_vm_uve.cc @@ -284,7 +284,7 @@ TEST_F(UveVmUveTest, VmAddDel_1) { EXPECT_TRUE(uve1 != NULL); string uuid_str = to_string(vm->GetUuid()); EXPECT_STREQ(uuid_str.c_str(), uve1->get_uuid().c_str()); - EXPECT_EQ(0U, uve1->get_interface_list().size()); + EXPECT_EQ(0U, uve1->get_interface_list().size()); //Add another VM util_.VmAdd(2); @@ -300,7 +300,7 @@ TEST_F(UveVmUveTest, VmAddDel_1) { EXPECT_TRUE(vm2 != NULL); UveVirtualMachineAgent *uve2 = vmut->VmUveObject(vm2); EXPECT_TRUE(uve2 != NULL); - EXPECT_EQ(0U, uve2->get_interface_list().size()); + EXPECT_EQ(0U, uve2->get_interface_list().size()); //Delete one of the VMs util_.VmDelete(1); @@ -350,7 +350,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_1) { //Verify that the port is inactive EXPECT_TRUE(VmPortInactive(input, 0)); - //Since the port is inactive, verify that no VM UVE send has + //Since the port is inactive, verify that no VM UVE send has //happened since port addition EXPECT_EQ(0U, vmut->send_count()); @@ -389,13 +389,13 @@ TEST_F(UveVmUveTest, VmIntfAddDel_1) { util_.EnqueueSendVmUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE VmEntry *vm = VmGet(input[0].vm_id); EXPECT_TRUE(vm != NULL); UveVirtualMachineAgent *uve1 = vmut->VmUveObject(vm); EXPECT_TRUE(uve1 != NULL); EXPECT_EQ(2U, vmut->send_count()); - EXPECT_EQ(1U, uve1->get_interface_list().size()); + EXPECT_EQ(1U, uve1->get_interface_list().size()); //Verify interface UUID std::string intf_entry = uve1->get_interface_list().front(); @@ -433,7 +433,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_1) { //Verify that no UVE is sent on VMI reactivation EXPECT_EQ(2U, vmut->send_count()); - EXPECT_EQ(1U, uve1->get_interface_list().size()); + EXPECT_EQ(1U, uve1->get_interface_list().size()); // Delete virtual-machine-interface to vrf link attribute DelLink("virtual-machine-interface-routing-instance", "vnet1", @@ -508,7 +508,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { //Verify that the port is inactive EXPECT_TRUE(VmPortInactive(input, 0)); - //Since the port is inactive, verify that no VM UVE send has + //Since the port is inactive, verify that no VM UVE send has //happened since port addition EXPECT_EQ(0U, vmut->send_count()); @@ -546,13 +546,13 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE VmEntry *vm = VmGet(input[0].vm_id); EXPECT_TRUE(vm != NULL); UveVirtualMachineAgent *uve1 = vmut->VmUveObject(vm); EXPECT_TRUE(uve1 != NULL); EXPECT_EQ(2U, vmut->send_count()); - EXPECT_EQ(1U, uve1->get_interface_list().size()); + EXPECT_EQ(1U, uve1->get_interface_list().size()); //Disassociate VM from VMI and delete the VM DelLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); @@ -565,7 +565,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { EXPECT_TRUE((vmut->send_count() >= 3U)); EXPECT_EQ(1U, vmut->delete_count()); - + //Add the VM back and re-associate it with same VMI util_.VmAdd(input[0].vm_id); AddLink("virtual-machine", "vm1", "virtual-machine-interface", "vnet1"); @@ -575,7 +575,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 4U)); EXPECT_EQ(1U, vmut->delete_count()); vm = VmGet(input[0].vm_id); @@ -597,7 +597,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { util_.EnqueueSendVmUveTask(); client->WaitForIdle(); - //Verify UVE + //Verify UVE vm = VmGet(input[0].vm_id); EXPECT_TRUE(vm != NULL); uve1 = vmut->VmUveObject(vm); @@ -662,7 +662,7 @@ TEST_F(UveVmUveTest, VmIntfAddDel_2) { client->WaitForIdle(); WAIT_FOR(1000, 500, ((vmut->VmUveCount() == 0U))); - //Verify UVE + //Verify UVE EXPECT_TRUE((vmut->send_count() >= 5U)); EXPECT_EQ(2U, vmut->delete_count()); diff --git a/src/vnsw/agent/uve/test/test_vn_uve.cc b/src/vnsw/agent/uve/test/test_vn_uve.cc index 83d12399948..c6c57845ed7 100644 --- a/src/vnsw/agent/uve/test/test_vn_uve.cc +++ b/src/vnsw/agent/uve/test/test_vn_uve.cc @@ -148,8 +148,8 @@ TEST_F(UveVnUveTest, VnAddDel_1) { client->WaitForIdle(); WAIT_FOR(1000, 500, (vnut->send_count() >= 1U)); UveVirtualNetworkAgent *uve1 = vnut->VnUveObject("vn1"); - EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); - EXPECT_EQ(0U, uve1->get_interface_list().size()); + EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); + EXPECT_EQ(0U, uve1->get_interface_list().size()); //Delete VN util_.VnDelete(1); @@ -183,8 +183,8 @@ TEST_F(UveVnUveTest, VnIntfAddDel_1) { WAIT_FOR(1000, 500, (vnut->VnUveObject("vn1") != NULL)); UveVirtualNetworkAgent *uve1 = vnut->VnUveObject("vn1"); - EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); - EXPECT_EQ(0U, uve1->get_interface_list().size()); + EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); + EXPECT_EQ(0U, uve1->get_interface_list().size()); // Nova Port add message util_.NovaPortAdd(input); @@ -222,8 +222,8 @@ TEST_F(UveVnUveTest, VnIntfAddDel_1) { client->WaitForIdle(); //Verify UVE WAIT_FOR(1000, 500, (vnut->send_count() >= 2U)); - EXPECT_EQ(1U, uve1->get_virtualmachine_list().size()); - EXPECT_EQ(1U, uve1->get_interface_list().size()); + EXPECT_EQ(1U, uve1->get_virtualmachine_list().size()); + EXPECT_EQ(1U, uve1->get_interface_list().size()); // Delete virtual-machine-interface to vrf link attribute DelLink("virtual-machine-interface-routing-instance", "vnet1", @@ -297,8 +297,8 @@ TEST_F(UveVnUveTest, VnChange_1) { WAIT_FOR(1000, 500, (vnut->VnUveObject("vn1") != NULL)); UveVirtualNetworkAgent *uve1 = vnut->VnUveObject("vn1"); - EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); - EXPECT_EQ(0U, uve1->get_interface_list().size()); + EXPECT_EQ(0U, uve1->get_virtualmachine_list().size()); + EXPECT_EQ(0U, uve1->get_interface_list().size()); EXPECT_TRUE((uve1->get_acl().compare(string("acl1")) != 0)); //Associate an ACL with VN @@ -622,7 +622,7 @@ TEST_F(UveVnUveTest, FlowCount_2) { { TestFlowPkt(Address::INET, remote_vm4_ip, vm1_ip, 1, 0, 0, "vrf5", remote_router_ip, intf->label(), 1), - { + { new VerifyVn("vn3", "vn5"), } }, @@ -743,10 +743,10 @@ TEST_F(UveVnUveTest, FipCount) { //Trigger VN UVE send vnut->SendVnStats(); - //Verify UVE + //Verify UVE UveVirtualNetworkAgent *uve1 = vnut->VnUveObject("vn1"); EXPECT_TRUE(uve1 != NULL); - EXPECT_EQ(0, uve1->get_associated_fip_count()); + EXPECT_EQ(0, uve1->get_associated_fip_count()); //Create a VN for floating-ip client->Reset(); @@ -776,7 +776,7 @@ TEST_F(UveVnUveTest, FipCount) { vnut->SendVnStats(); client->WaitForIdle(); - //Verify UVE + //Verify UVE WAIT_FOR(1000, 500, (uve1->get_associated_fip_count() == 1U)); //Add one more floating IP @@ -789,7 +789,7 @@ TEST_F(UveVnUveTest, FipCount) { vnut->SendVnStats(); client->WaitForIdle(); - //Verify UVE + //Verify UVE WAIT_FOR(1000, 500, (uve1->get_associated_fip_count() == 2U)); //Delete one of the floating-IP @@ -801,7 +801,7 @@ TEST_F(UveVnUveTest, FipCount) { //Trigger VN UVE send vnut->SendVnStats(); - //Verify UVE + //Verify UVE WAIT_FOR(1000, 500, (uve1->get_associated_fip_count() == 1U)); //Delete the other floating-IP @@ -813,7 +813,7 @@ TEST_F(UveVnUveTest, FipCount) { //Trigger VN UVE send vnut->SendVnStats(); - //Verify UVE + //Verify UVE WAIT_FOR(1000, 500, (uve1->get_associated_fip_count() == 0)); //cleanup @@ -895,7 +895,7 @@ TEST_F(UveVnUveTest, VnVrfAssoDisassoc_1) { //Verify vrf stats list in UVE UveVirtualNetworkAgent *uve1 = vnut->VnUveObject("vn3"); - EXPECT_EQ(0U, uve1->get_vrf_stats_list().size()); + EXPECT_EQ(0U, uve1->get_vrf_stats_list().size()); //Add VRF and associate it with VN util_.VrfAdd(input[0].vn_id); @@ -906,7 +906,7 @@ TEST_F(UveVnUveTest, VnVrfAssoDisassoc_1) { vnut->SendVnStats(); //Verify vrf stats list in UVE - EXPECT_EQ(1U, uve1->get_vrf_stats_list().size()); + EXPECT_EQ(1U, uve1->get_vrf_stats_list().size()); //Disassociate VN from VRF DelLink("virtual-network", "vn3", "routing-instance", "vrf3"); @@ -916,7 +916,7 @@ TEST_F(UveVnUveTest, VnVrfAssoDisassoc_1) { vnut->SendVnStats(); //Verify vrf stats list in UVE - EXPECT_EQ(0U, uve1->get_vrf_stats_list().size()); + EXPECT_EQ(0U, uve1->get_vrf_stats_list().size()); //Reassociate VN with VRF AddLink("virtual-network", "vn3", "routing-instance", "vrf3"); @@ -926,7 +926,7 @@ TEST_F(UveVnUveTest, VnVrfAssoDisassoc_1) { vnut->SendVnStats(); //Verify vrf stats list in UVE - EXPECT_EQ(1U, uve1->get_vrf_stats_list().size()); + EXPECT_EQ(1U, uve1->get_vrf_stats_list().size()); //cleanup DelLink("virtual-network", "vn3", "routing-instance", "vrf3"); @@ -1010,7 +1010,7 @@ TEST_F(UveVnUveTest, LinkLocalVn_Xen) { //Verify UVE EXPECT_EQ(1U, uve1->get_virtualmachine_list().size()); - EXPECT_EQ(1U, uve1->get_interface_list().size()); + EXPECT_EQ(1U, uve1->get_interface_list().size()); // Delete virtual-machine-interface to vrf link attribute DelLink("virtual-machine-interface-routing-instance", "vnet1", diff --git a/src/vnsw/agent/uve/test/test_vrouter_uve.cc b/src/vnsw/agent/uve/test/test_vrouter_uve.cc index cc8743ccccd..d7b8952f80e 100644 --- a/src/vnsw/agent/uve/test/test_vrouter_uve.cc +++ b/src/vnsw/agent/uve/test/test_vrouter_uve.cc @@ -109,7 +109,7 @@ class UveVrouterUveTest : public ::testing::Test { EXPECT_EQ(0U, flow_proto_->FlowCount()); } - bool ValidateBmap(const std::vector &smap, const std::vector &dmap, + bool ValidateBmap(const std::vector &smap, const std::vector &dmap, uint16_t sport, uint16_t dport) { bool ret = true; @@ -822,7 +822,7 @@ TEST_F(UveVrouterUveTest, ExceptionPktsChange) { EXPECT_EQ(0U, uve.get_exception_packets_dropped()); EXPECT_EQ(0U, uve.get_exception_packets_allowed()); - //Update exception stats + //Update exception stats agent_->stats()->incr_pkt_exceptions(); agent_->stats()->incr_pkt_exceptions(); agent_->stats()->incr_pkt_exceptions(); diff --git a/src/vnsw/agent/uve/test/vm_uve_table_test.cc b/src/vnsw/agent/uve/test/vm_uve_table_test.cc index 600846b8065..db186fcc750 100644 --- a/src/vnsw/agent/uve/test/vm_uve_table_test.cc +++ b/src/vnsw/agent/uve/test/vm_uve_table_test.cc @@ -38,8 +38,8 @@ VmUveTable::VmUveEntryPtr VmUveTableTest::Allocate(const VmEntry *vm) { return uve; } -void VmUveTableTest::DispatchVmMsg(const UveVirtualMachineAgent &uve) { - send_count_++; +void VmUveTableTest::DispatchVmMsg(const UveVirtualMachineAgent &uve) { + send_count_++; if (uve.get_deleted()) { delete_count_++; } diff --git a/src/vnsw/agent/uve/test/vn_uve_table_test.cc b/src/vnsw/agent/uve/test/vn_uve_table_test.cc index f0d857b4eb0..63de67aa076 100644 --- a/src/vnsw/agent/uve/test/vn_uve_table_test.cc +++ b/src/vnsw/agent/uve/test/vn_uve_table_test.cc @@ -79,8 +79,8 @@ UveVirtualNetworkAgent* VnUveTableTest::VnUveObject(const string &vn) { return uve->uve_info(); } -void VnUveTableTest::DispatchVnMsg(const UveVirtualNetworkAgent &uve) { - send_count_++; +void VnUveTableTest::DispatchVnMsg(const UveVirtualNetworkAgent &uve) { + send_count_++; if (uve.get_deleted()) { delete_count_++; } diff --git a/src/vnsw/agent/uve/test/vn_uve_table_test.h b/src/vnsw/agent/uve/test/vn_uve_table_test.h index f3ebf7dcad0..e8ab19afa0f 100644 --- a/src/vnsw/agent/uve/test/vn_uve_table_test.h +++ b/src/vnsw/agent/uve/test/vn_uve_table_test.h @@ -8,7 +8,7 @@ #include class VnUveTableTest : public VnUveTable { -public: +public: VnUveTableTest(Agent *agent, uint32_t default_intvl); virtual void DispatchVnMsg(const UveVirtualNetworkAgent &uve); uint32_t send_count() const { return send_count_; } diff --git a/src/vnsw/agent/uve/test/vrouter_uve_entry_test.cc b/src/vnsw/agent/uve/test/vrouter_uve_entry_test.cc index 96b2b1c7f20..879ec54c4a1 100644 --- a/src/vnsw/agent/uve/test/vrouter_uve_entry_test.cc +++ b/src/vnsw/agent/uve/test/vrouter_uve_entry_test.cc @@ -27,9 +27,9 @@ #include "xmpp/test/xmpp_test_util.h" VrouterUveEntryTest::VrouterUveEntryTest(Agent *agent) - : VrouterUveEntry(agent), first_uve_dispatched_(false), - vrouter_msg_count_(0), vrouter_stats_msg_count_(0), - compute_state_send_count_(0), last_sent_vrouter_stats_(), + : VrouterUveEntry(agent), first_uve_dispatched_(false), + vrouter_msg_count_(0), vrouter_stats_msg_count_(0), + compute_state_send_count_(0), last_sent_vrouter_stats_(), last_sent_vrouter_(), first_vrouter_uve_() { } diff --git a/src/vnsw/agent/uve/test/vrouter_uve_entry_test.h b/src/vnsw/agent/uve/test/vrouter_uve_entry_test.h index 25451376497..4f4f23ab94f 100644 --- a/src/vnsw/agent/uve/test/vrouter_uve_entry_test.h +++ b/src/vnsw/agent/uve/test/vrouter_uve_entry_test.h @@ -22,7 +22,7 @@ class VrouterUveEntryTest : public VrouterUveEntry { uint32_t vrouter_stats_msg_count() const { return vrouter_stats_msg_count_; } - uint32_t compute_state_send_count() const + uint32_t compute_state_send_count() const { return compute_state_send_count_; } const VrouterStatsAgent &last_sent_stats() const { return last_sent_vrouter_stats_; diff --git a/src/vnsw/agent/uve/vrouter_uve_entry.h b/src/vnsw/agent/uve/vrouter_uve_entry.h index db97a4f8a64..a515be8f5d9 100644 --- a/src/vnsw/agent/uve/vrouter_uve_entry.h +++ b/src/vnsw/agent/uve/vrouter_uve_entry.h @@ -40,7 +40,7 @@ class VrouterUveEntry : public VrouterUveEntryBase { bool BuildPhysicalInterfaceBandwidth(std::vector &list, uint8_t mins) const; bool BuildPhysicalInterfaceBandwidth(map &imp, - map &omp, + map &omp, uint8_t mins, double &in_util, double &out_util) const; bool BuildPhysicalInterfaceFlowRate(std::map request); private: - void BuildSubnetList(const std::string &subnets, + void BuildSubnetList(const std::string &subnets, VirtualGatewayConfig::SubnetList &results); bool AddVgw(VirtualGatewayInfo &vgw, uint32_t version); bool DeleteVgw(const std::string &interface_name); diff --git a/src/vnsw/agent/vgw/test/test_vgw_dynamic.cc b/src/vnsw/agent/vgw/test/test_vgw_dynamic.cc index 01779a30f20..02404b689c8 100644 --- a/src/vnsw/agent/vgw/test/test_vgw_dynamic.cc +++ b/src/vnsw/agent/vgw/test/test_vgw_dynamic.cc @@ -94,14 +94,14 @@ std::string MakeVgwDeleteList(uint32_t count) { } void ValidateVirtualGatewayConfigTable(uint32_t count, uint32_t route_count) { - VirtualGatewayConfigTable *table = + VirtualGatewayConfigTable *table = Agent::GetInstance()->params()->vgw_config_table(); for (uint32_t i = 0; i < count; ++i) { std::stringstream str; str << "vgw" << i; - VirtualGatewayConfigTable::Table::iterator it = + VirtualGatewayConfigTable::Table::iterator it = table->table().find(VirtualGatewayConfig(str.str())); EXPECT_TRUE(it != table->table().end()); @@ -177,7 +177,7 @@ static void ValidateVgwInterface(InetUnicastRouteEntry *route, if (nh->GetType() != NextHop::INTERFACE) return; - const Interface *intf = + const Interface *intf = static_cast(nh)->GetInterface(); EXPECT_TRUE(intf != NULL); if (intf == NULL) @@ -228,7 +228,7 @@ void ValidateVgwRoute(uint32_t count, uint32_t route_count) { void ValidateVgwDelete(uint32_t count, uint32_t route_count, bool vrf_delete = true) { - VirtualGatewayConfigTable *table = + VirtualGatewayConfigTable *table = Agent::GetInstance()->params()->vgw_config_table(); for (uint32_t i = 0; i < count; ++i) { @@ -237,7 +237,7 @@ void ValidateVgwDelete(uint32_t count, uint32_t route_count, std::stringstream inst; inst << "default-domain:admin:public" << i << ":public" << i; - VirtualGatewayConfigTable::Table::iterator it = + VirtualGatewayConfigTable::Table::iterator it = table->table().find(VirtualGatewayConfig(str.str())); EXPECT_TRUE(it == table->table().end()); @@ -282,7 +282,7 @@ TEST_F(DynamicVgwTest, VgwAddDelete) { ValidateSubnetReceiveRoute(1); ValidateVgwRoute(1, 0); - // Delete + // Delete json = MakeVgwDeleteList(1); pih.DelVgwFromJson(json, err_msg); client->WaitForIdle(); @@ -333,7 +333,7 @@ TEST_F(DynamicVgwTest, VgwChange) { ValidateSubnetReceiveRoute(4); ValidateVgwRoute(4, 0); - // Delete + // Delete json = MakeVgwDeleteList(4); pih.DelVgwFromJson(json, err_msg); client->WaitForIdle(); @@ -343,8 +343,8 @@ TEST_F(DynamicVgwTest, VgwChange) { // create a VM, add VGW to the same VRF, delete VM, check that VRF isnt deleted TEST_F(DynamicVgwTest, ExistingVrfAddVgw) { - struct PortInfo input[] = { - {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, + struct PortInfo input[] = { + {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, }; CreateVmportEnv(input, 1, 0, NULL, "default-domain:admin:public0:public0"); client->WaitForIdle(); @@ -392,8 +392,8 @@ TEST_F(DynamicVgwTest, ExistingVgwAddVrf) { ValidateSubnetReceiveRoute(1); ValidateVgwRoute(1, 0); - struct PortInfo input[] = { - {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, + struct PortInfo input[] = { + {"vnet1", 1, "1.1.1.1", "00:00:00:01:01:01", 1, 1}, }; CreateVmportEnv(input, 1, 0, NULL, "default-domain:admin:public0:public0"); client->WaitForIdle(); diff --git a/src/vnsw/agent/vgw/vgw.cc b/src/vnsw/agent/vgw/vgw.cc index e7229205ffe..06e66cd9cac 100644 --- a/src/vnsw/agent/vgw/vgw.cc +++ b/src/vnsw/agent/vgw/vgw.cc @@ -54,7 +54,7 @@ void VirtualGateway::InterfaceNotify(DBTablePartBase *partition, DBEntryBase *en bool active = intf->ipv4_active(); VirtualGatewayConfig cfg(intf->name()); - VirtualGatewayConfigTable::Table::iterator it = + VirtualGatewayConfigTable::Table::iterator it = vgw_config_table_->table().find(cfg); if (it == vgw_config_table_->table().end()) return; @@ -70,7 +70,7 @@ void VirtualGateway::InterfaceNotify(DBTablePartBase *partition, DBEntryBase *en state->active_ = active; - // Add gateway routes in virtual-network. + // Add gateway routes in virtual-network. // BGP will export the route to other compute nodes VirtualGatewayConfig::SubnetList empty_list; if (active) { @@ -83,7 +83,7 @@ void VirtualGateway::InterfaceNotify(DBTablePartBase *partition, DBEntryBase *en if (active) { // Packets received on fabric vrf and destined to IP address in - // "public" network must reach kernel. Add a route in "fabric" VRF + // "public" network must reach kernel. Add a route in "fabric" VRF // inside vrouter to trap packets destined to "public" network SubnetUpdate(it->vrf_name(), rt_table, it->subnets(), empty_list); } else { diff --git a/src/vnsw/agent/vrouter/flow_stats/flow_export_info.cc b/src/vnsw/agent/vrouter/flow_stats/flow_export_info.cc index c07ebf69295..df46036dd9f 100644 --- a/src/vnsw/agent/vrouter/flow_stats/flow_export_info.cc +++ b/src/vnsw/agent/vrouter/flow_stats/flow_export_info.cc @@ -3,7 +3,7 @@ FlowExportInfo::FlowExportInfo() : flow_(), teardown_time_(0), last_modified_time_(0), - bytes_(0), packets_(0), + bytes_(0), packets_(0), delete_enqueue_time_(0), evict_enqueue_time_(0), gen_id_(0), flow_handle_(FlowEntry::kInvalidFlowHandle) { @@ -11,16 +11,16 @@ FlowExportInfo::FlowExportInfo() : FlowExportInfo::FlowExportInfo(const FlowEntryPtr &fe) : flow_(fe), teardown_time_(0), last_modified_time_(0), - bytes_(0), packets_(0), + bytes_(0), packets_(0), delete_enqueue_time_(0), evict_enqueue_time_(0), gen_id_(0), flow_handle_(FlowEntry::kInvalidFlowHandle) { } FlowExportInfo::FlowExportInfo(const FlowEntryPtr &fe, uint64_t setup_time) : - flow_(fe), + flow_(fe), teardown_time_(0), last_modified_time_(setup_time), - bytes_(0), packets_(0), + bytes_(0), packets_(0), delete_enqueue_time_(0), evict_enqueue_time_(0), gen_id_(0), flow_handle_(FlowEntry::kInvalidFlowHandle) { diff --git a/src/vnsw/agent/vrouter/flow_stats/flow_stats_collector.cc b/src/vnsw/agent/vrouter/flow_stats/flow_stats_collector.cc index ab6b491ba97..5e71d891cd6 100644 --- a/src/vnsw/agent/vrouter/flow_stats/flow_stats_collector.cc +++ b/src/vnsw/agent/vrouter/flow_stats/flow_stats_collector.cc @@ -56,7 +56,7 @@ FlowStatsCollector::FlowStatsCollector(boost::asio::io_service &io, int intvl, request_queue_(agent_uve_->agent()->task_scheduler()-> GetTaskId(kTaskFlowStatsCollector), instance_id, - boost::bind(&FlowStatsCollector::RequestHandler, + boost::bind(&FlowStatsCollector::RequestHandler, this, _1)), flow_aging_key_(*key), instance_id_(instance_id), flow_stats_manager_(aging_module), parent_(obj), ageing_task_(NULL), @@ -786,7 +786,7 @@ bool FlowStatsCollector::Run() { } return true; } - + bool FlowStatsCollector::RunAgeingTask() { // Run ageing per task uint32_t count = RunAgeing(kFlowsPerTask); diff --git a/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc b/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc index c2efb194a65..c30ac90303e 100644 --- a/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc +++ b/src/vnsw/agent/vrouter/flow_stats/flow_stats_manager.cc @@ -367,7 +367,7 @@ void FlowStatsManager::FlowStatsReqHandler(Agent *agent, FlowAgingTableKey(protocol, port)); } else { agent->flow_stats_manager()->Add( - FlowAgingTableKey(protocol, port), + FlowAgingTableKey(protocol, port), agent->params()->flow_stats_interval(), timeout); } } diff --git a/src/vnsw/agent/vrouter/flow_stats/session_stats_collector.cc b/src/vnsw/agent/vrouter/flow_stats/session_stats_collector.cc index 1e7c2c6d98d..91958c69e87 100644 --- a/src/vnsw/agent/vrouter/flow_stats/session_stats_collector.cc +++ b/src/vnsw/agent/vrouter/flow_stats/session_stats_collector.cc @@ -631,7 +631,7 @@ void SessionStatsCollector::AddSession(FlowEntry* fe, uint64_t setup_time) { /* * existing flow should match with the incoming add flow */ - assert(session.fwd_flow.uuid == fe_fwd->uuid()); + assert(session.fwd_flow.uuid == fe_fwd->uuid()); } } } @@ -1119,7 +1119,7 @@ bool SessionStatsCollector::MatchSloForFlow( * Match each type of policy for the given flow against the slo list */ - is_vmi_slo_logged = FindSloMatchRule(vmi_session_slo_rule_map, + is_vmi_slo_logged = FindSloMatchRule(vmi_session_slo_rule_map, fw_policy_uuid, nw_policy_uuid, sg_policy_uuid, diff --git a/src/vnsw/agent/vrouter/flow_stats/test/test_flow_stats.cc b/src/vnsw/agent/vrouter/flow_stats/test/test_flow_stats.cc index 307f8c935cd..c86a86afc6c 100644 --- a/src/vnsw/agent/vrouter/flow_stats/test/test_flow_stats.cc +++ b/src/vnsw/agent/vrouter/flow_stats/test/test_flow_stats.cc @@ -32,7 +32,7 @@ void RouterIdDepInit(Agent *agent) { class FlowStatsTest : public ::testing::Test { public: - FlowStatsTest() : response_count_(0), type_specific_response_count_(0), + FlowStatsTest() : response_count_(0), type_specific_response_count_(0), num_entries_(0), agent_(Agent::GetInstance()), util_() { flow_proto_ = agent_->pkt()->get_flow_proto(); } @@ -147,7 +147,7 @@ TEST_F(FlowStatsTest, SandeshFlowEntries) { FlowEntry *rfe = fe->reverse_flow_entry(); EXPECT_TRUE(fe != NULL); EXPECT_TRUE(rfe != NULL); - + ClearCount(); FlowEntriesGet(); client->WaitForIdle(); @@ -162,7 +162,7 @@ TEST_F(FlowStatsTest, SandeshFlowEntries) { } //Verify that flow_tree maitained by FlowStatsCollector is inserted/erased on -//flow add/delete +//flow add/delete TEST_F(FlowStatsTest, FlowTreeSize) { FlowSetup(); TestFlow flow[] = { @@ -191,7 +191,7 @@ TEST_F(FlowStatsTest, FlowTreeSize) { EXPECT_TRUE(info != NULL); EXPECT_TRUE(rinfo != NULL); EXPECT_EQ(2U, col->Size()); - + ClearCount(); FlowEntriesGet(); client->WaitForIdle(); @@ -277,7 +277,7 @@ TEST_F(FlowStatsTest, FlowAddVerify) { int main(int argc, char *argv[]) { int ret; GETUSERARGS(); - + client = TestInit(init_file, ksync_init, true, false, true, (10 * 60 * 1000), (10 * 60 * 1000), true, true, (10 * 60 * 1000)); diff --git a/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc b/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc index a0994d13328..b9701af0d9a 100644 --- a/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/flowtable_ksync.cc @@ -171,7 +171,7 @@ void FlowTableKSyncEntry::ReleaseToken() { token_.reset(); } -void FlowTableKSyncEntry::SetPcapData(FlowEntryPtr fe, +void FlowTableKSyncEntry::SetPcapData(FlowEntryPtr fe, std::vector &data) { data.clear(); uint32_t addr = ksync_obj_->ksync()->agent()->router_id().to_ulong(); @@ -194,7 +194,7 @@ void FlowTableKSyncEntry::SetPcapData(FlowEntryPtr fe, data.push_back((action >> 16) & 0xFF); data.push_back((action >> 8) & 0xFF); data.push_back((action) & 0xFF); - + data.push_back(FlowEntry::PCAP_SOURCE_VN); data.push_back(fe->data().source_vn_match.size()); data.insert(data.end(), fe->data().source_vn_match.begin(), @@ -269,8 +269,8 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { uint32_t fe_action = flow_entry_->match_p().action_info.action; if ((fe_action) & (1 << TrafficAction::PASS)) { action = VR_FLOW_ACTION_FORWARD; - } - + } + if ((fe_action) & (1 << TrafficAction::DENY)) { action = VR_FLOW_ACTION_DROP; drop_reason = GetDropReason(flow_entry_->data().drop_reason); @@ -281,16 +281,16 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { action = VR_FLOW_ACTION_NAT; } - if (action == VR_FLOW_ACTION_NAT && + if (action == VR_FLOW_ACTION_NAT && flow_entry_->reverse_flow_entry() == NULL) { action = VR_FLOW_ACTION_DROP; } - + if ((fe_action) & (1 << TrafficAction::MIRROR)) { flags |= VR_FLOW_FLAG_MIRROR; req.set_fr_mir_id(-1); req.set_fr_sec_mir_id(-1); - if (flow_entry_->match_p().action_info.mirror_l.size() > + if (flow_entry_->match_p().action_info.mirror_l.size() > FlowEntry::kMaxMirrorsPerFlow) { FLOW_TRACE(Err, hash_id_, "Don't support more than two mirrors/analyzers per " @@ -305,22 +305,22 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { mirror_ksync_obj(); uint16_t idx_1 = obj->GetIdx((*it).analyzer_name); req.set_fr_mir_id(idx_1); - FLOW_TRACE(ModuleInfo, "Mirror index first: " + + FLOW_TRACE(ModuleInfo, "Mirror index first: " + integerToString(idx_1)); ++it; if (it != flow_entry_->match_p().action_info.mirror_l.end()) { uint16_t idx_2 = obj->GetIdx((*it).analyzer_name); if (idx_1 != idx_2) { req.set_fr_sec_mir_id(idx_2); - FLOW_TRACE(ModuleInfo, "Mirror index second: " + + FLOW_TRACE(ModuleInfo, "Mirror index second: " + integerToString(idx_2)); } else { - FLOW_TRACE(Err, hash_id_, + FLOW_TRACE(Err, hash_id_, "Both Mirror indexes are same, hence didn't set " "the second mirror dest."); } } - req.set_fr_mir_vrf(flow_entry_->data().mirror_vrf); + req.set_fr_mir_vrf(flow_entry_->data().mirror_vrf); req.set_fr_mir_sip(htonl(ksync_obj_->ksync()->agent()-> router_id().to_ulong())); req.set_fr_mir_sport(htons(ksync_obj_->ksync()->agent()-> @@ -348,7 +348,7 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { flags |= VR_FLOW_FLAG_DNAT; } - if (flow_entry_->key().protocol == IPPROTO_TCP || + if (flow_entry_->key().protocol == IPPROTO_TCP || flow_entry_->key().protocol == IPPROTO_UDP) { if (flow_entry_->key().src_port != nat_key->dst_port) { flags |= VR_FLOW_FLAG_SPAT; @@ -436,9 +436,9 @@ int FlowTableKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { bool FlowTableKSyncEntry::Sync() { bool changed = false; - + last_event_ = (FlowEvent::Event)flow_entry_->last_event(); - FlowEntry *rev_flow = flow_entry_->reverse_flow_entry(); + FlowEntry *rev_flow = flow_entry_->reverse_flow_entry(); if (rev_flow) { if (old_reverse_flow_id_ != rev_flow->flow_handle()) { if (old_reverse_flow_id_ != FlowEntry::kInvalidFlowHandle) @@ -488,7 +488,7 @@ bool FlowTableKSyncEntry::Sync() { ++it; if (it != flow_entry_->match_p().action_info.mirror_l.end()) { idx = obj->GetIdx((*it).analyzer_name); - if (!((*it).analyzer_name.empty()) && + if (!((*it).analyzer_name.empty()) && (idx == MirrorTable::kInvalidIndex)) { // run time and to update flow entry; ksync_obj_->UpdateUnresolvedFlowEntry(flow_entry_); diff --git a/src/vnsw/agent/vrouter/ksync/interface_ksync.cc b/src/vnsw/agent/vrouter/ksync/interface_ksync.cc index 4e3134c2bb6..d8799b9a51b 100644 --- a/src/vnsw/agent/vrouter/ksync/interface_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/interface_ksync.cc @@ -104,7 +104,7 @@ InterfaceKSyncEntry::InterfaceKSyncEntry(InterfaceKSyncObject *obj, ipv4_active_(false), layer3_forwarding_(true), ksync_obj_(obj), - l2_active_(false), + l2_active_(false), metadata_l2_active_(false), metadata_ip_active_(false), bridging_(true), @@ -112,7 +112,7 @@ InterfaceKSyncEntry::InterfaceKSyncEntry(InterfaceKSyncObject *obj, mac_(), smac_(), mirror_direction_(Interface::UNKNOWN), - os_index_(intf->os_index()), + os_index_(intf->os_index()), parent_(NULL), policy_enabled_(false), sub_type_(InetInterface::VHOST), @@ -664,7 +664,7 @@ int InterfaceKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { switch (type_) { case Interface::VM_INTERFACE: { if (vmi_device_type_ == VmInterface::TOR) - return 0; + return 0; if (drop_new_flows_) { flags |= VIF_FLAG_DROP_NEW_FLOWS; } diff --git a/src/vnsw/agent/vrouter/ksync/interface_ksync.h b/src/vnsw/agent/vrouter/ksync/interface_ksync.h index 5cf3019edc1..97171783710 100644 --- a/src/vnsw/agent/vrouter/ksync/interface_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/interface_ksync.h @@ -41,7 +41,7 @@ class InterfaceKSyncEntry : public KSyncNetlinkDBEntry { InterfaceKSyncEntry(InterfaceKSyncObject *obj, const Interface *intf); virtual ~InterfaceKSyncEntry(); - const MacAddress &mac() const { + const MacAddress &mac() const { if (parent_.get() == NULL) { return mac_; } else { diff --git a/src/vnsw/agent/vrouter/ksync/ksync_init.cc b/src/vnsw/agent/vrouter/ksync/ksync_init.cc index fc990a2720f..4ec675dc5de 100644 --- a/src/vnsw/agent/vrouter/ksync/ksync_init.cc +++ b/src/vnsw/agent/vrouter/ksync/ksync_init.cc @@ -51,7 +51,7 @@ #include "forwarding_class_ksync.h" #include "qos_config_ksync.h" -#define VNSW_GENETLINK_FAMILY_NAME "vnsw" +#define VNSW_GENETLINK_FAMILY_NAME "vnsw" KSync::KSync(Agent *agent) : agent_(agent), interface_ksync_obj_(new InterfaceKSyncObject(this)), diff --git a/src/vnsw/agent/vrouter/ksync/ksync_init.h b/src/vnsw/agent/vrouter/ksync/ksync_init.h index 0dd1b3c6402..5c7e26cbb84 100644 --- a/src/vnsw/agent/vrouter/ksync/ksync_init.h +++ b/src/vnsw/agent/vrouter/ksync/ksync_init.h @@ -37,8 +37,8 @@ class KSync { void UpdateVhostMac(); Agent *agent() const { return agent_; } - MirrorKSyncObject *mirror_ksync_obj() const { - return mirror_ksync_obj_.get(); + MirrorKSyncObject *mirror_ksync_obj() const { + return mirror_ksync_obj_.get(); } NHKSyncObject *nh_ksync_obj() const { return nh_ksync_obj_.get(); @@ -84,11 +84,11 @@ class KSync { } protected: Agent *agent_; - boost::scoped_ptr interface_ksync_obj_; + boost::scoped_ptr interface_ksync_obj_; std::vector flow_table_ksync_obj_list_; - boost::scoped_ptr mpls_ksync_obj_; - boost::scoped_ptr nh_ksync_obj_; - boost::scoped_ptr mirror_ksync_obj_; + boost::scoped_ptr mpls_ksync_obj_; + boost::scoped_ptr nh_ksync_obj_; + boost::scoped_ptr mirror_ksync_obj_; boost::scoped_ptr vrf_ksync_obj_; boost::scoped_ptr vxlan_ksync_obj_; boost::scoped_ptr vrf_assign_ksync_obj_; diff --git a/src/vnsw/agent/vrouter/ksync/mirror_ksync.cc b/src/vnsw/agent/vrouter/ksync/mirror_ksync.cc index 8014c693c3f..8da7549e524 100644 --- a/src/vnsw/agent/vrouter/ksync/mirror_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/mirror_ksync.cc @@ -9,11 +9,11 @@ #include #include "vr_mirror.h" -MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, +MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, const MirrorKSyncEntry *entry, - uint32_t index) : - KSyncNetlinkDBEntry(index), ksync_obj_(obj), vrf_id_(entry->vrf_id_), - sip_(entry->sip_), sport_(entry->sport_), dip_(entry->dip_), + uint32_t index) : + KSyncNetlinkDBEntry(index), ksync_obj_(obj), vrf_id_(entry->vrf_id_), + sip_(entry->sip_), sport_(entry->sport_), dip_(entry->dip_), dport_(entry->dport_), analyzer_name_(entry->analyzer_name_), mirror_flag_(entry->mirror_flag_), vni_(entry->vni_), nic_assisted_mirroring_(entry->nic_assisted_mirroring_), @@ -21,18 +21,18 @@ MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, mirror_index_(entry->mirror_index_) { } -MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, +MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, const uint32_t vrf_id, IpAddress dip, uint16_t dport) : - KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), vrf_id_(vrf_id), + KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), vrf_id_(vrf_id), dip_(dip), dport_(dport) { } MirrorKSyncEntry::MirrorKSyncEntry(MirrorKSyncObject *obj, const MirrorEntry *mirror_entry) : - KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), - vrf_id_(mirror_entry->vrf_id()), sip_(*mirror_entry->GetSip()), - sport_(mirror_entry->GetSPort()), dip_(*mirror_entry->GetDip()), + KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), + vrf_id_(mirror_entry->vrf_id()), sip_(*mirror_entry->GetSip()), + sport_(mirror_entry->GetSPort()), dip_(*mirror_entry->GetDip()), dport_(mirror_entry->GetDPort()), nh_(NULL), analyzer_name_(mirror_entry->GetAnalyzerName()), mirror_flag_(mirror_entry->GetMirrorFlag()), vni_(mirror_entry->GetVni()), @@ -176,7 +176,7 @@ KSyncEntry *MirrorKSyncEntry::UnresolvedReference() { return NULL; } -MirrorKSyncObject::MirrorKSyncObject(KSync *ksync) : +MirrorKSyncObject::MirrorKSyncObject(KSync *ksync) : KSyncDBObject("KSync Mirror", kMirrorIndexCount), ksync_(ksync) { } @@ -188,7 +188,7 @@ void MirrorKSyncObject::RegisterDBClients() { } KSyncEntry *MirrorKSyncObject::Alloc(const KSyncEntry *entry, uint32_t index) { - const MirrorKSyncEntry *mirror_entry = + const MirrorKSyncEntry *mirror_entry = static_cast(entry); MirrorKSyncEntry *ksync = new MirrorKSyncEntry(this, mirror_entry, index); return static_cast(ksync); diff --git a/src/vnsw/agent/vrouter/ksync/mirror_ksync.h b/src/vnsw/agent/vrouter/ksync/mirror_ksync.h index b4befd0b26b..538b1ba8e92 100644 --- a/src/vnsw/agent/vrouter/ksync/mirror_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/mirror_ksync.h @@ -19,9 +19,9 @@ class MirrorKSyncObject; class MirrorKSyncEntry : public KSyncNetlinkDBEntry { public: MirrorKSyncEntry(MirrorKSyncObject *obj, const MirrorEntry *); - MirrorKSyncEntry(MirrorKSyncObject *obj, const MirrorKSyncEntry *entry, + MirrorKSyncEntry(MirrorKSyncObject *obj, const MirrorKSyncEntry *entry, uint32_t index); - MirrorKSyncEntry(MirrorKSyncObject *obj, const uint32_t vrf_id, + MirrorKSyncEntry(MirrorKSyncObject *obj, const uint32_t vrf_id, IpAddress dip, uint16_t dport); MirrorKSyncEntry(MirrorKSyncObject *obj, std::string &analyzer_name); virtual ~MirrorKSyncEntry(); diff --git a/src/vnsw/agent/vrouter/ksync/mpls_ksync.cc b/src/vnsw/agent/vrouter/ksync/mpls_ksync.cc index 08e783ca0b4..f80876a76fa 100644 --- a/src/vnsw/agent/vrouter/ksync/mpls_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/mpls_ksync.cc @@ -14,12 +14,12 @@ MplsKSyncEntry::MplsKSyncEntry(MplsKSyncObject* obj, const MplsKSyncEntry *me, uint32_t index) : - KSyncNetlinkDBEntry(index), ksync_obj_(obj), label_(me->label_), - nh_(NULL) { + KSyncNetlinkDBEntry(index), ksync_obj_(obj), label_(me->label_), + nh_(NULL) { } MplsKSyncEntry::MplsKSyncEntry(MplsKSyncObject* obj, const MplsLabel *mpls) : - KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), + KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), label_(mpls->label()), nh_(NULL) { } @@ -58,7 +58,7 @@ bool MplsKSyncEntry::Sync(DBEntry *e) { assert(0); } NHKSyncEntry next_hop(nh_object, mpls->nexthop()); - NHKSyncEntry *old_nh = nh(); + NHKSyncEntry *old_nh = nh(); nh_ = nh_object->GetReference(&next_hop); if (old_nh != nh()) { @@ -84,7 +84,7 @@ int MplsKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { return encode_len; } -void MplsKSyncEntry::FillObjectLog(sandesh_op::type op, +void MplsKSyncEntry::FillObjectLog(sandesh_op::type op, KSyncMplsInfo &info) const { info.set_label(label_); info.set_nh(nh()->nh_id()); @@ -108,7 +108,7 @@ int MplsKSyncEntry::ChangeMsg(char *buf, int buf_len){ KSyncMplsInfo info; FillObjectLog(sandesh_op::ADD, info); KSYNC_TRACE(Mpls, GetObject(), info); - + return Encode(sandesh_op::ADD, buf, buf_len); } @@ -116,19 +116,19 @@ int MplsKSyncEntry::DeleteMsg(char *buf, int buf_len) { KSyncMplsInfo info; FillObjectLog(sandesh_op::DEL, info); KSYNC_TRACE(Mpls, GetObject(), info); - + return Encode(sandesh_op::DEL, buf, buf_len); } KSyncEntry *MplsKSyncEntry::UnresolvedReference() { - NHKSyncEntry *next_hop = nh(); + NHKSyncEntry *next_hop = nh(); if (!next_hop->IsResolved()) { return next_hop; } return NULL; } -MplsKSyncObject::MplsKSyncObject(KSync *ksync) : +MplsKSyncObject::MplsKSyncObject(KSync *ksync) : KSyncDBObject("KSync Mpls"), ksync_(ksync) { } diff --git a/src/vnsw/agent/vrouter/ksync/nexthop_ksync.cc b/src/vnsw/agent/vrouter/ksync/nexthop_ksync.cc index 209b92c3f59..e3cab145ff4 100644 --- a/src/vnsw/agent/vrouter/ksync/nexthop_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/nexthop_ksync.cc @@ -616,7 +616,7 @@ bool NHKSyncEntry::Sync(DBEntry *e) { interface = interface_object->GetReference(&if_ksync); dmac = arp_nh->GetMac(); } else if (active_nh->GetType() == NextHop::INTERFACE) { - const InterfaceNH *intf_nh = + const InterfaceNH *intf_nh = static_cast(active_nh); const Interface *oper_intf = intf_nh->GetInterface(); InterfaceKSyncObject *interface_object = @@ -873,8 +873,8 @@ int NHKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { switch (type_) { case NextHop::VLAN: - case NextHop::ARP: - case NextHop::INTERFACE : + case NextHop::ARP: + case NextHop::INTERFACE : encoder.set_nhr_type(NH_ENCAP); if (if_ksync) { intf_id = if_ksync->interface_id(); @@ -896,7 +896,7 @@ int NHKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { } if (is_mcast_nh_) { flags |= NH_FLAG_MCAST; - } + } encoder.set_nhr_flags(flags); break; @@ -1134,10 +1134,10 @@ int NHKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { return encode_len; } -void NHKSyncEntry::FillObjectLog(sandesh_op::type op, KSyncNhInfo &info) +void NHKSyncEntry::FillObjectLog(sandesh_op::type op, KSyncNhInfo &info) const { info.set_index(nh_id()); - + if (op == sandesh_op::ADD) { info.set_operation("ADD/CHANGE"); } else { @@ -1218,7 +1218,7 @@ void NHKSyncEntry::FillObjectLog(sandesh_op::type op, KSyncNhInfo &info) info.set_dip(dip_.to_string()); info.set_vrf(vrf_id_); std::vector sub_nh_list; - for (KSyncComponentNHList::const_iterator it = + for (KSyncComponentNHList::const_iterator it = component_nh_list_.begin(); it != component_nh_list_.end(); it++) { KSyncComponentNH component_nh = *it; @@ -1252,7 +1252,7 @@ int NHKSyncEntry::AddMsg(char *buf, int buf_len) { KSyncNhInfo info; FillObjectLog(sandesh_op::ADD, info); KSYNC_TRACE(NH, GetObject(), info); - + return Encode(sandesh_op::ADD, buf, buf_len); } @@ -1348,7 +1348,7 @@ KSyncEntry *NHKSyncEntry::UnresolvedReference() { } case NextHop::COMPOSITE: { - for (KSyncComponentNHList::const_iterator it = + for (KSyncComponentNHList::const_iterator it = component_nh_list_.begin(); it != component_nh_list_.end(); it++) { KSyncComponentNH component_nh = *it; @@ -1400,8 +1400,8 @@ void NHKSyncEntry::SetEncap(InterfaceKSyncEntry *if_ksync, if (type_ == NextHop::VLAN) { smac = &smac_; } else if ((type_ == NextHop::INTERFACE || type_ == NextHop::ARP) - && if_ksync) { - smac = &if_ksync->mac(); + && if_ksync) { + smac = &if_ksync->mac(); } else { Agent *agent = ksync_obj_->ksync()->agent(); diff --git a/src/vnsw/agent/vrouter/ksync/nexthop_ksync.h b/src/vnsw/agent/vrouter/ksync/nexthop_ksync.h index 987fa8c627f..ebf5758add6 100644 --- a/src/vnsw/agent/vrouter/ksync/nexthop_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/nexthop_ksync.h @@ -24,14 +24,14 @@ class NHKSyncObject; class NHKSyncEntry : public KSyncNetlinkDBEntry { public: static const int kDefaultNhMsgSize = 4096; - NHKSyncEntry(NHKSyncObject *obj, const NHKSyncEntry *entry, + NHKSyncEntry(NHKSyncObject *obj, const NHKSyncEntry *entry, uint32_t index); NHKSyncEntry(NHKSyncObject *obj, const NextHop *nh); virtual ~NHKSyncEntry(); const NextHop *nh() { return nh_; } NextHop::Type type() const {return type_;} - InterfaceKSyncEntry *interface() const { + InterfaceKSyncEntry *interface() const { return static_cast(interface_.get()); } InterfaceKSyncEntry *crypt_interface() const { diff --git a/src/vnsw/agent/vrouter/ksync/route_ksync.cc b/src/vnsw/agent/vrouter/ksync/route_ksync.cc index e63183632ed..0c1d1029d57 100644 --- a/src/vnsw/agent/vrouter/ksync/route_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/route_ksync.cc @@ -34,13 +34,13 @@ #include "vr_os.h" #endif -RouteKSyncEntry::RouteKSyncEntry(RouteKSyncObject* obj, - const RouteKSyncEntry *entry, +RouteKSyncEntry::RouteKSyncEntry(RouteKSyncObject* obj, + const RouteKSyncEntry *entry, uint32_t index) : - KSyncNetlinkDBEntry(index), ksync_obj_(obj), - rt_type_(entry->rt_type_), vrf_id_(entry->vrf_id_), - addr_(entry->addr_), src_addr_(entry->src_addr_), mac_(entry->mac_), - prefix_len_(entry->prefix_len_), nh_(entry->nh_), label_(entry->label_), + KSyncNetlinkDBEntry(index), ksync_obj_(obj), + rt_type_(entry->rt_type_), vrf_id_(entry->vrf_id_), + addr_(entry->addr_), src_addr_(entry->src_addr_), mac_(entry->mac_), + prefix_len_(entry->prefix_len_), nh_(entry->nh_), label_(entry->label_), proxy_arp_(false), flood_dhcp_(entry->flood_dhcp_), address_string_(entry->address_string_), tunnel_type_(entry->tunnel_type_), @@ -51,7 +51,7 @@ RouteKSyncEntry::RouteKSyncEntry(RouteKSyncObject* obj, } RouteKSyncEntry::RouteKSyncEntry(RouteKSyncObject* obj, const AgentRoute *rt) : - KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), + KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), vrf_id_(rt->vrf_id()), mac_(), nh_(NULL), label_(0), proxy_arp_(false), flood_dhcp_(false), tunnel_type_(TunnelType::DefaultType()), wait_for_traffic_(false), local_vm_peer_route_(false), @@ -76,7 +76,7 @@ RouteKSyncEntry::RouteKSyncEntry(RouteKSyncObject* obj, const AgentRoute *rt) : break; } case Agent::INET4_MULTICAST: { - const Inet4MulticastRouteEntry *mc_rt = + const Inet4MulticastRouteEntry *mc_rt = static_cast(rt); addr_ = mc_rt->dest_ip_addr(); src_addr_ = mc_rt->src_ip_addr(); @@ -132,7 +132,7 @@ bool RouteKSyncEntry::McIsLess(const KSyncEntry &rhs) const { bool RouteKSyncEntry::L2IsLess(const KSyncEntry &rhs) const { const RouteKSyncEntry &entry = static_cast(rhs); - + if (vrf_id_ != entry.vrf_id_) { return vrf_id_ < entry.vrf_id_; } @@ -491,7 +491,7 @@ bool RouteKSyncEntry::Sync(DBEntry *e) { return ret; } -void RouteKSyncEntry::FillObjectLog(sandesh_op::type type, +void RouteKSyncEntry::FillObjectLog(sandesh_op::type type, KSyncRouteInfo &info) const { if (type == sandesh_op::ADD) { info.set_operation("ADD/CHANGE"); @@ -659,7 +659,7 @@ int RouteKSyncEntry::DeleteMsg(char *buf, int buf_len) { key.set_prefix_len(plen); found = GetObject()->Find(&key); - + if (found) { route = static_cast(found); if (route->IsResolved()) { @@ -850,7 +850,7 @@ void VrfKSyncObject::VrfNotify(DBTablePartBase *partition, DBEntryBase *e) { GetBridgeRouteTable()); state->bridge_route_table_ = new RouteKSyncObject(ksync_, rt_table); - //Now for multicast table. Ksync object for multicast table is + //Now for multicast table. Ksync object for multicast table is //not maintained in vrf list //TODO Enhance ksyncobject for UC/MC, currently there is only one entry //in MC so just use the UC object for time being. @@ -931,7 +931,7 @@ void vr_route_req::Process(SandeshContext *context) { * between IP <-> MAC in ip_mac_binding_ tree. The table is built based on * Evpn routes. * - * When an Inet route is notified, if it needs MAC Stitching, the MAC to + * When an Inet route is notified, if it needs MAC Stitching, the MAC to * stitch is found from the ip_mac_binding_ tree * * Any change to ip_mac_binding_ tree will also result in re-evaluation of diff --git a/src/vnsw/agent/vrouter/ksync/route_ksync.h b/src/vnsw/agent/vrouter/ksync/route_ksync.h index a9e75145c84..2dd0855a8ce 100644 --- a/src/vnsw/agent/vrouter/ksync/route_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/route_ksync.h @@ -25,9 +25,9 @@ class RouteKSyncObject; class RouteKSyncEntry : public KSyncNetlinkDBEntry { public: - RouteKSyncEntry(RouteKSyncObject* obj, const RouteKSyncEntry *entry, + RouteKSyncEntry(RouteKSyncObject* obj, const RouteKSyncEntry *entry, uint32_t index); - RouteKSyncEntry(RouteKSyncObject* obj, const AgentRoute *route); + RouteKSyncEntry(RouteKSyncObject* obj, const AgentRoute *route); virtual ~RouteKSyncEntry(); uint32_t prefix_len() const { return prefix_len_; } @@ -37,7 +37,7 @@ class RouteKSyncEntry : public KSyncNetlinkDBEntry { bool flood_dhcp() const { return flood_dhcp_; } bool wait_for_traffic() const { return wait_for_traffic_; } MacAddress mac() const { return mac_; } - NHKSyncEntry* nh() const { + NHKSyncEntry* nh() const { return static_cast(nh_.get()); } void set_prefix_len(uint32_t len) { prefix_len_ = len; } diff --git a/src/vnsw/agent/vrouter/ksync/sandesh_ksync.h b/src/vnsw/agent/vrouter/ksync/sandesh_ksync.h index f9d1a1cee04..ce422f75a0e 100644 --- a/src/vnsw/agent/vrouter/ksync/sandesh_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/sandesh_ksync.h @@ -19,7 +19,7 @@ class KSyncFlowMemory; class KSyncSandeshContext : public AgentSandeshContext { public: KSyncSandeshContext(KSync *obj) : ksync_(obj) { - Reset(); + Reset(); } virtual void IfMsgHandler(vr_interface_req *req); @@ -61,7 +61,7 @@ class KSyncSandeshContext : public AgentSandeshContext { virtual void FlowResponseHandler(vr_flow_response *r); virtual void VrouterHugePageHandler(vr_hugepage_config *r); virtual void VrouterOpsMsgHandler(vrouter_ops *r); - + int response_code() const { return response_code_; } int context_marker() const { return context_marker_; } void Reset() { diff --git a/src/vnsw/agent/vrouter/ksync/test/ksync_test.cc b/src/vnsw/agent/vrouter/ksync/test/ksync_test.cc index 21ab4fc20bd..5e2440c48b6 100644 --- a/src/vnsw/agent/vrouter/ksync/test/ksync_test.cc +++ b/src/vnsw/agent/vrouter/ksync/test/ksync_test.cc @@ -37,7 +37,7 @@ #include "vrouter/ksync/sandesh_ksync.h" #include "vrouter/ksync/test/ksync_test.h" -KSyncTest::KSyncTest(Agent *agent) +KSyncTest::KSyncTest(Agent *agent) : KSync(agent) { } diff --git a/src/vnsw/agent/vrouter/ksync/test/test_vnswif.cc b/src/vnsw/agent/vrouter/ksync/test/test_vnswif.cc index 0d9d7157e81..b275e5f502b 100644 --- a/src/vnsw/agent/vrouter/ksync/test/test_vnswif.cc +++ b/src/vnsw/agent/vrouter/ksync/test/test_vnswif.cc @@ -86,7 +86,7 @@ class TestVnswIf : public ::testing::Test { void RouteEvent(bool add, const string &ifname, Ip4Address addr, uint8_t plen, uint32_t protocol) { - + VnswInterfaceListener::Event::Type type; if (add) { type = VnswInterfaceListener::Event::ADD_ROUTE; @@ -132,7 +132,7 @@ TEST_F(TestVnswIf, intf_delete) { // Validate that link-local address is added back if route deleted from kernel TEST_F(TestVnswIf, host_route_del) { uint32_t count = vnswif_->ll_add_count(); - VnswInterfaceListener::Event *event = + VnswInterfaceListener::Event *event = new VnswInterfaceListener::Event(VnswInterfaceListener::Event::DEL_ROUTE, vnet1_->mdata_ip_addr(), 32, "", Ip4Address(0), @@ -370,7 +370,7 @@ TEST_F(TestVnswIf, linklocal_1) { uint32_t count = vnswif_->ll_add_count(); // Delete mdata-ip. agent should add it again - RouteEvent(false, "vnet1", vnet1_->mdata_ip_addr(), 32, + RouteEvent(false, "vnet1", vnet1_->mdata_ip_addr(), 32, VnswInterfaceListener::kVnswRtmProto); client->WaitForIdle(); WAIT_FOR(1000, 100, (vnswif_->ll_add_count() >= (count + 1))); @@ -383,7 +383,7 @@ TEST_F(TestVnswIf, linklocal_2) { uint32_t count = vnswif_->ll_del_count(); // Add a dummy route with kVnswRtmProto as protocol. Agent should delete it - RouteEvent(true, "vnet1", Ip4Address::from_string("169.254.1.1"), 32, + RouteEvent(true, "vnet1", Ip4Address::from_string("169.254.1.1"), 32, VnswInterfaceListener::kVnswRtmProto); client->WaitForIdle(); WAIT_FOR(1000, 100, (vnswif_->ll_del_count() >= (count + 1))); diff --git a/src/vnsw/agent/vrouter/ksync/vnswif_listener_base.h b/src/vnsw/agent/vrouter/ksync/vnswif_listener_base.h index 320742d8d27..77a84567aa2 100644 --- a/src/vnsw/agent/vrouter/ksync/vnswif_listener_base.h +++ b/src/vnsw/agent/vrouter/ksync/vnswif_listener_base.h @@ -63,7 +63,7 @@ class VnswInterfaceListenerBase { gw_(0), flags_(flags), protocol_(0), ipam_(false) { } - // Constructor for interface address add/delete/change notification + // Constructor for interface address add/delete/change notification Event(Type event, const std::string &interface, const Ip4Address &addr, uint8_t plen, uint32_t flags, bool ipam) : event_(event), interface_(interface), addr_(addr), plen_(plen), diff --git a/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.cc b/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.cc index b40aa9e805d..aeb2e0cfedb 100644 --- a/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.cc @@ -24,7 +24,7 @@ #include "ksync_init.h" VrfAssignKSyncEntry::VrfAssignKSyncEntry(VrfAssignKSyncObject* obj, - const VrfAssignKSyncEntry *entry, + const VrfAssignKSyncEntry *entry, uint32_t index) : KSyncNetlinkDBEntry(index), ksync_obj_(obj), interface_(entry->interface_), vlan_tag_(entry->vlan_tag_), vrf_id_(entry->vrf_id_), @@ -35,7 +35,7 @@ VrfAssignKSyncEntry::VrfAssignKSyncEntry(VrfAssignKSyncObject* obj, const VrfAssign *vassign) : KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj) { - InterfaceKSyncObject *intf_object = + InterfaceKSyncObject *intf_object = ksync_obj_->ksync()->interface_ksync_obj(); InterfaceKSyncEntry intf(intf_object, vassign->GetInterface()); @@ -58,11 +58,11 @@ VrfAssignKSyncEntry::~VrfAssignKSyncEntry() { } KSyncDBObject *VrfAssignKSyncEntry::GetObject() const { - return ksync_obj_; + return ksync_obj_; } bool VrfAssignKSyncEntry::IsLess(const KSyncEntry &rhs) const { - const VrfAssignKSyncEntry &entry = + const VrfAssignKSyncEntry &entry = static_cast(rhs); if (interface() != entry.interface()) { @@ -78,10 +78,10 @@ std::string VrfAssignKSyncEntry::ToString() const { s << "VRF Assign : "; if (intf) { - s << "Interface : " << intf->interface_name() << - " Intf-Service-Vlan : " << + s << "Interface : " << intf->interface_name() << + " Intf-Service-Vlan : " << (intf->has_service_vlan() == true ? "Enable" : "Disable"); - } else { + } else { s << "Interface : "; } @@ -146,7 +146,7 @@ int VrfAssignKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { encode_len = encoder.WriteBinary((uint8_t *)buf, buf_len, &error); assert(error == 0); assert(encode_len <= buf_len); - LOG(DEBUG, "VRF Assign for Interface <" << intf->interface_name() << + LOG(DEBUG, "VRF Assign for Interface <" << intf->interface_name() << "> Tag <" << vlan_tag() << "> Vrf <" << vrf_id_ << ">"); return encode_len; } @@ -177,7 +177,7 @@ KSyncEntry *VrfAssignKSyncEntry::UnresolvedReference() { return NULL; } -VrfAssignKSyncObject::VrfAssignKSyncObject(KSync *ksync) +VrfAssignKSyncObject::VrfAssignKSyncObject(KSync *ksync) : KSyncDBObject("KSync VrfAssign"), ksync_(ksync) { } @@ -189,7 +189,7 @@ void VrfAssignKSyncObject::RegisterDBClients() { } KSyncEntry *VrfAssignKSyncObject::Alloc(const KSyncEntry *ke, uint32_t index) { - const VrfAssignKSyncEntry *rule = + const VrfAssignKSyncEntry *rule = static_cast(ke); VrfAssignKSyncEntry *ksync = new VrfAssignKSyncEntry(this, rule, index); return static_cast(ksync); diff --git a/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.h b/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.h index 3a10ffd64ba..e4a16ead202 100644 --- a/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/vrf_assign_ksync.h @@ -21,7 +21,7 @@ class VrfAssignKSyncObject; class VrfAssignKSyncEntry : public KSyncNetlinkDBEntry { public: - VrfAssignKSyncEntry(VrfAssignKSyncObject* obj, + VrfAssignKSyncEntry(VrfAssignKSyncObject* obj, const VrfAssignKSyncEntry *entry, uint32_t index); VrfAssignKSyncEntry(VrfAssignKSyncObject* obj, const VrfAssign *rule); virtual ~VrfAssignKSyncEntry(); diff --git a/src/vnsw/agent/vrouter/ksync/vxlan_ksync.cc b/src/vnsw/agent/vrouter/ksync/vxlan_ksync.cc index 6bbff014302..a9d25754ac9 100644 --- a/src/vnsw/agent/vrouter/ksync/vxlan_ksync.cc +++ b/src/vnsw/agent/vrouter/ksync/vxlan_ksync.cc @@ -26,16 +26,16 @@ #include "ksync_init.h" -VxLanIdKSyncEntry::VxLanIdKSyncEntry(VxLanKSyncObject *obj, - const VxLanIdKSyncEntry *entry, +VxLanIdKSyncEntry::VxLanIdKSyncEntry(VxLanKSyncObject *obj, + const VxLanIdKSyncEntry *entry, uint32_t index) : - KSyncNetlinkDBEntry(index), ksync_obj_(obj), label_(entry->label_), - nh_(NULL) { + KSyncNetlinkDBEntry(index), ksync_obj_(obj), label_(entry->label_), + nh_(NULL) { } VxLanIdKSyncEntry::VxLanIdKSyncEntry(VxLanKSyncObject *obj, - const VxLanId *vxlan_id) : - KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), + const VxLanId *vxlan_id) : + KSyncNetlinkDBEntry(kInvalidIndex), ksync_obj_(obj), label_(vxlan_id->vxlan_id()), nh_(NULL) { } @@ -47,7 +47,7 @@ KSyncDBObject *VxLanIdKSyncEntry::GetObject() const { } bool VxLanIdKSyncEntry::IsLess(const KSyncEntry &rhs) const { - const VxLanIdKSyncEntry &entry = + const VxLanIdKSyncEntry &entry = static_cast(rhs); return label_ < entry.label_; @@ -103,7 +103,7 @@ int VxLanIdKSyncEntry::Encode(sandesh_op::type op, char *buf, int buf_len) { return encode_len; } -void VxLanIdKSyncEntry::FillObjectLog(sandesh_op::type op, +void VxLanIdKSyncEntry::FillObjectLog(sandesh_op::type op, KSyncVxLanInfo &info) const { info.set_label(label_); info.set_nh(nh()->nh_id()); @@ -127,7 +127,7 @@ int VxLanIdKSyncEntry::ChangeMsg(char *buf, int buf_len) { KSyncVxLanInfo info; FillObjectLog(sandesh_op::ADD, info); KSYNC_TRACE(VxLan, GetObject(), info); - + return Encode(sandesh_op::ADD, buf, buf_len); } @@ -135,7 +135,7 @@ int VxLanIdKSyncEntry::DeleteMsg(char *buf, int buf_len) { KSyncVxLanInfo info; FillObjectLog(sandesh_op::DEL, info); KSYNC_TRACE(VxLan, GetObject(), info); - + return Encode(sandesh_op::DEL, buf, buf_len); } @@ -147,7 +147,7 @@ KSyncEntry *VxLanIdKSyncEntry::UnresolvedReference() { return NULL; } -VxLanKSyncObject::VxLanKSyncObject(KSync *ksync) +VxLanKSyncObject::VxLanKSyncObject(KSync *ksync) : KSyncDBObject("KSync VxLan"), ksync_(ksync) { } @@ -159,7 +159,7 @@ void VxLanKSyncObject::RegisterDBClients() { } KSyncEntry *VxLanKSyncObject::Alloc(const KSyncEntry *entry, uint32_t index) { - const VxLanIdKSyncEntry *vxlan = + const VxLanIdKSyncEntry *vxlan = static_cast(entry); VxLanIdKSyncEntry *ksync = new VxLanIdKSyncEntry(this, vxlan, index); return static_cast(ksync); diff --git a/src/vnsw/agent/vrouter/ksync/vxlan_ksync.h b/src/vnsw/agent/vrouter/ksync/vxlan_ksync.h index 73c0b2633e8..355cfaec111 100644 --- a/src/vnsw/agent/vrouter/ksync/vxlan_ksync.h +++ b/src/vnsw/agent/vrouter/ksync/vxlan_ksync.h @@ -22,7 +22,7 @@ class VxLanKSyncObject; class VxLanIdKSyncEntry : public KSyncNetlinkDBEntry { public: - VxLanIdKSyncEntry(VxLanKSyncObject *obj, const VxLanIdKSyncEntry *entry, + VxLanIdKSyncEntry(VxLanKSyncObject *obj, const VxLanIdKSyncEntry *entry, uint32_t index); VxLanIdKSyncEntry(VxLanKSyncObject *obj, const VxLanId *label); virtual ~VxLanIdKSyncEntry(); diff --git a/src/vnsw/agent/vrouter/stats_collector/agent_stats_sandesh_context.cc b/src/vnsw/agent/vrouter/stats_collector/agent_stats_sandesh_context.cc index 8ed7e1f645c..de8f1d179a2 100644 --- a/src/vnsw/agent/vrouter/stats_collector/agent_stats_sandesh_context.cc +++ b/src/vnsw/agent/vrouter/stats_collector/agent_stats_sandesh_context.cc @@ -148,7 +148,7 @@ void AgentStatsSandeshContext::VrfStatsMsgHandler(vr_vrf_stats_req *req) { stats->prev_ecmp_composites; stats->l2_mcast_composites = req->get_vsr_l2_mcast_composites() - stats->prev_l2_mcast_composites; - stats->fabric_composites = req->get_vsr_fabric_composites() - + stats->fabric_composites = req->get_vsr_fabric_composites() - stats->prev_fabric_composites; stats->gros = req->get_vsr_gros() - stats->prev_gros; diff --git a/src/vnsw/agent/vxlan_agent/ksync_vxlan_route.h b/src/vnsw/agent/vxlan_agent/ksync_vxlan_route.h index 828a6e6e0f4..0297144042f 100644 --- a/src/vnsw/agent/vxlan_agent/ksync_vxlan_route.h +++ b/src/vnsw/agent/vxlan_agent/ksync_vxlan_route.h @@ -11,13 +11,13 @@ class KSyncVxlanVrfObject; /**************************************************************************** * File contains KSync objects to manage FDB Route table for Vxlan bridge. ****************************************************************************/ - + /**************************************************************************** * In Contrail, each Virtual-Network defines a broadcast domain. Each * Virtual-Network has a VRF associated with it. The FDB Table for a * Virtual-Network is got from the VRF for it. * - * KSyncVxlanVrfObject listens to VRF entries being created and in-turn + * KSyncVxlanVrfObject listens to VRF entries being created and in-turn * create a KSyncVxlanRouteObject for Bridge Route Table in the VRF ****************************************************************************/ class KSyncVxlanVrfObject { @@ -55,7 +55,7 @@ class KSyncVxlanVrfObject { /**************************************************************************** * KSync Object to manage Vxlan FDB Table. A KSyncVxlanRouteObject is created - * for every Bridge Route Table. + * for every Bridge Route Table. * * Registers as client to Bridge Route DBTable ****************************************************************************/ diff --git a/src/vnsw/agent/vxlan_agent/linux/linux_vxlan_agent_init.cc b/src/vnsw/agent/vxlan_agent/linux/linux_vxlan_agent_init.cc index 6b295953794..a5af9be6756 100644 --- a/src/vnsw/agent/vxlan_agent/linux/linux_vxlan_agent_init.cc +++ b/src/vnsw/agent/vxlan_agent/linux/linux_vxlan_agent_init.cc @@ -43,7 +43,7 @@ #include "linux_vxlan_agent_init.h" -LinuxVxlanAgentInit::LinuxVxlanAgentInit() +LinuxVxlanAgentInit::LinuxVxlanAgentInit() : ksync_vxlan_(NULL) { } diff --git a/src/xml/test/xml_test.cc b/src/xml/test/xml_test.cc index c1a22d8a0f5..c420de35290 100644 --- a/src/xml/test/xml_test.cc +++ b/src/xml/test/xml_test.cc @@ -2,7 +2,7 @@ * Copyright (c) 2013 Juniper Networks, Inc. All rights reserved. */ -// +// // xmpp_xml_test.cc // Test code for xml_base.h implementation @@ -30,7 +30,7 @@ class XmlBaseTest : public ::testing::Test { file.close(); return content; } - + virtual void SetUp() { doc_ = XmppXmlImplFactory::Instance()->GetXmlImpl(); data_doc_ = XmppXmlImplFactory::Instance()->GetXmlImpl(); @@ -56,7 +56,7 @@ TEST_F(XmlBaseTest, XmlDecode) { std::string key("iq"); const char *val = doc_->ReadNode(key); - val = doc_->ReadFirstAttrib(); + val = doc_->ReadFirstAttrib(); ASSERT_STREQ(val, "set"); val = doc_->ReadNextAttrib(); ASSERT_STREQ(val, "01020304abcd@domain.org"); @@ -86,7 +86,7 @@ TEST_F(XmlBaseTest, XmlDecode) { doc_->RewindDoc(); val = doc_->ReadChildNode(); - val = doc_->ReadFirstAttrib(); + val = doc_->ReadFirstAttrib(); ASSERT_STREQ(val, "set"); doc_->ReadChildNode(); @@ -99,7 +99,7 @@ TEST_F(XmlBaseTest, XmlDecode) { doc_->ReadChildNode(); val = doc_->ReadFirstAttrib(); ASSERT_STREQ(val, "01020304abcd:vpn-ip-address/32"); - + key = "nlri"; val = doc_->ReadNode(key); ASSERT_STREQ(val, "10.1.2.1/32"); @@ -110,38 +110,38 @@ TEST_F(XmlBaseTest, XmlDecode) { doc_->RewindDoc(); val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "iq"); - + val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "pubsub"); - + val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "publish"); - + val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "item"); - + val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "entry"); - + val = doc_->ReadChildNodeName(); ASSERT_STREQ(val, "nlri"); val = doc_->ReadNodeValue(); ASSERT_STREQ(val, "10.1.2.1/32"); val = doc_->ReadFirstAttrib(); ASSERT_STREQ(val, "1"); - + val = doc_->ReadChildNode(); ASSERT_STREQ(val, "10.1.2.1/32"); - + val = doc_->ReadParentName(); ASSERT_STREQ(val, "nlri"); - + val = doc_->ReadNextNodeName(); ASSERT_STREQ(val, "next-hop"); val = doc_->ReadNextNodeName(); ASSERT_STREQ(val, "version"); - + val = doc_->ReadNextNodeName(); ASSERT_STREQ(val, "label"); @@ -163,7 +163,7 @@ TEST_F (XmlBaseTest, XmlEncode) { doc_->AddAttribute("attrib3", "ex3"); doc_->AddNode("child2", "10.1.1.1"); - stringstream ss; + stringstream ss; doc_->PrintDoc(ss); string encode = ss.str(); @@ -175,7 +175,7 @@ TEST_F (XmlBaseTest, XmlEncode) { TEST_F (XmlBaseTest, XmlIqEncode) { EXPECT_FALSE(doc_ == NULL); - string result = ""; + string result = ""; doc_->LoadDoc(xmls_); doc_->AddNode("iq", ""); @@ -190,7 +190,7 @@ TEST_F (XmlBaseTest, XmlIqEncode) { doc_->AddChildNodeAfter("pubsub", "subscribe", ""); doc_->AddAttribute("node", "vpn-customer-name"); - stringstream ss; + stringstream ss; doc_->PrintDoc(ss); string encode = ss.str(); @@ -201,8 +201,8 @@ TEST_F (XmlBaseTest, XmlIqEncode) { TEST_F (XmlBaseTest, XmlAppendDoc) { EXPECT_FALSE(doc_ == NULL); - string result = ""; - string msg1 = ""; + string result = ""; + string msg1 = ""; string msg2 = ""; doc_->LoadDoc(msg1); @@ -210,7 +210,7 @@ TEST_F (XmlBaseTest, XmlAppendDoc) { doc_->AppendDoc("pubsub", data_doc_); - stringstream ss; + stringstream ss; doc_->PrintDoc(ss); string encode = ss.str(); diff --git a/src/xml/xml_base.cc b/src/xml/xml_base.cc index 603eb63edec..60170ef8e73 100644 --- a/src/xml/xml_base.cc +++ b/src/xml/xml_base.cc @@ -15,8 +15,8 @@ void XmppXmlImplFactory::ReleaseXmlImpl(XmlBase *tmp) { delete tmp; } -XmppXmlImplFactory *XmppXmlImplFactory::Instance() { - if (Inst_ == NULL) +XmppXmlImplFactory *XmppXmlImplFactory::Instance() { + if (Inst_ == NULL) Inst_ = new XmppXmlImplFactory(); return Inst_; } diff --git a/src/xml/xml_base.h b/src/xml/xml_base.h index ec82dd3e146..e9ba5a8e493 100644 --- a/src/xml/xml_base.h +++ b/src/xml/xml_base.h @@ -10,7 +10,7 @@ class XmlBase { public: - // Set new xml doc. Null string means reset to new doc. + // Set new xml doc. Null string means reset to new doc. // Resets previous doc virtual int LoadDoc(const std::string &doc) = 0; @@ -71,14 +71,14 @@ class XmlBase { // Moves node context to immediate parent virtual void RewindNode() = 0; - virtual const char *ReadAttrib(const std::string &str) = 0; + virtual const char *ReadAttrib(const std::string &str) = 0; virtual const char *ReadFirstAttrib() = 0; virtual const char *ReadNextAttrib() = 0; virtual void RewindAttrib() = 0; // Get Parent node. Move node context to parent virtual const char *ReadParentName() = 0; - + virtual void RewindDoc() = 0; virtual void AppendDoc(const std::string &str, XmlBase *a_doc) = 0; @@ -90,7 +90,7 @@ struct XmppXmlImplFactory { public: XmlBase *GetXmlImpl() ; - void ReleaseXmlImpl(XmlBase *tmp); + void ReleaseXmlImpl(XmlBase *tmp); static XmppXmlImplFactory *Instance(); diff --git a/src/xml/xml_pugi.cc b/src/xml/xml_pugi.cc index 53394fc37bf..419bf738059 100644 --- a/src/xml/xml_pugi.cc +++ b/src/xml/xml_pugi.cc @@ -8,7 +8,7 @@ #include "base/logging.h" // This is internal implementation detail specific to this lib to make -// exposed methods efficient. +// exposed methods efficient. //XmlPugi::tmp_(""); pugi::xml_attribute XmlPugi::GAttr; @@ -38,9 +38,9 @@ const char *XmlPugi::ReadNode(const std::string &name) { for (node = node.first_child(); node; node = node.next_sibling()) { // traverse to first plain character data or char data, // skipping XML comments - if (node.type() == pugi::node_pcdata || + if (node.type() == pugi::node_pcdata || node.type() == pugi::node_cdata) - break; + break; } } @@ -66,14 +66,14 @@ const char *XmlPugi::ReadNodeName(const std::string &name) { const char *XmlPugi::ReadNodeValue() { pugi::xml_node node = node_; - + if (node.type() != pugi::node_pi) { for (node = node.first_child(); node; node = node.next_sibling()) { // traverse to first plain character data or char data, // skipping XML comments - if (node.type() == pugi::node_pcdata || + if (node.type() == pugi::node_pcdata || node.type() == pugi::node_cdata) - break; + break; } } return node.value(); @@ -174,8 +174,8 @@ int XmlPugi::LoadDoc(const std::string &document) { RewindDoc(); doc_.reset(); - pugi::xml_parse_result ret = doc_.load_buffer(document.c_str(), document.size(), - pugi::parse_default, + pugi::xml_parse_result ret = doc_.load_buffer(document.c_str(), document.size(), + pugi::parse_default, pugi::encoding_utf8); if (ret == false) { LOG(DEBUG, "XML doc load failed, code: " << ret << " " << ret.description()); @@ -208,7 +208,7 @@ void XmlPugi::AppendDoc(const std::string &node_name, XmlBase *a_doc) { } } - + int XmlPugi::AddNode(const std::string &key, const std::string &value) { pugi::xml_node node; @@ -227,7 +227,7 @@ int XmlPugi::AddNode(const std::string &key, const std::string &value) { int XmlPugi::DeleteNode(const std::string &key) { PugiPredicate p1(key); - pugi::xml_node node = doc_.find_node(p1); + pugi::xml_node node = doc_.find_node(p1); if (IsNull(node)) return -1; @@ -237,13 +237,13 @@ int XmlPugi::DeleteNode(const std::string &key) { int XmlPugi::ModifyNode(const std::string &key, const std::string &value) { PugiPredicate p1(key); - pugi::xml_node node = doc_.find_node(p1); + pugi::xml_node node = doc_.find_node(p1); if (IsNull(node)) return -1; node.text().set(value.c_str()); - SetContext(node); + SetContext(node); return 0; } @@ -263,8 +263,8 @@ int XmlPugi::AddChildNode(const std::string &key, const std::string &value) { return 0; } -int XmlPugi::AddChildNodeAfter(const std::string &node_name, - const std::string &key, +int XmlPugi::AddChildNodeAfter(const std::string &node_name, + const std::string &key, const std::string &value) { PugiPredicate p1(node_name); @@ -280,15 +280,15 @@ int XmlPugi::AddChildNodeAfter(const std::string &node_name, int XmlPugi::AddAttribute(const std::string &key, const std::string &value) { - if (IsNull(node_)) + if (IsNull(node_)) return -1; - pugi::xml_attribute attrib; + pugi::xml_attribute attrib; if (IsNull(attrib_) ) { attrib = node_.append_attribute(key.c_str()) = value.c_str(); } else { - attrib = + attrib = node_.insert_attribute_after(key.c_str(), attrib_) = value.c_str(); } diff --git a/src/xml/xml_pugi.h b/src/xml/xml_pugi.h index aa47dfadf54..600d1b3f141 100644 --- a/src/xml/xml_pugi.h +++ b/src/xml/xml_pugi.h @@ -24,7 +24,7 @@ class XmlPugi : public XmlBase { virtual int AddAttribute(const std::string &key, const std::string &value); virtual int DeleteAttribute(const std::string &key); virtual int ModifyAttribute(const std::string &key, const std::string &value); - + // Read methods virtual const char *ReadNode(const std::string &name); virtual const char *ReadNodeName(const std::string &name); @@ -35,7 +35,7 @@ class XmlPugi : public XmlBase { virtual const char *ReadNextNodeName(); virtual void RewindNode(); - virtual const char *ReadAttrib(const std::string &str); + virtual const char *ReadAttrib(const std::string &str); virtual const char *ReadFirstAttrib(); virtual const char *ReadNextAttrib(); virtual void RewindAttrib(); @@ -54,15 +54,15 @@ class XmlPugi : public XmlBase { struct xmpp_buf_write : pugi::xml_writer { xmpp_buf_write(XmlPugi *arg) : ref(arg) {} - virtual void write(const void *data, size_t sz); + virtual void write(const void *data, size_t sz); XmlPugi *ref; }; void SetBuf(const void *buf, size_t sz); bool IsNull(pugi::xml_node &node) { return node.type() == pugi::node_null; } - bool IsNull(pugi::xml_attribute &attr) { - return attr == NULL; + bool IsNull(pugi::xml_attribute &attr) { + return attr == NULL; } void LoadXmlDoc(const pugi::xml_document &doc) {doc_.reset(doc);} const pugi::xml_document &doc() {return doc_;} @@ -83,7 +83,7 @@ class XmlPugi : public XmlBase { return (strcmp(attr.name(), tmp_.c_str()) == 0); } bool operator()(pugi::xml_node node) const { - return (strcmp(node.name(), tmp_.c_str()) == 0); + return (strcmp(node.name(), tmp_.c_str()) == 0); } PugiPredicate(const std::string &name) : tmp_(name) { } std::string tmp_; @@ -91,7 +91,7 @@ class XmlPugi : public XmlBase { static pugi::xml_attribute GAttr; static pugi::xml_node GNode; - void SetContext(pugi::xml_node node = GNode, + void SetContext(pugi::xml_node node = GNode, pugi::xml_attribute atrib = GAttr); }; diff --git a/src/xmpp/test/xmpp_client_sm_test.cc b/src/xmpp/test/xmpp_client_sm_test.cc index aa7dfd0ba1e..a9f907498a2 100644 --- a/src/xmpp/test/xmpp_client_sm_test.cc +++ b/src/xmpp/test/xmpp_client_sm_test.cc @@ -49,7 +49,7 @@ class XmppStateMachineTest : public ::testing::Test { evm_.reset(new EventManager()); } - ~XmppStateMachineTest() { + ~XmppStateMachineTest() { } virtual void SetUp() { @@ -67,7 +67,7 @@ class XmppStateMachineTest : public ::testing::Test { TcpServerManager::DeleteServer(server_); server_ = NULL; task_util::WaitForIdle(); - + client_->Shutdown(); task_util::WaitForIdle(); TcpServerManager::DeleteServer(client_); @@ -165,7 +165,7 @@ class XmppStateMachineTest : public ::testing::Test { void EvTcpConnected() { session_ = sm_->session(); - sm_->OnSessionEvent(session_,TcpSession::CONNECT_COMPLETE); + sm_->OnSessionEvent(session_,TcpSession::CONNECT_COMPLETE); } void EvXmppOpen() { @@ -174,18 +174,18 @@ class XmppStateMachineTest : public ::testing::Test { msg_->strmtype = XmppStanza::XmppStreamMessage::INIT_STREAM_HEADER; msg_->from = "bgp.contrail.com"; msg_->to = "agent"; - sm_->OnMessage(session_, msg_); + sm_->OnMessage(session_, msg_); } void EvXmppKeepalive() { - XmppStanza::XmppMessage *msg_; + XmppStanza::XmppMessage *msg_; msg_ = new XmppStanza::XmppMessage(XmppStanza::WHITESPACE_MESSAGE_STANZA); msg_->type = XmppStanza::WHITESPACE_MESSAGE_STANZA; sm_->OnMessage(session_, msg_); } void EvXmppMessageStanza() { - XmppStanza::XmppMessage *msg_; + XmppStanza::XmppMessage *msg_; msg_ = new XmppStanza::XmppMessage(XmppStanza::MESSAGE_STANZA); msg_->type = XmppStanza::MESSAGE_STANZA; sm_->OnMessage(session_, msg_); @@ -193,11 +193,11 @@ class XmppStateMachineTest : public ::testing::Test { void EvTcpConnectFailed() { session_ = sm_->session(); - sm_->OnSessionEvent(session_,TcpSession::CONNECT_FAILED); + sm_->OnSessionEvent(session_,TcpSession::CONNECT_FAILED); } void EvTcpClose() { session_ = sm_->session(); - sm_->OnSessionEvent(session_,TcpSession::CLOSE); + sm_->OnSessionEvent(session_,TcpSession::CLOSE); } bool ConnectTimerRunning() { return(sm_->connect_timer_->running()); } @@ -224,7 +224,7 @@ namespace { // OldState : Idle // Event : EvStart -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Idle_EvStart) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -237,7 +237,7 @@ TEST_F(XmppStateMachineTest, Idle_EvStart) { // OldState : Active // Event : EvTcpConnectTimerExpired -// NewState : Connect +// NewState : Connect TEST_F(XmppStateMachineTest, Active_EvTcpConnectTimerExpired) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -255,7 +255,7 @@ TEST_F(XmppStateMachineTest, Active_EvTcpConnectTimerExpired) { // OldState : Active // Event : EvStop -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Active_EvStop) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -273,9 +273,9 @@ TEST_F(XmppStateMachineTest, Active_EvStop) { -// OldState : Connect +// OldState : Connect // Event : EvConnectTimerExpired -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Connect_EvTcpConnectTimerExpired) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -294,9 +294,9 @@ TEST_F(XmppStateMachineTest, Connect_EvTcpConnectTimerExpired) { VerifyState(xmsm::ACTIVE); } -// OldState : Connect +// OldState : Connect // Event : EvConnectFail -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Connect_EvTcpConnectFailed) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -316,9 +316,9 @@ TEST_F(XmppStateMachineTest, Connect_EvTcpConnectFailed) { } -// OldState : Connect +// OldState : Connect // Event : EvTcpConnected -// NewState : OpenSent +// NewState : OpenSent TEST_F(XmppStateMachineTest, Connect_EvTcpConnected) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -337,9 +337,9 @@ TEST_F(XmppStateMachineTest, Connect_EvTcpConnected) { VerifyState(xmsm::OPENSENT); } -// OldState : Connect +// OldState : Connect // Event : EvTcpClose -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Connect_EvTcpClose) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -358,9 +358,9 @@ TEST_F(XmppStateMachineTest, Connect_EvTcpClose) { VerifyState(xmsm::ACTIVE); } -// OldState : Connect +// OldState : Connect // Event : EvStop -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, Connect_EvTcpStop) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -380,9 +380,9 @@ TEST_F(XmppStateMachineTest, Connect_EvTcpStop) { } -// OldState : OpenSent +// OldState : OpenSent // Event : EvXmppOpen -// NewState : Established +// NewState : Established TEST_F(XmppStateMachineTest, OpenSent_EvXmppOpen) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -405,9 +405,9 @@ TEST_F(XmppStateMachineTest, OpenSent_EvXmppOpen) { } -// OldState : OpenSent +// OldState : OpenSent // Event : EvTcpClose -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, OpenSent_EvTcpClose) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -429,9 +429,9 @@ TEST_F(XmppStateMachineTest, OpenSent_EvTcpClose) { VerifyState(xmsm::ACTIVE); } -// OldState : OpenSent +// OldState : OpenSent // Event : EvHoldTimerExpired -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, OpenSent_EvHoldTimerExpired) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -453,9 +453,9 @@ TEST_F(XmppStateMachineTest, OpenSent_EvHoldTimerExpired) { VerifyState(xmsm::ACTIVE); } -// OldState : OpenSent +// OldState : OpenSent // Event : EvStop -// NewState : Active +// NewState : Active TEST_F(XmppStateMachineTest, OpenSent_EvStop) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -478,9 +478,9 @@ TEST_F(XmppStateMachineTest, OpenSent_EvStop) { } -// OldState : Established +// OldState : Established // Event : EvXmppKeepAlive -// NewState : Established +// NewState : Established TEST_F(XmppStateMachineTest, Established_EvXmppKeepAlive) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -505,9 +505,9 @@ TEST_F(XmppStateMachineTest, Established_EvXmppKeepAlive) { VerifyState(xmsm::ESTABLISHED); } -// OldState : Established +// OldState : Established // Event : EvXmppMessageStanza -// NewState : Established +// NewState : Established TEST_F(XmppStateMachineTest, Established_EvXmppMessageReceive) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -532,9 +532,9 @@ TEST_F(XmppStateMachineTest, Established_EvXmppMessageReceive) { VerifyState(xmsm::ESTABLISHED); } -// OldState : Established -// Event : EvHoldTimerExpired -// NewState : Active +// OldState : Established +// Event : EvHoldTimerExpired +// NewState : Active TEST_F(XmppStateMachineTest, Established_EvHoldTimerExpired) { sm_->connect_attempts_inc(); // set attempts as we do not @@ -561,9 +561,9 @@ TEST_F(XmppStateMachineTest, Established_EvHoldTimerExpired) { VerifyState(xmsm::ACTIVE); } -// OldState : Established -// Event : EvHoldTimerExpired -// NewState : Active +// OldState : Established +// Event : EvHoldTimerExpired +// NewState : Active // Event : EvTcpConnectFailed // NewState : Active // Event : EvTcpConnect @@ -606,11 +606,11 @@ TEST_F(XmppStateMachineTest, Established_EvHoldTimerExpired_connectfail) { VerifyState(xmsm::OPENSENT); } -// OldState : Connect +// OldState : Connect // Event : EvTcpConnectFailed -// NewState : Active +// NewState : Active // Event : EvTcpConnected -// NewState : OpenSent +// NewState : OpenSent TEST_F(XmppStateMachineTest, Connect_EvTcpConnectFailed_EvTcpConnected) { sm_->connect_attempts_inc(); // set attempts as we do not diff --git a/src/xmpp/test/xmpp_client_standalone.cc b/src/xmpp/test/xmpp_client_standalone.cc index 1b151795d34..fe6c8ab54da 100644 --- a/src/xmpp/test/xmpp_client_standalone.cc +++ b/src/xmpp/test/xmpp_client_standalone.cc @@ -40,11 +40,11 @@ class XmppBgpMockPeer : public XmppSamplePeer { XmppBgpMockPeer(XmppChannelMux *channel) : XmppSamplePeer(channel) , count_(0) { } - + virtual void ReceiveUpdate(const XmppStanza::XmppMessage *) { count_ ++; } - + size_t Count() const { return count_; } void ResetCount() { count_ = 0; } @@ -54,7 +54,7 @@ class XmppBgpMockPeer : public XmppSamplePeer { class ClientTest { public: - explicit ClientTest(XmppClient *client, XmppInit *init) + explicit ClientTest(XmppClient *client, XmppInit *init) : client_(client), mock_peer_(NULL), count_(0), init_(init), timer_(TimerManager::CreateTimer( *client->event_manager()->io_service(), "Client timer")) { @@ -96,7 +96,7 @@ bool ClientTest::SendTimerExpire() { } else { string data = FileRead("controller/src/xmpp/testdata/pubsub_sub.xml"); uint8_t buf[4096]; - memcpy(buf, data.data(), data.size()); + memcpy(buf, data.data(), data.size()); bool ret = mock_peer_->SendUpdate(buf, data.size()); if (ret == false) { LOG(DEBUG, "send failed"); @@ -118,7 +118,7 @@ int main() { XmppClient *client = new XmppClient(&evm_); XmppChannelConfig *cfg = new XmppChannelConfig(true); XmppInit *init = new XmppInit(); - + cfg->endpoint.address(ip::address::from_string("127.0.0.1")); cfg->endpoint.port(XMPP_SERVER_PORT); cfg->ToAddr = XMPP_CONTROL_SERV; diff --git a/src/xmpp/test/xmpp_pubsub_client.cc b/src/xmpp/test/xmpp_pubsub_client.cc index 75bbf6c3d53..2c86a123d36 100644 --- a/src/xmpp/test/xmpp_pubsub_client.cc +++ b/src/xmpp/test/xmpp_pubsub_client.cc @@ -30,7 +30,7 @@ using namespace std; class XmppBgpMockPeer : public XmppSamplePeer { public: - XmppBgpMockPeer(XmppChannelMux *channel) : + XmppBgpMockPeer(XmppChannelMux *channel) : XmppSamplePeer(channel) { } @@ -74,7 +74,7 @@ class XmppPubSubTest : public ::testing::Test { } virtual void TearDown() { - evm_->Shutdown(); + evm_->Shutdown(); if (thread_.get() != NULL) { thread_->Join(); } diff --git a/src/xmpp/test/xmpp_pubsub_test.cc b/src/xmpp/test/xmpp_pubsub_test.cc index 9fcf51faf92..d13942dc029 100644 --- a/src/xmpp/test/xmpp_pubsub_test.cc +++ b/src/xmpp/test/xmpp_pubsub_test.cc @@ -32,7 +32,7 @@ using namespace std; class XmppBgpMockPeer : public XmppSamplePeer { public: - XmppBgpMockPeer(XmppChannelMux *channel) : + XmppBgpMockPeer(XmppChannelMux *channel) : XmppSamplePeer(channel) , count_(0) { } @@ -82,9 +82,9 @@ class XmppPubSubTest : public ::testing::Test { XmppChannelConfig server_cfg(false); server_cfg.auth_enabled = true; - server_cfg.path_to_server_cert = + server_cfg.path_to_server_cert = "controller/src/xmpp/testdata/server-build02.pem"; - server_cfg.path_to_server_priv_key = + server_cfg.path_to_server_priv_key = "controller/src/xmpp/testdata/server-build02.key"; a_ = new XmppServer(evm_.get(), XMPP_CONTROL_SERV, &server_cfg); thread_.reset(new ServerThread(evm_.get())); @@ -154,11 +154,11 @@ TEST_F(XmppPubSubTest, Connection) { // server channels XmppConnection *sconnection; - // Wait for connection on server. + // Wait for connection on server. TASK_UTIL_EXPECT_TRUE((sconnection = a_->FindConnection(SUB_ADDR)) != NULL); // Check for server, client connection is established. Wait upto 1 sec TASK_UTIL_EXPECT_TRUE(sconnection->GetStateMcState() == xmsm::ESTABLISHED); - XmppBgpMockPeer *bgp_schannel = + XmppBgpMockPeer *bgp_schannel = new XmppBgpMockPeer(sconnection->ChannelMux()); // client channel @@ -208,9 +208,9 @@ TEST_F(XmppPubSubTest, SSl_Connection) { cfg->ToAddr = XMPP_CONTROL_SERV; cfg->FromAddr = SUB_ADDR; cfg->auth_enabled = true; - cfg->path_to_server_cert = + cfg->path_to_server_cert = "controller/src/xmpp/testdata/server-build02.pem"; - cfg->path_to_server_priv_key = + cfg->path_to_server_priv_key = "controller/src/xmpp/testdata/server-build02.key"; b_ = new XmppClient(evm_.get(), cfg); diff --git a/src/xmpp/test/xmpp_regex_test.cc b/src/xmpp/test/xmpp_regex_test.cc index 3ee68ea9d05..0a024ff9dbd 100644 --- a/src/xmpp/test/xmpp_regex_test.cc +++ b/src/xmpp/test/xmpp_regex_test.cc @@ -50,13 +50,13 @@ class XmppRegexMock : public XmppSession { const char *FromOffset() { string::const_iterator end = buf_.end(); - tag_ = string(offset_, end); + tag_ = string(offset_, end); return tag_.c_str(); } const char *Buf() { string::const_iterator st = buf_.begin(); - tag_ = string(st, offset_); + tag_ = string(st, offset_); return tag_.c_str(); } @@ -87,11 +87,11 @@ TEST_F(XmppRegexTest, Connection) { // basic test... regex_->SetString(str); - + // full match int ret = regex_->MatchTest(); EXPECT_TRUE(ret == 0); - ASSERT_STREQ(regex_->TagStr(0), "TagStr(0), "TagStr(0) << std::endl; // expect no match diff --git a/src/xmpp/test/xmpp_sample_peer.cc b/src/xmpp/test/xmpp_sample_peer.cc index afdb89d71dd..b318fdef5e2 100644 --- a/src/xmpp/test/xmpp_sample_peer.cc +++ b/src/xmpp/test/xmpp_sample_peer.cc @@ -9,9 +9,9 @@ #include "base/logging.h" #include "xml/xml_pugi.h" -XmppSamplePeer::XmppSamplePeer(XmppChannel *channel) +XmppSamplePeer::XmppSamplePeer(XmppChannel *channel) : channel_(channel) { - channel_->RegisterReceive(xmps::OTHER, + channel_->RegisterReceive(xmps::OTHER, boost::bind(&XmppSamplePeer::ReceiveInternal, this, _1)); } @@ -26,7 +26,7 @@ XmppSamplePeer::~XmppSamplePeer() { bool XmppSamplePeer::SendUpdate(const uint8_t *msg, size_t size) { if (!channel_) return false; - return channel_->Send(msg, size, + return channel_->Send(msg, size, xmps::OTHER, boost::bind(&XmppSamplePeer::WriteReadyCb, this, _1)); } @@ -47,7 +47,7 @@ void XmppSamplePeer::WriteReadyCb(const boost::system::error_code &ec) { XmppPeerManager::XmppPeerManager(XmppServer *xmpp_server, void *server) { xmpp_server->RegisterConnectionEvent(xmps::BGP, - boost::bind(&XmppPeerManager::XmppHandleConnectionEvent, + boost::bind(&XmppPeerManager::XmppHandleConnectionEvent, this, _1, _2)); } diff --git a/src/xmpp/test/xmpp_server_auth_sm_test.cc b/src/xmpp/test/xmpp_server_auth_sm_test.cc index 5cbc73a2128..11de82614f5 100644 --- a/src/xmpp/test/xmpp_server_auth_sm_test.cc +++ b/src/xmpp/test/xmpp_server_auth_sm_test.cc @@ -62,9 +62,9 @@ class XmppStateMachineTest : public ::testing::Test { virtual void SetUp() { XmppChannelConfig server_cfg(false); // isClient_ = false server_cfg.auth_enabled = true; - server_cfg.path_to_server_cert = + server_cfg.path_to_server_cert = "controller/src/xmpp/testdata/server-build02.pem"; - server_cfg.path_to_server_priv_key = + server_cfg.path_to_server_priv_key = "controller/src/xmpp/testdata/server-build02.key"; server_ = new XmppServer(evm_.get(), XMPP_CONTROL_SERV, &server_cfg); diff --git a/src/xmpp/test/xmpp_server_standalone.cc b/src/xmpp/test/xmpp_server_standalone.cc index 9b754f15259..ef057b6d25e 100644 --- a/src/xmpp/test/xmpp_server_standalone.cc +++ b/src/xmpp/test/xmpp_server_standalone.cc @@ -20,7 +20,7 @@ using namespace boost::asio; class ServerTest; class XmppBgpMockPeer : public XmppSamplePeer { public: - XmppBgpMockPeer(XmppChannel *channel) : + XmppBgpMockPeer(XmppChannel *channel) : XmppSamplePeer(channel), count_(0) { } virtual ~XmppBgpMockPeer() { } @@ -78,7 +78,7 @@ class ServerTest { class XmppPeerManagerMock : public XmppPeerManager { public: - XmppPeerManagerMock(XmppServer *server, ServerTest *test) : + XmppPeerManagerMock(XmppServer *server, ServerTest *test) : XmppPeerManager(server, NULL), test_(test) { } virtual void XmppHandleConnectionEvent(XmppChannel *ch, xmps::PeerState st) { @@ -97,9 +97,9 @@ class XmppPeerManagerMock : public XmppPeerManager { #define XMPP_CONTROL_SERV "bgp.contrail.com" #define XMPP_CONTROL_NODE "bgp-node.contrail.com" -#define XMPP_SERVER_PORT 5288 +#define XMPP_SERVER_PORT 5288 -ServerTest::ServerTest(XmppServer *server) +ServerTest::ServerTest(XmppServer *server) : mock_peer_(NULL), count_(0), timer_(TimerManager::CreateTimer(*server->event_manager()->io_service(), "Server timer")), @@ -117,7 +117,7 @@ bool ServerTest::SendTimerExpire() { } else { string data = FileRead("controller/src/xmpp/testdata/pubsub_sub.xml"); uint8_t buf[4096]; - memcpy(buf, data.data(), data.size()); + memcpy(buf, data.data(), data.size()); bool ret = mock_peer_->SendUpdate(buf, data.size()); if (ret == false) { LOG(DEBUG, "send failed"); diff --git a/src/xmpp/test/xmpp_server_test.cc b/src/xmpp/test/xmpp_server_test.cc index 113e3695b5d..849ddef82c1 100644 --- a/src/xmpp/test/xmpp_server_test.cc +++ b/src/xmpp/test/xmpp_server_test.cc @@ -30,7 +30,7 @@ using namespace std; class XmppBgpMockPeer : public XmppSamplePeer { public: - XmppBgpMockPeer(XmppChannel *channel) : + XmppBgpMockPeer(XmppChannel *channel) : XmppSamplePeer(channel) , count_(0) { } virtual ~XmppBgpMockPeer() { @@ -98,7 +98,7 @@ class XmppServerTest : public ::testing::Test { } } - XmppChannelConfig *CreateXmppChannelCfg(const char *address, int port, + XmppChannelConfig *CreateXmppChannelCfg(const char *address, int port, const string &from, const string &to, bool isClient) { XmppChannelConfig *cfg = new XmppChannelConfig(isClient); @@ -125,9 +125,9 @@ class XmppServerTest : public ::testing::Test { class XmppPeerManagerMock : public XmppPeerManager { public: - XmppPeerManagerMock(XmppServer *x, void *b, XmppServerTest *ptr) : + XmppPeerManagerMock(XmppServer *x, void *b, XmppServerTest *ptr) : XmppPeerManager(x, b), ptr_(ptr), count(0) { } - virtual void XmppHandleConnectionEvent(XmppChannel *channel, + virtual void XmppHandleConnectionEvent(XmppChannel *channel, xmps::PeerState state) { ptr_->XmppConnectionEventCb(channel, state); XmppPeerManager::XmppHandleConnectionEvent(channel, state); @@ -144,7 +144,7 @@ namespace { TEST_F(XmppServerTest, Connection) { xmpp_peer_manager_.reset(new XmppPeerManagerMock(a_, NULL, this)); - + // create a pair of Xmpp channel in server A and client B. XmppConfigData *cfg_b = new XmppConfigData; LOG(DEBUG, "Create client"); @@ -158,7 +158,7 @@ TEST_F(XmppServerTest, Connection) { TASK_UTIL_EXPECT_NE(static_cast(NULL), peer_); xmpp_peer_manager_->VisitPeers( - boost::bind(&XmppPeerManagerMock::XmppVisit, + boost::bind(&XmppPeerManagerMock::XmppVisit, xmpp_peer_manager_.get(), _1)); TASK_UTIL_EXPECT_EQ(1, xmpp_peer_manager_->count); // reset the count for VisitPeers @@ -166,7 +166,7 @@ TEST_F(XmppServerTest, Connection) { // server channels XmppConnection *sconnection; - // Wait for connection on server. + // Wait for connection on server. TASK_UTIL_EXPECT_NE(static_cast(NULL), (sconnection = a_->FindConnection(SUB_ADDR))); // Check for server, client connection is established. Wait upto 1 sec @@ -184,7 +184,7 @@ TEST_F(XmppServerTest, Connection) { // Config update will close the peer from client side // which will generate server side close event and - // callback XmppConnectionEventCb will be called. + // callback XmppConnectionEventCb will be called. TASK_UTIL_EXPECT_EQ(static_cast(NULL), peer_); } diff --git a/src/xmpp/test/xmpp_session_test.cc b/src/xmpp/test/xmpp_session_test.cc index 6493c64e1a9..81ae46ca585 100644 --- a/src/xmpp/test/xmpp_session_test.cc +++ b/src/xmpp/test/xmpp_session_test.cc @@ -34,7 +34,7 @@ using namespace std; class XmppMockConnection; class XmppBgpMockPeer : public XmppSamplePeer { public: - XmppBgpMockPeer(XmppChannelMux *channel) : + XmppBgpMockPeer(XmppChannelMux *channel) : XmppSamplePeer(channel) , count_(0) { } @@ -69,7 +69,7 @@ class XmppMockConnection : public XmppClientConnection { return (byte_count == byte && msg_count == msg); } - bool VerifyPacketCount(XmppStanza::XmppMessageType type, + bool VerifyPacketCount(XmppStanza::XmppMessageType type, uint64_t packets) const { const XmppSession *session = this->session(); if (!session) return false; @@ -166,7 +166,7 @@ class XmppSessionTest : public ::testing::Test { TASK_UTIL_EXPECT_TRUE( sconnection_->GetStateMcState() == xmsm::ESTABLISHED); TASK_UTIL_EXPECT_TRUE( - cconnection_->GetStateMcState() == xmsm::ESTABLISHED); + cconnection_->GetStateMcState() == xmsm::ESTABLISHED); cconnection_->ResetStats(); bgp_server_peer_ = new XmppBgpMockPeer(sconnection_->ChannelMux()); } @@ -179,7 +179,7 @@ class XmppSessionTest : public ::testing::Test { sconnection_ = NULL; } - void SendAndVerify(const char *msg, size_t sendlen, + void SendAndVerify(const char *msg, size_t sendlen, size_t receivelen, size_t no_of_msg) { bgp_server_peer_->SendUpdate((const uint8_t *)msg, sendlen); LOG(DEBUG, "Sent bytes: " << sendlen); @@ -190,7 +190,7 @@ class XmppSessionTest : public ::testing::Test { } // Verify that we received n packets of given xmpp type - void VerifyPacketTypeStats(XmppStanza::XmppMessageType type, + void VerifyPacketTypeStats(XmppStanza::XmppMessageType type, uint64_t packets) { TASK_UTIL_EXPECT_TRUE(cconnection_->VerifyPacketCount(type, packets)); } @@ -330,7 +330,7 @@ TEST_F(XmppSessionTest, Garbage1) { SetupConnection(); uint64_t ws_stats = PacketTypeStats(XmppStanza::WHITESPACE_MESSAGE_STANZA); - string iq_ok(" blah blah "); + string iq_ok(" blah blah "); string garb(" abcSendClose(sconnection_->session()); - ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::ESTABLISHED); - ASSERT_TRUE(cconnection_->GetStateMcState() == xmsm::ESTABLISHED); - + ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::ESTABLISHED); + ASSERT_TRUE(cconnection_->GetStateMcState() == xmsm::ESTABLISHED); + TearDownConnection(); } @@ -383,8 +383,8 @@ TEST_F(XmppSessionTest, KeepAlive) { sleep(4); //ping-pong of KeepAlive shud keep session up. - ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::ESTABLISHED); - ASSERT_TRUE(cconnection_->GetStateMcState() == xmsm::ESTABLISHED); + ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::ESTABLISHED); + ASSERT_TRUE(cconnection_->GetStateMcState() == xmsm::ESTABLISHED); sconnection_->StopKeepAliveTimer(); cconnection_->StopKeepAliveTimer(); @@ -393,7 +393,7 @@ TEST_F(XmppSessionTest, KeepAlive) { sleep(4); //No keepalives, hence server side state-machine set to IDLE. - ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::IDLE); + ASSERT_TRUE(sconnection_->GetStateMcState() == xmsm::IDLE); TearDownConnection(); diff --git a/src/xmpp/test/xmpp_stream_message_client.cc b/src/xmpp/test/xmpp_stream_message_client.cc index a6d715ac97b..afd7db560fb 100644 --- a/src/xmpp/test/xmpp_stream_message_client.cc +++ b/src/xmpp/test/xmpp_stream_message_client.cc @@ -52,18 +52,18 @@ class XmppMockClientConnection : public XmppClientConnection { uint8_t data[2048]; //EncodeStream - auto_ptr open_doc(XmppXmlImplFactory::Instance()->GetXmlImpl()); + auto_ptr open_doc(XmppXmlImplFactory::Instance()->GetXmlImpl()); if (out_of_bound == true) { if (open_doc->LoadDoc(sXMPP_STREAM_OPEN_GOOD) == -1) { return false; } } else if(send_bad_open == true) { - if (open_doc->LoadDoc(sXMPP_STREAM_OPEN_BAD) == -1) { + if (open_doc->LoadDoc(sXMPP_STREAM_OPEN_BAD) == -1) { return false; } send_bad_open = false; } else { - if (open_doc->LoadDoc(sXMPP_STREAM_OPEN_GOOD) == -1) { + if (open_doc->LoadDoc(sXMPP_STREAM_OPEN_GOOD) == -1) { return false; } } @@ -81,7 +81,7 @@ class XmppMockClientConnection : public XmppClientConnection { uint8_t *buf = data; int len = 0; //Returns byte encoded in the doc - if (send_write_doc) { + if (send_write_doc) { len = open_doc->WriteDoc(buf); } else { len = open_doc->WriteRawDoc(buf); @@ -123,7 +123,7 @@ class XmppStreamMessageTest : public ::testing::Test { init_.reset(new XmppInit()); init_->InitServer(a_, 0, false); - + LOG(DEBUG, "Created server at port: " << a_->GetPort()); thread_->Start(); } @@ -205,7 +205,7 @@ class XmppStreamMessageTest : public ::testing::Test { } void TearDownConnection() { - + cconnection_->ManagedDelete(); task_util::WaitForIdle(); @@ -228,21 +228,21 @@ TEST_F(XmppStreamMessageTest, Connection) { // server connection XmppConnection *sconnection_bad; TASK_UTIL_EXPECT_TRUE( - (sconnection_bad = a_->FindConnection(SUB_ADDR)) != NULL); + (sconnection_bad = a_->FindConnection(SUB_ADDR)) != NULL); TASK_UTIL_EXPECT_TRUE(cconnection_->open_count == 2); // server connection XmppConnection *sconnection_good; TASK_UTIL_EXPECT_TRUE( - (sconnection_good = a_->FindConnection(SUB_ADDR)) != NULL); + (sconnection_good = a_->FindConnection(SUB_ADDR)) != NULL); // Check for server, client connection is established. Wait upto 1 sec TASK_UTIL_EXPECT_TRUE( - sconnection_good->GetStateMcState() == xmsm::ESTABLISHED); + sconnection_good->GetStateMcState() == xmsm::ESTABLISHED); TASK_UTIL_EXPECT_TRUE( - cconnection_->GetStateMcState() == xmsm::ESTABLISHED); + cconnection_->GetStateMcState() == xmsm::ESTABLISHED); TearDownConnection(); } @@ -253,14 +253,14 @@ TEST_F(XmppStreamMessageTest, WriteDoc_Connection) { // server connection XmppConnection *sconnection; TASK_UTIL_EXPECT_TRUE( - (sconnection = a_->FindConnection(SUB_ADDR)) != NULL); + (sconnection = a_->FindConnection(SUB_ADDR)) != NULL); // Check for server, client connection is established. Wait upto 1 sec TASK_UTIL_EXPECT_TRUE( - sconnection->GetStateMcState() == xmsm::ESTABLISHED); + sconnection->GetStateMcState() == xmsm::ESTABLISHED); TASK_UTIL_EXPECT_TRUE( - cconnection_->GetStateMcState() == xmsm::ESTABLISHED); + cconnection_->GetStateMcState() == xmsm::ESTABLISHED); TearDownConnection(); } diff --git a/src/xmpp/test/xmpp_stream_message_server.cc b/src/xmpp/test/xmpp_stream_message_server.cc index 2b9593c6f50..af020cf0049 100644 --- a/src/xmpp/test/xmpp_stream_message_server.cc +++ b/src/xmpp/test/xmpp_stream_message_server.cc @@ -54,13 +54,13 @@ class XmppMockServerConnection : public XmppServerConnection { uint8_t data[256]; //EncodeStream - auto_ptr resp_doc(XmppXmlImplFactory::Instance()->GetXmlImpl()); - if (send_bad_open_resp == true) { - if (resp_doc->LoadDoc(sXMPP_STREAM_RESP_BAD) == -1) { + auto_ptr resp_doc(XmppXmlImplFactory::Instance()->GetXmlImpl()); + if (send_bad_open_resp == true) { + if (resp_doc->LoadDoc(sXMPP_STREAM_RESP_BAD) == -1) { return false; } } else { - if (resp_doc->LoadDoc(sXMPP_STREAM_RESP_GOOD) == -1) { + if (resp_doc->LoadDoc(sXMPP_STREAM_RESP_GOOD) == -1) { return false; } } @@ -74,7 +74,7 @@ class XmppMockServerConnection : public XmppServerConnection { uint8_t *buf = data; int len = 0; //Returns byte encoded in the doc - if (send_write_doc) { + if (send_write_doc) { len = resp_doc->WriteDoc(buf); } else { len = resp_doc->WriteRawDoc(buf); @@ -139,7 +139,7 @@ class XmppSessionTest : public ::testing::Test { a_ = new XmppMockServer(evm_.get(), XMPP_CONTROL_SERV); b_ = new XmppClient(evm_.get()); thread_.reset(new ServerThread(evm_.get())); - init_.reset(new XmppInit()); + init_.reset(new XmppInit()); a_->Initialize(0, false); LOG(DEBUG, "Created server at port: " << a_->GetPort()); @@ -157,7 +157,7 @@ class XmppSessionTest : public ::testing::Test { TcpServerManager::DeleteServer(b_); b_ = NULL; - init_->Reset(); + init_->Reset(); evm_->Shutdown(); if (thread_.get() != NULL) { diff --git a/src/xmpp/xmpp_channel.h b/src/xmpp/xmpp_channel.h index b5fb1125021..4ae0e2f8b3b 100644 --- a/src/xmpp/xmpp_channel.h +++ b/src/xmpp/xmpp_channel.h @@ -23,7 +23,7 @@ namespace xmps { CONFIG = 1, BGP = 2, DNS = 3, - OTHER = 4 + OTHER = 4 } PeerId; std::string PeerIdToName(PeerId id); @@ -31,7 +31,7 @@ namespace xmps { class XmppChannel { public: - typedef boost::function + typedef boost::function SendReadyCb; typedef boost::function< void(const XmppStanza::XmppMessage *, xmps::PeerState state) diff --git a/src/xmpp/xmpp_channel_mux.cc b/src/xmpp/xmpp_channel_mux.cc index ead9ee64ce6..16d9e024cef 100644 --- a/src/xmpp/xmpp_channel_mux.cc +++ b/src/xmpp/xmpp_channel_mux.cc @@ -13,7 +13,7 @@ using namespace std; using namespace xmsm; -XmppChannelMux::XmppChannelMux(XmppConnection *connection) +XmppChannelMux::XmppChannelMux(XmppConnection *connection) : connection_(connection), rx_message_trace_cb_(NULL), tx_message_trace_cb_(NULL) { last_received_ = 0; @@ -159,19 +159,19 @@ std::string XmppChannelMux::PeerAddress() const { } inline bool MatchCallback(string to, xmps::PeerId peer) { - if ((to.find(XmppInit::kBgpPeer) != string::npos) && + if ((to.find(XmppInit::kBgpPeer) != string::npos) && (peer == xmps::BGP)) { return true; } - if ((to.find(XmppInit::kConfigPeer) != string::npos) && + if ((to.find(XmppInit::kConfigPeer) != string::npos) && (peer == xmps::CONFIG)) { return true; } - if ((to.find(XmppInit::kDnsPeer) != string::npos) && + if ((to.find(XmppInit::kDnsPeer) != string::npos) && (peer == xmps::DNS)) { return true; } - if ((to.find(XmppInit::kOtherPeer) != string::npos) && + if ((to.find(XmppInit::kOtherPeer) != string::npos) && (peer == xmps::OTHER)) { return true; } @@ -193,7 +193,7 @@ void XmppChannelMux::HandleStateEvent(xmsm::XmState state) { CHECK_CONCURRENCY("xmpp::StateMachine"); xmps::PeerState st = xmps::NOT_READY; if (state == xmsm::ESTABLISHED) { - st = xmps::READY; + st = xmps::READY; } else if (state == xmsm::ACTIVE) { st = xmps::TIMEDOUT; } diff --git a/src/xmpp/xmpp_channel_mux.h b/src/xmpp/xmpp_channel_mux.h index 0890d68cdca..b6ca358c9bc 100644 --- a/src/xmpp/xmpp_channel_mux.h +++ b/src/xmpp/xmpp_channel_mux.h @@ -16,7 +16,7 @@ class XmppConnection; class XmppChannelMux : public XmppChannel { public: - explicit XmppChannelMux(XmppConnection *); + explicit XmppChannelMux(XmppConnection *); virtual ~XmppChannelMux(); virtual void Close(); diff --git a/src/xmpp/xmpp_client.cc b/src/xmpp/xmpp_client.cc index efb16c51336..2fe3834fe2e 100644 --- a/src/xmpp/xmpp_client.cc +++ b/src/xmpp/xmpp_client.cc @@ -39,7 +39,7 @@ class XmppClient::DeleteActor : public LifetimeActor { XmppClient *client_; }; -XmppClient::XmppClient(EventManager *evm) +XmppClient::XmppClient(EventManager *evm) : XmppConnectionManager(evm, ssl::context::tlsv1_client, false, false), config_mgr_(new XmppConfigManager), lifetime_manager_(new LifetimeManager( @@ -94,7 +94,7 @@ XmppClient::XmppClient(EventManager *evm, const XmppChannelConfig *config) exit(EINVAL); } } - + // server certificate ctx->use_certificate_chain_file(config->path_to_server_cert, ec); if (ec.value() != 0) { @@ -127,7 +127,7 @@ bool XmppClient::Initialize(short port) { LifetimeActor *XmppClient::deleter() { return deleter_.get(); } - + LifetimeManager *XmppClient::lifetime_manager() { return lifetime_manager_.get(); } @@ -152,7 +152,7 @@ TcpSession *XmppClient::CreateSession() { return NULL; } -#ifdef __APPLE__ +#ifdef __APPLE__ socket->set_option(reuse_port_t(true), err); #else socket->set_option(reuse_addr_t(true), err); @@ -166,7 +166,7 @@ TcpSession *XmppClient::CreateSession() { err = session->SetSocketOptions(); if (err) { DeleteSession(session); - assert(0); + assert(0); } return session; @@ -177,8 +177,8 @@ void XmppClient::Shutdown() { deleter_->Delete(); } -void -XmppClient::ProcessConfigUpdate(XmppConfigManager::DiffType delta, +void +XmppClient::ProcessConfigUpdate(XmppConfigManager::DiffType delta, const XmppChannelConfig *current, const XmppChannelConfig *future) { if (delta == XmppConfigManager::DF_ADD) { XmppClientConnection *connection = CreateConnection(future); @@ -187,7 +187,7 @@ XmppClient::ProcessConfigUpdate(XmppConfigManager::DiffType delta, if (delta == XmppConfigManager::DF_DELETE) { ConnectionMap::iterator loc = connection_map_.find(current->endpoint); if (loc != connection_map_.end()) { - loc->second->ManagedDelete(); + loc->second->ManagedDelete(); } } } diff --git a/src/xmpp/xmpp_client.h b/src/xmpp/xmpp_client.h index c8cd467753f..8ed50c48342 100644 --- a/src/xmpp/xmpp_client.h +++ b/src/xmpp/xmpp_client.h @@ -29,7 +29,7 @@ class XmppClient : public XmppConnectionManager { void Shutdown(); - typedef boost::function + typedef boost::function ConnectionEventCb; void RegisterConnectionEvent(xmps::PeerId, ConnectionEventCb); void UnRegisterConnectionEvent(xmps::PeerId); @@ -58,9 +58,9 @@ class XmppClient : public XmppConnectionManager { private: class DeleteActor; - friend class XmppSessionTest; - friend class XmppStreamMessageTest; - friend class DeleteActor; + friend class XmppSessionTest; + friend class XmppStreamMessageTest; + friend class DeleteActor; typedef std::map ConnectionMap; typedef std::map ConnectionEventCbMap; diff --git a/src/xmpp/xmpp_config.cc b/src/xmpp/xmpp_config.cc index 995a1a3a764..06a460741a5 100644 --- a/src/xmpp/xmpp_config.cc +++ b/src/xmpp/xmpp_config.cc @@ -30,16 +30,16 @@ int XmppChannelConfig::CompareTo(const XmppChannelConfig &rhs) const { } void XmppConfigManager::PeerConfigDiff(PeerDiffObserver obs) const { - const XmppConfigData::XmppChannelConfigMap &n_current = + const XmppConfigData::XmppChannelConfigMap &n_current = current_->neighbors(); if (future_.get() == NULL) { return; } const XmppConfigData::XmppChannelConfigMap &n_future = future_->neighbors(); - XmppConfigData::XmppChannelConfigMap::const_iterator icurr = + XmppConfigData::XmppChannelConfigMap::const_iterator icurr = n_current.begin(); - XmppConfigData::XmppChannelConfigMap::const_iterator inext = + XmppConfigData::XmppChannelConfigMap::const_iterator inext = n_future.begin(); while (icurr != n_current.end() && inext != n_future.end()) { diff --git a/src/xmpp/xmpp_connection.cc b/src/xmpp/xmpp_connection.cc index d9717cca116..4463a032cac 100644 --- a/src/xmpp/xmpp_connection.cc +++ b/src/xmpp/xmpp_connection.cc @@ -33,7 +33,7 @@ using boost::system::error_code; const char *XmppConnection::kAuthTypeNil = "NIL"; const char *XmppConnection::kAuthTypeTls = "TLS"; -XmppConnection::XmppConnection(TcpServer *server, +XmppConnection::XmppConnection(TcpServer *server, const XmppChannelConfig *config) : server_(server), session_(NULL), @@ -47,7 +47,7 @@ XmppConnection::XmppConnection(TcpServer *server, GetTaskInstance(config->ClientOnly()))), is_client_(config->ClientOnly()), log_uve_(config->logUVE), - admin_down_(false), + admin_down_(false), disable_read_(false), from_(config->FromAddr), to_(config->ToAddr), @@ -441,7 +441,7 @@ bool XmppConnection::KeepAliveTimerExpired() { // Start the timer again, by returning true // return true; -} +} void XmppConnection::KeepaliveTimerErrorHanlder(string error_name, string error_message) { @@ -587,7 +587,7 @@ XmppStanza::XmppMessage *XmppConnection::XmppDecode(const string &msg) { } if (minfo->type == XmppStanza::IQ_STANZA) { - const XmppStanza::XmppMessageIq *iq = + const XmppStanza::XmppMessageIq *iq = static_cast(minfo.get()); @@ -598,7 +598,7 @@ XmppStanza::XmppMessage *XmppConnection::XmppDecode(const string &msg) { if (iq->action.compare("collection") == 0) { if (last_msg_.get() != NULL) { - XmppStanza::XmppMessageIq *last_iq = + XmppStanza::XmppMessageIq *last_iq = static_cast(last_msg_.get()); if (last_iq->node.compare(iq->as_node) == 0) { @@ -704,7 +704,7 @@ class XmppServerConnection::DeleteActor : public LifetimeActor { XmppServerConnection::XmppServerConnection(XmppServer *server, const XmppChannelConfig *config) - : XmppConnection(server, config), + : XmppConnection(server, config), duplicate_(false), on_work_queue_(false), conn_endpoint_(NULL), @@ -845,7 +845,7 @@ class XmppClientConnection::DeleteActor : public LifetimeActor { XmppClientConnection::XmppClientConnection(XmppClient *server, const XmppChannelConfig *config) - : XmppConnection(server, config), + : XmppConnection(server, config), flap_count_(0), deleter_(new DeleteActor(server, this)), server_delete_ref_(this, server->deleter()) { diff --git a/src/xmpp/xmpp_connection.h b/src/xmpp/xmpp_connection.h index b694cd5d221..bbc6f5ec662 100644 --- a/src/xmpp/xmpp_connection.h +++ b/src/xmpp/xmpp_connection.h @@ -64,7 +64,7 @@ class XmppConnection { // Invoked from XmppServer when a session is accepted. virtual bool AcceptSession(XmppSession *session); - virtual void ReceiveMsg(XmppSession *session, const std::string &); + virtual void ReceiveMsg(XmppSession *session, const std::string &); virtual boost::asio::ip::tcp::endpoint endpoint() const; virtual boost::asio::ip::tcp::endpoint local_endpoint() const; diff --git a/src/xmpp/xmpp_init.cc b/src/xmpp/xmpp_init.cc index cfd99792a2c..a5e1b042f37 100644 --- a/src/xmpp/xmpp_init.cc +++ b/src/xmpp/xmpp_init.cc @@ -21,11 +21,11 @@ const char *XmppInit::kDnsNodeJID = "network-dns@contrailsystems.com"; const char *XmppInit::kPubSubNS = "http://jabber.org/protocol/pubsub"; -const char *XmppInit::kJIDControlBgp = +const char *XmppInit::kJIDControlBgp = "network-control@contrailsystems.com/bgp-peer"; -const char *XmppInit::kJIDControlDns = +const char *XmppInit::kJIDControlDns = "network-control@contrailsystems.com/dns-peer"; -const char *XmppInit::kFqnPrependAgentNodeJID = +const char *XmppInit::kFqnPrependAgentNodeJID = "default-global-system-config:"; const char *XmppInit::kConfigPeer = "config"; const char *XmppInit::kBgpPeer = "bgp-peer"; @@ -36,7 +36,7 @@ const char *XmppInit::kOtherPeer = "other-peer"; SandeshTraceBufferPtr XmppMessageTraceBuf(SandeshTraceBufferCreate(XMPP_MESSAGE_TRACE_BUF, 5000)); SandeshTraceBufferPtr XmppTraceBuf(SandeshTraceBufferCreate(XMPP_TRACE_BUF, 1000)); -XmppInit::XmppInit() +XmppInit::XmppInit() : g_server_(NULL), g_client_(NULL), cfg_(new XmppConfigData) { } @@ -78,7 +78,7 @@ bool XmppInit::InitServer(XmppServer *server, int port, bool logUVE) { } XmppChannelConfig *XmppInit::AllocChannelConfig( - const string &peer_ip, int port, const string &from, const string &to, + const string &peer_ip, int port, const string &from, const string &to, const string &node, bool isClient) { boost::system::error_code ec; boost::asio::ip::address peer_addr = diff --git a/src/xmpp/xmpp_init.h b/src/xmpp/xmpp_init.h index 70ce35cf0a0..5a5b67dd8d2 100644 --- a/src/xmpp/xmpp_init.h +++ b/src/xmpp/xmpp_init.h @@ -32,12 +32,12 @@ class XmppInit { void InitClient(XmppClient *); bool InitServer(XmppServer *, int port, bool logUVE); - void AddXmppChannelConfig(XmppChannelConfig *); + void AddXmppChannelConfig(XmppChannelConfig *); XmppChannelConfig *AllocChannelConfig(const std::string &peer_ip, int port, - const std::string &from, - const std::string &to, - const std::string &node, - bool isClient); + const std::string &from, + const std::string &to, + const std::string &node, + bool isClient); private: XmppServer *g_server_; XmppClient *g_client_; diff --git a/src/xmpp/xmpp_proto.cc b/src/xmpp/xmpp_proto.cc index 98cb51cab56..784a087efe4 100644 --- a/src/xmpp/xmpp_proto.cc +++ b/src/xmpp/xmpp_proto.cc @@ -26,7 +26,7 @@ auto_ptr XmppProto::open_doc_(AllocXmppXmlImpl(sXMPP_STREAM_OPEN)); XmppStanza::XmppStanza() { } -XmppProto::XmppProto() { +XmppProto::XmppProto() { } XmppProto::~XmppProto() { @@ -64,7 +64,7 @@ int XmppProto::EncodeStream(const XmppStreamMessage &str, string &to, return len; } -int XmppProto::EncodeStream(const XmppStanza::XmppMessage &str, uint8_t *buf, +int XmppProto::EncodeStream(const XmppStanza::XmppMessage &str, uint8_t *buf, size_t size) { int ret = 0; @@ -85,7 +85,7 @@ int XmppProto::EncodePresence(uint8_t *buf, size_t size) { return 0; } -int XmppProto::EncodeIq(const XmppStanza::XmppMessageIq *iq, +int XmppProto::EncodeIq(const XmppStanza::XmppMessageIq *iq, XmlBase *doc, uint8_t *buf, size_t size) { auto_ptr send_doc_(AllocXmppXmlImpl()); @@ -94,16 +94,16 @@ int XmppProto::EncodeIq(const XmppStanza::XmppMessageIq *iq, send_doc_->AddNode("iq", ""); switch(iq->stype) { - case XmppStanza::XmppMessageIq::GET: + case XmppStanza::XmppMessageIq::GET: send_doc_->AddAttribute("type", "get"); break; - case XmppStanza::XmppMessageIq::SET: + case XmppStanza::XmppMessageIq::SET: send_doc_->AddAttribute("type", "set"); break; - case XmppStanza::XmppMessageIq::RESULT: + case XmppStanza::XmppMessageIq::RESULT: send_doc_->AddAttribute("type", "result"); break; - case XmppStanza::XmppMessageIq::ERROR: + case XmppStanza::XmppMessageIq::ERROR: send_doc_->AddAttribute("type", "error"); break; default: @@ -126,7 +126,7 @@ int XmppProto::EncodeIq(const XmppStanza::XmppMessageIq *iq, int XmppProto::EncodeWhitespace(uint8_t *buf) { string str(sXMPP_WHITESPACE); - + int len = str.size(); if (len > 0) { memcpy(buf, str.data(), len); @@ -144,8 +144,8 @@ int XmppProto::EncodeOpenResp(uint8_t *buf, string &to, string &from, return 0; } - SetTo(to, resp_doc.get()); - SetFrom(from, resp_doc.get()); + SetTo(to, resp_doc.get()); + SetFrom(from, resp_doc.get()); std::stringstream ss; resp_doc->PrintDoc(ss); @@ -169,8 +169,8 @@ int XmppProto::EncodeOpen(uint8_t *buf, string &to, string &from, return 0; } - SetTo(to, open_doc_.get()); - SetFrom(from, open_doc_.get()); + SetTo(to, open_doc_.get()); + SetFrom(from, open_doc_.get()); SetXmlns(xmlns, open_doc_.get()); //Returns byte encoded in the doc @@ -248,10 +248,10 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( XmppStanza::XmppMessageIq *msg = new XmppStanza::XmppMessageIq; impl->ReadNode(iq); - msg->to = XmppProto::GetTo(impl); - msg->from = XmppProto::GetFrom(impl); - msg->id = XmppProto::GetId(impl); - msg->iq_type = XmppProto::GetType(impl); + msg->to = XmppProto::GetTo(impl); + msg->from = XmppProto::GetFrom(impl); + msg->id = XmppProto::GetId(impl); + msg->iq_type = XmppProto::GetType(impl); // action is subscribe,publish,collection const char *action = XmppProto::GetAction(impl, msg->iq_type); if (action) { @@ -288,7 +288,7 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( goto done; } XmppStanza::XmppMessage *msg = new XmppStanza::XmppChatMessage( - STATE_NONE); + STATE_NONE); impl->ReadNode(sXMPP_MESSAGE_KEY); msg->to = XmppProto::GetTo(impl); @@ -305,9 +305,9 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( string ts_tmp = ts; ts_tmp.erase(std::remove(ts_tmp.begin(), ts_tmp.end(), '\n'), ts_tmp.end()); - if ((ts_tmp.compare(0, strlen(sXMPP_STREAM_START), - sXMPP_STREAM_START) != 0) && - (ts_tmp.compare(0, strlen(sXMPP_STREAM_START_S), + if ((ts_tmp.compare(0, strlen(sXMPP_STREAM_START), + sXMPP_STREAM_START) != 0) && + (ts_tmp.compare(0, strlen(sXMPP_STREAM_START_S), sXMPP_STREAM_START_S) != 0)) { XMPP_WARNING(XmppBadMessage, connection->ToUVEKey(), XMPP_PEER_DIR_IN, @@ -316,8 +316,8 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( } // check if the buf is xmpp open or response message - // As end tag will be missing we need to modify the - // string for stream open, else dom decoder will fail + // As end tag will be missing we need to modify the + // string for stream open, else dom decoder will fail boost::algorithm::replace_last(ts_tmp, ">", "/>"); if (impl->LoadDoc(ts_tmp) == -1) { XMPP_WARNING(XmppBadMessage, connection->ToUVEKey(), @@ -325,12 +325,12 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( goto done; } - XmppStanza::XmppStreamMessage *strm = + XmppStanza::XmppStreamMessage *strm = new XmppStanza::XmppStreamMessage(); strm->strmtype = XmppStanza::XmppStreamMessage::INIT_STREAM_HEADER; impl->ReadNode(ns); - strm->to = XmppProto::GetTo(impl); - strm->from = XmppProto::GetFrom(impl); + strm->to = XmppProto::GetTo(impl); + strm->from = XmppProto::GetFrom(impl); strm->xmlns = XmppProto::GetXmlns(impl); ret = strm; @@ -386,7 +386,7 @@ XmppStanza::XmppMessage *XmppProto::DecodeInternal( } else if (ts.find_first_of(sXMPP_VALIDWS) != string::npos) { - XmppStanza::XmppMessage *msg = + XmppStanza::XmppMessage *msg = new XmppStanza::XmppMessage(WHITESPACE_MESSAGE_STANZA); return msg; } else { @@ -405,7 +405,7 @@ int XmppProto::SetTo(string &to, XmlBase *doc) { string ns(sXMPP_STREAM_O); doc->ReadNode(ns); doc->ModifyAttribute("to", to); - + return 0; } diff --git a/src/xmpp/xmpp_proto.h b/src/xmpp/xmpp_proto.h index 236e7da43d1..fd5d557649c 100644 --- a/src/xmpp/xmpp_proto.h +++ b/src/xmpp/xmpp_proto.h @@ -50,7 +50,7 @@ class XmppStanza { class XmppMessage { public: - explicit XmppMessage(XmppMessageType type) : + explicit XmppMessage(XmppMessageType type) : type(type), from(""), to("") { } virtual ~XmppMessage(){ } @@ -77,7 +77,7 @@ class XmppStanza { FEATURE_SASL = 3, FEATURE_TLS = 4, FEAUTRE_COMPRESS_LZW = 5, - CLOSE_STREAM = 6 + CLOSE_STREAM = 6 }; enum XmppStreamSASL { @@ -95,20 +95,20 @@ class XmppStanza { }; enum XmppMessageStateType { - STATE_NONE = 0, STATE_ACTIVE = 1, STATE_COMPOSING = 2, + STATE_NONE = 0, STATE_ACTIVE = 1, STATE_COMPOSING = 2, STATE_PAUSED = 3, STATE_INACTIVE = 4, STATE_GONE = 5 }; struct XmppChatMessage : public XmppMessage { - explicit XmppChatMessage(XmppMessageStateType stype): + explicit XmppChatMessage(XmppMessageStateType stype): XmppMessage(MESSAGE_STANZA), state(stype) { }; enum XmppMessageSubtype { NORMAL = 1, CHAT = 2, GROUPCHAT = 3, - HEADLINE = 4, + HEADLINE = 4, ERROR = 5 }; @@ -175,14 +175,14 @@ class XmppProto : public XmppStanza { static XmppStanza::XmppMessage *Decode(const XmppConnection *connection, const std::string &ts); - static int EncodeStream(const XmppStreamMessage &str, std::string &to, + static int EncodeStream(const XmppStreamMessage &str, std::string &to, std::string &from, const std::string &xmlns, uint8_t *data, size_t size); static int EncodeStream(const XmppMessage &str, uint8_t *data, size_t size); static int EncodeMessage(const XmppChatMessage *, uint8_t *data, size_t size); static int EncodeMessage(XmlBase *, uint8_t *data, size_t size); static int EncodePresence(uint8_t *data, size_t size); - static int EncodeIq(const XmppMessageIq *iq, XmlBase *doc, + static int EncodeIq(const XmppMessageIq *iq, XmlBase *doc, uint8_t *data, size_t size); private: @@ -210,7 +210,7 @@ class XmppProto : public XmppStanza { static XmppStanza::XmppMessage *DecodeInternal( const XmppConnection *connection, const std::string &ts, - XmlBase *impl); + XmlBase *impl); static std::auto_ptr open_doc_; diff --git a/src/xmpp/xmpp_server.cc b/src/xmpp/xmpp_server.cc index 412177690e4..ac4c02d51ca 100644 --- a/src/xmpp/xmpp_server.cc +++ b/src/xmpp/xmpp_server.cc @@ -56,7 +56,7 @@ XmppServer::XmppServer(EventManager *evm, const string &server_addr, max_connections_(0), lifetime_manager_(XmppObjectFactory::Create( TaskScheduler::GetInstance()->GetTaskId("bgp::Config"))), - deleter_(new DeleteActor(this)), + deleter_(new DeleteActor(this)), server_addr_(server_addr), log_uve_(false), auth_enabled_(config->auth_enabled), @@ -197,12 +197,12 @@ XmppServer::XmppServer(EventManager *evm, const string &server_addr) } -XmppServer::XmppServer(EventManager *evm) +XmppServer::XmppServer(EventManager *evm) : XmppConnectionManager(evm, ssl::context::tlsv1_server, false, false), max_connections_(0), lifetime_manager_(new LifetimeManager( TaskScheduler::GetInstance()->GetTaskId("bgp::Config"))), - deleter_(new DeleteActor(this)), + deleter_(new DeleteActor(this)), log_uve_(false), auth_enabled_(false), tcp_hold_time_(XmppChannelConfig::kTcpHoldTime), @@ -348,7 +348,7 @@ TcpSession *XmppServer::CreateSession() { SOL_SOCKET, SO_REUSEPORT> reuse_port_t; #else SOL_SOCKET, SO_REUSEADDR> reuse_addr_t; -#endif +#endif TcpSession *session = TcpServer::CreateSession(); Socket *socket = session->socket(); @@ -358,7 +358,7 @@ TcpSession *XmppServer::CreateSession() { XMPP_WARNING(ServerOpenFail, err.message()); } -#ifdef __APPLE__ +#ifdef __APPLE__ socket->set_option(reuse_port_t(true), err); #else socket->set_option(reuse_addr_t(true), err); @@ -431,7 +431,7 @@ void XmppServer::ClearAllConnections() { } } -void XmppServer::RegisterConnectionEvent(xmps::PeerId id, +void XmppServer::RegisterConnectionEvent(xmps::PeerId id, ConnectionEventCb cb) { connection_event_map_.insert(make_pair(id, cb)); } @@ -442,7 +442,7 @@ void XmppServer::UnRegisterConnectionEvent(xmps::PeerId id) { connection_event_map_.erase(it); } -void XmppServer::NotifyConnectionEvent(XmppChannelMux *mux, +void XmppServer::NotifyConnectionEvent(XmppChannelMux *mux, xmps::PeerState state) { ConnectionEventCbMap::iterator iter = connection_event_map_.begin(); for (; iter != connection_event_map_.end(); ++iter) { @@ -575,7 +575,7 @@ void XmppServer::SetDscpValue(uint8_t value) { // before the connection WorkQueue is drained. // bool XmppServer::DequeueConnection(XmppServerConnection *connection) { - CHECK_CONCURRENCY("bgp::Config"); + CHECK_CONCURRENCY("bgp::Config"); connection->clear_on_work_queue(); // This happens if the XmppServer got deleted while the XmppConnnection diff --git a/src/xmpp/xmpp_state_machine.h b/src/xmpp/xmpp_state_machine.h index dcd8d5b39e5..6d678ed93f8 100644 --- a/src/xmpp/xmpp_state_machine.h +++ b/src/xmpp/xmpp_state_machine.h @@ -160,11 +160,11 @@ class XmppStateMachine : void unconsumed_event(const sc::event_base &event); - void SendConnectionInfo(const std::string &event, + void SendConnectionInfo(const std::string &event, const std::string &nextstate = ""); - void SendConnectionInfo(XmppConnectionInfo *info, const std::string &event, - const std::string &nextstate = ""); + void SendConnectionInfo(XmppConnectionInfo *info, const std::string &event, + const std::string &nextstate = ""); void ResurrectOldConnection(XmppConnection *connection, XmppSession *session); diff --git a/src/xmpp/xmpp_str.h b/src/xmpp/xmpp_str.h index ac036700a79..84ad214fd64 100644 --- a/src/xmpp/xmpp_str.h +++ b/src/xmpp/xmpp_str.h @@ -37,15 +37,15 @@ //Encoded stream messages -#define sXMPP_STREAM_OPEN "" -#define sXMPP_STREAM_RESP "" +#define sXMPP_STREAM_OPEN "" +#define sXMPP_STREAM_RESP "" #define sXMPP_STREAM_FEATURE_TLS "" #define sXMPP_STREAM_START_TLS "" #define sXMPP_STREAM_PROCEED_TLS "" #define sXMPP_WHITESPACE "Ȁ" //unicode U+0200 as whitespace // Whitespace characters allowed as fillers between xmpp messages. -#define sXMPP_VALIDWS " \n\r\tȀ" +#define sXMPP_VALIDWS " \n\r\tȀ" #define sXMPP_CHAT_MSG " msg log " #define sXMPP_STREAM_START "