Skip to content

Commit caf4021

Browse files
weizhouapachedhslove
authored andcommitted
vpc: create vpc tiers with dns server of vpc instead of zone (apache#8621)
* vpc: create vpc tiers with dns server of vpc instead of zone with this change ``` root@r-575-VM:~# cat /etc/dnsmasq.d/cloud.conf dhcp-hostsfile=/etc/dhcphosts.txt listen-address=127.0.0.1,172.17.1.1,172.17.2.1,172.17.3.1 dhcp-range=set:interface-eth2-0,172.17.1.1,static dhcp-option=tag:interface-eth2-0,15,cs2cloud.internal dhcp-option=tag:interface-eth2-0,6,172.17.1.1,10.0.32.1,8.8.8.8 dhcp-option=tag:interface-eth2-0,3,172.17.1.1 dhcp-option=eth2,26,1500 dhcp-option=tag:interface-eth2-0,1,255.255.255.0 dhcp-range=set:interface-eth3-1,172.17.2.1,static dhcp-option=tag:interface-eth3-1,15,cs2cloud.internal dhcp-option=tag:interface-eth3-1,6,172.17.2.1,8.8.8.8,1.1.1.1 dhcp-option=tag:interface-eth3-1,3,172.17.2.1 dhcp-option=eth3,26,1500 dhcp-option=tag:interface-eth3-1,1,255.255.255.0 dhcp-range=set:interface-eth4-2,172.17.3.1,static dhcp-option=tag:interface-eth4-2,15,cs2cloud.internal dhcp-option=tag:interface-eth4-2,6,172.17.3.1,8.8.8.8,1.1.1.1 dhcp-option=tag:interface-eth4-2,3,172.17.3.1 dhcp-option=eth4,26,1500 dhcp-option=tag:interface-eth4-2,1,255.255.255.0 root@r-575-VM:~# ``` * Update PR8621 test:ArgumentMatchers instead of Matchers in test
1 parent eed8e93 commit caf4021

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

server/src/test/java/com/cloud/network/NetworkModelImplTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import org.mockito.InjectMocks;
4242
import org.mockito.Mock;
4343
import org.mockito.Mockito;
44+
import org.mockito.junit.MockitoJUnitRunner;
4445
import org.springframework.test.util.ReflectionTestUtils;
4546

4647
import java.util.ArrayList;
@@ -49,7 +50,6 @@
4950
import java.util.List;
5051
import java.util.Map;
5152
import java.util.Set;
52-
import org.mockito.junit.MockitoJUnitRunner;
5353

5454
@RunWith(MockitoJUnitRunner.class)
5555
public class NetworkModelImplTest {

0 commit comments

Comments
 (0)