[post-merge] fix

Author: zeeshanlakhani

dpd-client/tests/integration_tests/mcast.rs

@@ -14,11 +14,11 @@ use crate::integration_tests::common;
 use crate::integration_tests::common::prelude::*;
 use ::common::network::MacAddr;
 use anyhow::anyhow;
-use dpd_client::{Error, types};
+use dpd_client::{types, Error};
 use dpd_types::mcast::ADMIN_LOCAL_PREFIX;
 use futures::TryStreamExt;
 use oxnet::MulticastMac;
-use packet::{Endpoint, eth, geneve, ipv4, ipv6, udp};
+use packet::{eth, geneve, ipv4, ipv6, udp, Endpoint};
 
 const MULTICAST_TEST_IPV4: Ipv4Addr = Ipv4Addr::new(224, 0, 1, 0);
 const MULTICAST_TEST_IPV6: Ipv6Addr =
@@ -1914,8 +1914,8 @@ async fn test_ipv4_multicast_basic_replication_nat_ingress() -> TestResult {
 
 #[tokio::test]
 #[ignore]
-async fn test_encapped_multicast_geneve_mcast_tag_to_external_members()
--> TestResult {
+async fn test_encapped_multicast_geneve_mcast_tag_to_external_members(
+) -> TestResult {
     let switch = &*get_switch().await;
 
     // Define test ports
@@ -2056,8 +2056,8 @@ async fn test_encapped_multicast_geneve_mcast_tag_to_external_members()
 
 #[tokio::test]
 #[ignore]
-async fn test_encapped_multicast_geneve_mcast_tag_to_underlay_members()
--> TestResult {
+async fn test_encapped_multicast_geneve_mcast_tag_to_underlay_members(
+) -> TestResult {
     let switch = &*get_switch().await;
 
     // Define test ports
@@ -2195,8 +2195,8 @@ async fn test_encapped_multicast_geneve_mcast_tag_to_underlay_members()
 
 #[tokio::test]
 #[ignore]
-async fn test_encapped_multicast_geneve_mcast_tag_to_underlay_and_external_members()
--> TestResult {
+async fn test_encapped_multicast_geneve_mcast_tag_to_underlay_and_external_members(
+) -> TestResult {
     let switch = &*get_switch().await;
 
     // Define test ports
@@ -3900,6 +3900,10 @@ async fn test_multicast_reset_all_tables() -> TestResult {
     Ok(())
 }
 
+/*
+ * Commented out untl https://github.com/oxidecomputer/dendrite/issues/107 is
+ * fixed
+ *
 #[tokio::test]
 #[ignore]
 async fn test_multicast_vlan_translation_not_possible() -> TestResult {
@@ -3976,6 +3980,7 @@ async fn test_multicast_vlan_translation_not_possible() -> TestResult {
         .unwrap();
     cleanup_test_group(switch, internal_multicast_ip, TEST_TAG).await
 }
+*/
 
 #[tokio::test]
 #[ignore]

dpd-client/tests/integration_tests/service.rs

@@ -174,9 +174,7 @@ async fn test_service_ipv4_wrong_port() -> TestResult {
 }
 
 // Packets sent to an IP address not assigned to a switch port should be
-// dropped when the port is configured as NAT-only (see issue #172).
-// Without NAT-only, such packets would instead trigger ICMP_DEST_UNREACHABLE
-// via the router.
+// dropped.
 #[tokio::test]
 #[ignore]
 async fn test_service_ipv4_unknown_address() -> TestResult {
@@ -197,31 +195,31 @@ async fn test_service_ipv4_unknown_address() -> TestResult {
         .await
         .unwrap();
 
+    // Mark the port as NAT-only
+    switch
+        .client
+        .link_nat_only_set(&port_id, &link_id, true)
+        .await
+        .unwrap();
+
     let send_pkt = common::gen_udp_packet(
         Endpoint::parse("e0:d5:5e:67:89:ab", "10.10.10.10", 3333).unwrap(),
         Endpoint::parse(router_mac, "192.10.12.1", 4444).unwrap(),
     );
 
     let send = TestPacket {
         packet: Arc::new(send_pkt),
-        port: PhysPort(ingress + 1),
+        port: PhysPort(ingress),
     };
 
-    // Mark the ingress port as NAT-only so packets to unknown addresses are
-    // dropped rather than triggering ICMP_UNREACHABLE (see issue #172).
-    let (ingress_port_id, ingress_link_id) =
-        switch.link_id(PhysPort(ingress + 1)).unwrap();
-    switch
-        .client
-        .link_nat_only_set(&ingress_port_id, &ingress_link_id, true)
-        .await
-        .unwrap();
     let result = switch.packet_test(vec![send], Vec::new());
+    // Clear the port's NAT-only property
     switch
         .client
-        .link_nat_only_set(&ingress_port_id, &ingress_link_id, false)
+        .link_nat_only_set(&port_id, &link_id, false)
         .await
         .unwrap();
+
     result
 }