Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
48 commits
Select commit Hold shift + click to select a range
01889e2
Rename nsx mode to routing mode
weizhouapache Apr 29, 2024
0dc01b6
ROUTED mode: add network/vpc offerings
weizhouapache May 24, 2024
d496af0
Routed v8
weizhouapache May 25, 2024
c922a62
Routed v10
weizhouapache May 28, 2024
fa1918e
Routed v11
weizhouapache May 29, 2024
83e87a3
Routed v12
weizhouapache May 30, 2024
df8069d
Routed v13
weizhouapache May 31, 2024
b676317
Routed v14
weizhouapache May 31, 2024
946b618
Routed v15
weizhouapache Jun 7, 2024
9b22a31
Routed v16
weizhouapache Jun 8, 2024
7d8413d
Routed 21
weizhouapache Jun 18, 2024
1bbb16c
Routed 22
weizhouapache Jun 19, 2024
17f183e
Routed v23
weizhouapache Jun 20, 2024
6d44747
Routed v24
weizhouapache Jun 22, 2024
3ba853d
Routed v25
weizhouapache Jun 24, 2024
6a8bec2
Routed v26: implement subnet auto-allocation
weizhouapache Jun 25, 2024
77fa42d
Routed 27: add subnet for VPC
weizhouapache Jun 25, 2024
522e3a1
Routed v28: update smoke tests
weizhouapache Jun 25, 2024
fb3f3bf
Routed 29: fix vpc and add more tests
weizhouapache Jun 26, 2024
2db0192
Routed 31: ui and smoke tests
weizhouapache Jun 27, 2024
db9dea3
Routed 32: add chain OUTPUT and more rules
weizhouapache Jun 28, 2024
9387aef
Routed: fix dns search from VMs in Isolated networks
weizhouapache Jul 3, 2024
a6f7876
Routed: fix VPC dns issue due to gateway IP is missing in cloud.conf
weizhouapache Jul 3, 2024
648dcae
Routed: rename routing_mode to network_mode
weizhouapache Jul 4, 2024
42842c6
Routed: replace centos5.5 template in smoke test as dhclient does not…
weizhouapache Jul 4, 2024
a1b0b64
Routed: fix smoke test due to wrong cidrlist of egress rules and miss…
weizhouapache Jul 5, 2024
57de7cc
PR 9346: fix lint error schema-41910to42000.sql
weizhouapache Jul 5, 2024
27a2005
PR 9346: ui polish v1
weizhouapache Jul 5, 2024
9397b8d
PR 9346: create VPC with cidrsize
weizhouapache Jul 5, 2024
b8e3950
Routed: fix test failures with test_network_ipv6 and test_vpc_ipv6 du…
weizhouapache Jul 8, 2024
532319f
Routed: fix /usr/local/cloud/systemvm/ are removed after SSVM/CPVM re…
weizhouapache Jul 8, 2024
40c12bf
Routed: fix IP of additional nics of VPC VR is not gateway
weizhouapache Jul 8, 2024
720f57e
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 8, 2024
a599950
PR 9346: fix cidrsize check when create VPC with cidrsize
weizhouapache Jul 8, 2024
ef70262
Routed: fix test/integration/smoke/test_ipv4_routing.py:279:16: E713 …
weizhouapache Jul 8, 2024
5b77f02
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 9, 2024
e493196
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 12, 2024
c04bfb4
PR9346: fix/Update api
weizhouapache Jul 12, 2024
4579b49
PR 9346: set response object name
weizhouapache Jul 12, 2024
3763fd2
PR9346: UI refactor and small fixes
weizhouapache Jul 12, 2024
fd88a9e
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 14, 2024
21d52ec
PR9346: change return type of getNetworkMode
weizhouapache Jul 15, 2024
0795237
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 16, 2024
6d52a64
PR9346: move IPv4 subnet to seperated tab
weizhouapache Jul 13, 2024
f156f59
PR9346: revert IpRangesTabGuest.vue back to original
weizhouapache Jul 16, 2024
8901ddd
Merge remote-tracking branch 'apache/main' into 4.20-routed-mode
weizhouapache Jul 17, 2024
798074b
PR9346: fix remove ipv4 subnet on UI
weizhouapache Jul 17, 2024
bf21ff4
PR9346: fix test_ipv4_routing.py
weizhouapache Jul 17, 2024
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
Prev Previous commit
Next Next commit
Routed 32: add chain OUTPUT and more rules
- fix the issue 80/443/8080 is not reachable from VR itself

```
2024-06-27 10:21:52,121 INFO     Executing: systemctl start cloud-password-server@172.31.1.1
2024-06-27 10:21:52,128 INFO     Service cloud-password-server@172.31.1.1 start
2024-06-27 10:21:52,129 INFO     Executing: ps aux
2024-06-27 10:24:02,175 ERROR    Failed to update password server due to: <urlopen error [Errno 110] Connection timed out>
```
  • Loading branch information
weizhouapache committed Jul 5, 2024
commit db9dea33a778711af21ada48ea0e2305bc76087d
8 changes: 8 additions & 0 deletions systemvm/debian/opt/cloud/bin/cs/CsAddress.py
Original file line number Diff line number Diff line change
Expand Up @@ -622,6 +622,10 @@ def fw_router_routing(self):
return
if self.get_type() in ["guest"]:
guestNetworkCidr = self.address['network']
self.nft_ipv4_fw.append({'type': "", 'chain': 'INPUT',
'rule': "iifname lo counter accept"})
self.nft_ipv4_fw.append({'type': "", 'chain': 'INPUT',
'rule': "iifname %s ct state related,established counter accept" % self.dev})
self.nft_ipv4_fw.append({'type': "", 'chain': 'INPUT',
'rule': "iifname %s udp dport 67 counter accept" % self.dev})
self.nft_ipv4_fw.append({'type': "", 'chain': 'INPUT',
Expand All @@ -640,6 +644,10 @@ def fw_vpcrouter_routing(self):
return
if self.get_type() in ["guest"]:
guestNetworkCidr = self.address['network']
self.nft_ipv4_acl.append({'type': "", 'chain': 'INPUT',
'rule': "iifname lo counter accept"})
self.nft_ipv4_acl.append({'type': "", 'chain': 'INPUT',
'rule': "iifname %s ct state related,established counter accept" % self.dev})
self.nft_ipv4_acl.append({'type': "", 'chain': 'INPUT',
'rule': "iifname %s udp dport 67 counter accept" % self.dev})
self.nft_ipv4_acl.append({'type': "", 'chain': 'INPUT',
Expand Down
6 changes: 4 additions & 2 deletions systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py
Original file line number Diff line number Diff line change
Expand Up @@ -251,13 +251,15 @@ def apply_nft_ipv4_rules(self, rules, type):
table = 'ip4_firewall'
default_chains = [
{"chain": "INPUT", "hook": "input", "action": "drop"},
{"chain": "FORWARD", "hook": "forward", "action": "accept"}
{"chain": "FORWARD", "hook": "forward", "action": "accept"},
{"chain": "OUTPUT", "hook": "output", "action": "accept"}
]
if type == "acl":
table = 'ip4_acl'
default_chains = [
{"chain": "INPUT", "hook": "input", "action": "drop"},
{"chain": "FORWARD", "hook": "forward", "action": "accept"}
{"chain": "FORWARD", "hook": "forward", "action": "accept"},
{"chain": "OUTPUT", "hook": "output", "action": "accept"}
]
tables = CsHelper.execute("nft list tables %s | grep %s" % (address_family, table))
if any(table in t for t in tables):
Expand Down
9 changes: 5 additions & 4 deletions test/integration/smoke/test_ipv4_routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -275,9 +275,10 @@ def verifyNftablesRulesInRouter(self, router, rules):
else:
exists = False
if exists and not rule["rule"] in res:
self.fail("The nftables rule (%s) should exist but is not found in the VR" % rule["rule"])
self.fail("The nftables rule (%s) should exist but is not found in the VR !!!" % rule["rule"])
if not exists and rule["rule"] in res:
self.fail("The nftables rule (%s) should not exist but is found in the VR" % rule["rule"])
self.fail("The nftables rule (%s) should not exist but is found in the VR !!!" % rule["rule"])
self.message("The nftables rules look good so far.")

def verifyPingFromRouter(self, router, vm, expected=True, retries=1):
while retries > 0:
Expand All @@ -295,9 +296,9 @@ def verifyPingFromRouter(self, router, vm, expected=True, retries=1):
except Exception as ex:
self.fail("Failed to ping vm from router: %s" % ex)
if retries == 0 and expected:
self.message("Failed to ping vm from router, which is expected to work.")
self.message("Failed to ping vm from router, which is expected to work !!!")
if retries > 0 and not expected:
self.message("ping vm from router works, however it is unexpected.")
self.message("ping vm from router works, however it is unexpected !!!")

@attr(tags=['advanced', 'basic', 'sg'], required_hardware=False)
def test_01_zone_subnet(self):
Expand Down