s2svpn: Set initial state as Connecting by davidjumani · Pull Request #5327 · apache/cloudstack

davidjumani · 2021-08-17T10:49:51Z

Description

Fixes #5179

Sets the initial state of an s2svpn as connecting

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

Bug Severity

Screenshots (if appropriate):

Initial State :

Invalid gateway :

Valid gateway :

How has this been tested ?

Test Site 2 Site VPN Across redundant VPCs ... === TestName: test_01_redundant_vpc_site2site_vpn | Status : SUCCESS ===
ok
Test Site 2 Site VPN Across VPCs ... === TestName: test_01_vpc_site2site_vpn_multiple_options | Status : SUCCESS ===
ok
Test Remote Access VPN in VPC ... === TestName: test_01_vpc_remote_access_vpn | Status : SUCCESS ===
ok
Test Site 2 Site VPN Across VPCs ... === TestName: test_01_vpc_site2site_vpn | Status : SUCCESS ===
ok

davidjumani · 2021-08-17T10:50:02Z

@blueorangutan package

yadvr · 2021-08-17T10:51:02Z

server/src/main/java/com/cloud/network/vpn/Site2SiteVpnManagerImpl.java

                    conn.setState(State.Disconnected);
                } else {
-                    conn.setState(State.Connected);
+                    conn.setState(State.Connecting);


Is there any FSM or logic that ensures that connections don't get stuck in the new Connecting state?

Nope but the additions to VirtualNetworkApplianceManagerImpl.java and Site2SiteVpnManagerImpl.java take care of it

davidjumani · 2021-08-17T11:14:05Z

@blueorangutan package

blueorangutan · 2021-08-17T11:15:03Z

@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-08-17T11:37:11Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 891

davidjumani · 2021-08-17T11:42:15Z

@blueorangutan test

blueorangutan · 2021-08-17T11:43:03Z

@davidjumani a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2021-08-17T21:27:47Z

Trillian test result (tid-1678)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33407 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5327-t1678-kvm-centos7.zip
Smoke tests completed. 89 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

nvazquez

LGTM

nvazquez · 2021-08-17T22:10:22Z

@davidjumani can you target this PR to branch 4.15 and re-kick tests?

davidjumani · 2021-08-18T03:54:16Z

@blueorangutan package

blueorangutan · 2021-08-18T03:55:03Z

@davidjumani a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2021-08-18T04:20:12Z

Packaging result: ✔️ el7 ✔️ el8 ✔️ debian. SL-JID 898

davidjumani · 2021-08-18T04:24:58Z

@blueorangutan test

blueorangutan · 2021-08-18T04:26:03Z

@davidjumani a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

weizhouapache

tested ok with 2 vpcs.

blueorangutan · 2021-08-18T14:08:29Z

Trillian test result (tid-1686)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 33329 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5327-t1686-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_reset_vm_on_reboot.py
Intermittent failure detected: /marvin/tests/smoke/test_resource_accounting.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dnsservice.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_iptables_default_policy.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_routers.py
Intermittent failure detected: /marvin/tests/smoke/test_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_ssvm.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 77 look OK, 10 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
ContextSuite context=TestResetVmOnReboot>:setup	`Error`	0.00	test_reset_vm_on_reboot.py
ContextSuite context=TestRAMCPUResourceAccounting>:setup	`Error`	0.00	test_resource_accounting.py
ContextSuite context=TestRouterDHCPHosts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDHCPOpts>:setup	`Error`	0.00	test_router_dhcphosts.py
ContextSuite context=TestRouterDns>:setup	`Error`	0.00	test_router_dns.py
ContextSuite context=TestRouterDnsService>:setup	`Error`	0.00	test_router_dnsservice.py
ContextSuite context=TestRouterIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
ContextSuite context=TestVPCIpTablesPolicies>:setup	`Error`	0.00	test_routers_iptables_default_policy.py
test_01_isolate_network_FW_PF_default_routes_egress_true	`Error`	0.14	test_routers_network_ops.py
test_02_isolate_network_FW_PF_default_routes_egress_false	`Error`	0.13	test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup	`Error`	1.24	test_routers_network_ops.py
ContextSuite context=TestRouterServices>:setup	`Error`	0.00	test_routers.py
ContextSuite context=TestCpuCapServiceOfferings>:setup	`Error`	0.00	test_service_offerings.py
ContextSuite context=TestServiceOfferings>:setup	`Error`	0.10	test_service_offerings.py
ContextSuite context=TestSnapshotRootDisk>:setup	`Error`	0.00	test_snapshots.py

yadvr approved these changes Aug 17, 2021

View reviewed changes

davidjumani requested review from nvazquez and weizhouapache August 17, 2021 10:50

yadvr reviewed Aug 17, 2021

View reviewed changes

davidjumani mentioned this pull request Aug 17, 2021

VPC Site to Site VPN state #5179

Closed

nvazquez approved these changes Aug 17, 2021

View reviewed changes

davidjumani added 3 commits August 18, 2021 09:23

s2svpn: Set initial state as Connecting

433e930

Fix comments

f6c6687

Adding connecting elsewhere

0d4e8d6

davidjumani force-pushed the fix-s2s-state branch from 79c4224 to 0d4e8d6 Compare August 18, 2021 03:53

davidjumani changed the base branch from main to 4.15 August 18, 2021 03:53

weizhouapache approved these changes Aug 18, 2021

View reviewed changes

yadvr added this to the 4.15.2.0 milestone Aug 18, 2021

yadvr merged commit 21d7854 into apache:4.15 Aug 18, 2021

Conversation

davidjumani commented Aug 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Bug Severity

Screenshots (if appropriate):

Initial State :

Invalid gateway :

Valid gateway :

How has this been tested ?

Uh oh!

davidjumani commented Aug 17, 2021

Uh oh!

yadvr Aug 17, 2021

Choose a reason for hiding this comment

Uh oh!

davidjumani Aug 17, 2021

Choose a reason for hiding this comment

Uh oh!

davidjumani commented Aug 17, 2021

Uh oh!

blueorangutan commented Aug 17, 2021

Uh oh!

blueorangutan commented Aug 17, 2021

Uh oh!

davidjumani commented Aug 17, 2021

Uh oh!

blueorangutan commented Aug 17, 2021

Uh oh!

blueorangutan commented Aug 17, 2021

Uh oh!

nvazquez left a comment

Choose a reason for hiding this comment

Uh oh!

nvazquez commented Aug 17, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidjumani commented Aug 18, 2021

Uh oh!

blueorangutan commented Aug 18, 2021

Uh oh!

blueorangutan commented Aug 18, 2021

Uh oh!

davidjumani commented Aug 18, 2021

Uh oh!

blueorangutan commented Aug 18, 2021

Uh oh!

weizhouapache left a comment

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented Aug 18, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

davidjumani commented Aug 17, 2021 •

edited

Loading

nvazquez commented Aug 17, 2021 •

edited

Loading