Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move all cirque test to ipv6 only #10200

Merged
merged 1 commit into from
Oct 4, 2021
Merged

move all cirque test to ipv6 only #10200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/app/tests/integration/chip_im_initiator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,7 +697,7 @@ int main(int argc, char * argv[])
InitializeChip();

err = gTransportManager.Init(chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer)
.SetAddressType(gDestAddr.Type())
.SetAddressType(chip::Inet::kIPAddressType_IPv6)
.SetListenPort(IM_CLIENT_PORT));
SuccessOrExit(err);

Expand Down
9 changes: 2 additions & 7 deletions src/app/tests/integration/chip_im_responder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,13 +206,8 @@ int main(int argc, char * argv[])

InitializeChip();

err = gTransportManager.Init(chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer)
#if INET_CONFIG_ENABLE_IPV4
.SetAddressType(chip::Inet::kIPAddressType_IPv4)
#else
.SetAddressType(chip::Inet::kIPAddressType_IPv6)
#endif
);
err = gTransportManager.Init(
chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer).SetAddressType(chip::Inet::kIPAddressType_IPv6));
SuccessOrExit(err);

err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gTransportManager, &gMessageCounterManager);
Expand Down
4 changes: 2 additions & 2 deletions src/messaging/tests/echo/echo_requester.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ int main(int argc, char * argv[])
if (gUseTCP)
{
err = gTCPManager.Init(chip::Transport::TcpListenParameters(&chip::DeviceLayer::InetLayer)
.SetAddressType(gDestAddr.Type())
.SetAddressType(chip::Inet::kIPAddressType_IPv6)
.SetListenPort(ECHO_CLIENT_PORT));
SuccessOrExit(err);

Expand All @@ -238,7 +238,7 @@ int main(int argc, char * argv[])
else
{
err = gUDPManager.Init(chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer)
.SetAddressType(gDestAddr.Type())
.SetAddressType(chip::Inet::kIPAddressType_IPv6)
.SetListenPort(ECHO_CLIENT_PORT));
SuccessOrExit(err);

Expand Down
9 changes: 2 additions & 7 deletions src/messaging/tests/echo/echo_responder.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,13 +97,8 @@ int main(int argc, char * argv[])
}
else
{
err = gUDPManager.Init(chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer)
#if INET_CONFIG_ENABLE_IPV4
.SetAddressType(chip::Inet::kIPAddressType_IPv4)
#else
.SetAddressType(chip::Inet::kIPAddressType_IPv6)
#endif
);
err = gUDPManager.Init(
chip::Transport::UdpListenParameters(&chip::DeviceLayer::InetLayer).SetAddressType(chip::Inet::kIPAddressType_IPv6));
SuccessOrExit(err);

err = gSessionManager.Init(&chip::DeviceLayer::SystemLayer(), &gUDPManager, &gMessageCounterManager);
Expand Down
4 changes: 3 additions & 1 deletion src/test_driver/linux-cirque/EchoOverTcpTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
},
Expand All @@ -48,6 +49,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
}
Expand All @@ -71,7 +73,7 @@ def test_routine(self):
self.run_data_model_test()

def run_data_model_test(self):
resp_ips = [device['description']['ipv4_addr'] for device in self.non_ap_devices
resp_ips = [device['description']['ipv6_addr'] for device in self.non_ap_devices
if device['type'] == 'CHIP-Echo-Responder']
resp_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIP-Echo-Responder']
Expand Down
4 changes: 3 additions & 1 deletion src/test_driver/linux-cirque/EchoTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
},
Expand All @@ -48,6 +49,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
}
Expand All @@ -71,7 +73,7 @@ def test_routine(self):
self.run_data_model_test()

def run_data_model_test(self):
resp_ips = [device['description']['ipv4_addr'] for device in self.non_ap_devices
resp_ips = [device['description']['ipv6_addr'] for device in self.non_ap_devices
if device['type'] == 'CHIP-Echo-Responder']
resp_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIP-Echo-Responder']
Expand Down
4 changes: 3 additions & 1 deletion src/test_driver/linux-cirque/InteractionModelTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
},
Expand All @@ -48,6 +49,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
}
Expand All @@ -71,7 +73,7 @@ def test_routine(self):
self.run_data_model_test()

def run_data_model_test(self):
resp_ips = [device['description']['ipv4_addr'] for device in self.non_ap_devices
resp_ips = [device['description']['ipv6_addr'] for device in self.non_ap_devices
if device['type'] == 'CHIP-IM-Responder']
resp_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIP-IM-Responder']
Expand Down
4 changes: 3 additions & 1 deletion src/test_driver/linux-cirque/MobileDeviceTest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
},
Expand All @@ -53,6 +54,7 @@
'base_image': 'connectedhomeip/chip-cirque-device-base',
'capability': ['Thread', 'Interactive', 'TrafficControl', 'Mount'],
'rcp_mode': True,
'docker_network': 'Ipv6',
'traffic_control': {'latencyMs': 100},
"mount_pairs": [[CHIP_REPO, CHIP_REPO]],
}
Expand All @@ -71,7 +73,7 @@ def test_routine(self):
self.run_controller_test()

def run_controller_test(self):
ethernet_ip = [device['description']['ipv4_addr'] for device in self.non_ap_devices
ethernet_ip = [device['description']['ipv6_addr'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice'][0]
server_ids = [device['id'] for device in self.non_ap_devices
if device['type'] == 'CHIPEndDevice']
Expand Down
2 changes: 1 addition & 1 deletion third_party/cirque/repo
Open in desktop
Submodule repo updated 2 files
+48 −13 cirque/home/home.py
+4 −1 cirque/nodes/dockernode.py