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.

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

Remove CVM and relevant test cases #5655

Merged
merged 4 commits into from
May 30, 2024

Conversation

minglumlu
Copy link
Member

@minglumlu minglumlu commented May 29, 2024

CVM had been supported but not since long time ago.

This commit is to clean up the remanent code and test cases.

CVM had been supported but not since long time ago.

This commit is to clean up the remanent code and test cases.

Signed-off-by: Ming Lu <ming.lu@cloud.com>
@@ -87,7 +87,6 @@ let test_xapi_restart_inner () =
Xapi_xenops.start ~__context ~self:vm5 false false ;
Xapi_xenops.start ~__context ~self:vm6 false false ;
Xapi_xenops.start ~__context ~self:vm7 false false ;
(* vm6 is a ntnx CVM *)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since we are removing CVM related logic as CVM is not supported now, is the test for vm6 still needed?

@@ -87,7 +87,6 @@ let test_xapi_restart_inner () =
Xapi_xenops.start ~__context ~self:vm5 false false ;
Xapi_xenops.start ~__context ~self:vm6 false false ;
Xapi_xenops.start ~__context ~self:vm7 false false ;
(* vm6 is a ntnx CVM *)
Db.VM.set_is_control_domain ~__context ~self:vm6 ~value:true ;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't this line be removed as well?

Copy link
Member Author

@minglumlu minglumlu May 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think the comment is not correct. The vm6 is actually not a CVM. Its name doesn't end with "-CVM".

@minglumlu
Copy link
Member Author

Hi @gangj @psafont
To avoid confusion, I'm going to remove the vm6 as its is_control_domain is true and there is dom0 already.
Thanks.

Signed-off-by: Ming Lu <ming.lu@cloud.com>
Signed-off-by: Ming Lu <ming.lu@cloud.com>
Signed-off-by: Ming Lu <ming.lu@cloud.com>
@gangj gangj merged commit c0e5dc4 into xapi-project:master May 30, 2024
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants