harikrishna-patnala commented on code in PR #6442:
URL: https://github.com/apache/cloudstack/pull/6442#discussion_r1166499359
##########
server/src/test/java/com/cloud/network/NetworkServiceImplTest.java:
##########
@@ -770,4 +773,144 @@ public void
validateIfServiceOfferingIsActiveAndSystemVmTypeIsDomainRouterTestMu
networkServiceImplMock.validateIfServiceOfferingIsActiveAndSystemVmTypeIsDomainRouter(1l);
}
+
+ @Test
+ public void validateNotSharedNetworkRouterIPv4() {
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.L2);
+ service.validateSharedNetworkRouterIPs(null, null, null, null, null,
null, null, null, null, ntwkOff);
+ }
+
+ @Test
+ public void validateSharedNetworkRouterIPs() {
+ String startIP = "10.0.16.2";
+ String endIP = "10.0.16.100";
+ String routerIPv4 = "10.0.16.100";
+ String routerPv6 = "fd17:ac56:1234:2000::fb";
+ String startIPv6 = "fd17:ac56:1234:2000::1";
+ String endIPv6 = "fd17:ac56:1234:2000::fc";
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, startIP, endIP,
IP4_NETMASK, routerIPv4, routerPv6, startIPv6, endIPv6, IP6_CIDR, ntwkOff);
+ }
+
+ @Test
+ public void validateSharedNetworkWrongRouterIPv4() {
+ String startIP = "10.0.16.2";
+ String endIP = "10.0.16.100";
+ String routerIPv4 = "10.0.16.101";
+ String routerPv6 = "fd17:ac56:1234:2000::fb";
+ String startIPv6 = "fd17:ac56:1234:2000::1";
+ String endIPv6 = "fd17:ac56:1234:2000::fc";
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ boolean passing = false;
+ try {
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, startIP,
endIP, IP4_NETMASK, routerIPv4, routerPv6, startIPv6, endIPv6, IP6_CIDR,
ntwkOff);
+ } catch (CloudRuntimeException e) {
+ Assert.assertTrue(e.getMessage().contains("Router IPv4 IP provided
is not within the specified range: "));
+ passing = true;
+ }
+ Assert.assertTrue(passing);
+ }
+
+ @Test
+ public void validateSharedNetworkNoEndOfIPv6Range() {
+ String startIP = null;
+ String endIP = null;
+ String routerIPv4 = null;
+ String routerPv6 = "fd17:ac56:1234:2000::1";
+ String startIPv6 = "fd17:ac56:1234:2000::1";
+ String endIPv6 = null;
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, startIP, endIP,
IP4_NETMASK, routerIPv4, routerPv6, startIPv6, endIPv6, IP6_CIDR, ntwkOff);
+ }
+
+ @Test
+ public void validateSharedNetworkIPv6RouterNotInRange() {
+ String routerIPv4 = null;
+ String routerIPv6 = "fd17:ac56:1234:2001::1";
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ boolean passing = false;
+ try {
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, null, null,
IP4_NETMASK, routerIPv4, routerIPv6, null, null, IP6_CIDR, ntwkOff);
+ } catch (CloudRuntimeException e) {
+ Assert.assertTrue(e.getMessage().contains("Router IPv6 address
provided is not with the network range"));
+ passing = true;
+ }
+ Assert.assertTrue(passing);
+ }
+
+ @Test
+ public void invalidateSharedNetworkIPv6RouterAddress() {
+ String routerIPv6 = "fd17:ac56:1234:2000::fg";
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ boolean passing = false;
+ try {
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, null, null,
IP4_NETMASK, null, routerIPv6, null, null, IP6_CIDR, ntwkOff);
+ } catch (CloudRuntimeException e) {
+ Assert.assertTrue(e.getMessage().contains("Router IPv6 address
provided is of incorrect format"));
+ passing = true;
+ }
+ Assert.assertTrue(passing);
+ }
+
+ @Test
+ public void invalidateSharedNetworkIPv4RouterAddress() {
+ String routerIPv4 = "10.100.1000.1";
+ NetworkOffering ntwkOff = Mockito.mock(NetworkOffering.class);
+ when(ntwkOff.getGuestType()).thenReturn(Network.GuestType.Shared);
+ boolean passing = false;
+ try {
+ service.validateSharedNetworkRouterIPs(IP4_GATEWAY, null, null,
IP4_NETMASK, routerIPv4, null, null, null, IP6_CIDR, ntwkOff);
+ } catch (CloudRuntimeException e) {
+ Assert.assertTrue(e.getMessage().contains("Router IPv4 IP provided
is of incorrect format"));
+ passing = true;
+ }
+ Assert.assertTrue(passing);
+ }
+
+ @Test
+ public void checkAndDontSetSourceNatIp() {
+ CreateNetworkCmd cmd = new CreateNetworkCmd();
+ String srcNatIp = "10.100.1000.1";
Review Comment:
String srcNatIp = "10.100.1000.1";
I meant about this. may be yes, you set it for readability. please ignore if
that is the case.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
