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

display nics deviceid and order nics by deviceid on Nics tab of insta… #4768

Merged
merged 3 commits into from Jul 28, 2021

Conversation

soreana
Copy link
Member

@soreana soreana commented Mar 8, 2021

Description

As a cloudstack team, we want to show sorted NICs in the Nic tab of the instance and API calls. To achieve this goal, cloudstack should put the deviceid in userVmResponse. This is the minor PR to add this feature.

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)

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

  • Major
  • Minor

Screenshots (if appropriate):

Screenshot 2021-03-08 at 04 27 21

How Has This Been Tested?

I deployed the following instance in my test environment with three networks, as you can see they are sorted in NIC tab.

Copy link
Contributor

@DaanHoogland DaanHoogland left a comment

Choose a reason for hiding this comment

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

clgtm

@blueorangutan
Copy link

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 55

@blueorangutan
Copy link

[S] Trillian test result (tid-58)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35742 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t58-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_affinity_groups_projects.py
Intermittent failure detected: /marvin/tests/smoke/test_affinity_groups.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 82 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_DeployVmAntiAffinityGroup_in_project Error 58.83 test_affinity_groups_projects.py
test_DeployVmAntiAffinityGroup Error 35.38 test_affinity_groups.py
test_04_deploy_and_scale_kubernetes_cluster Failure 24.62 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_hostha_kvm_host_degraded Failure 676.75 test_hostha_kvm.py
test_hostha_kvm_host_fencing Failure 642.18 test_hostha_kvm.py
test_hostha_kvm_host_recovering Failure 646.39 test_hostha_kvm.py

@DaanHoogland
Copy link
Contributor

none of these ^^ errors have to do with this PR afaics.

@rohityadavcloud
Copy link
Member

@soreana this looks like a good enhancement. @DaanHoogland @shwstppr should we consider/ask for 4.15.1?

@DaanHoogland
Copy link
Contributor

@rhtyd (cc @soreana ) though it is a minor change it does include AI and DB changes, so I'd say leave it for 4.16 (that is not a definite 👎 at all, just a expression of our merge principles and principles are there to be broken with)

@weizhouapache
Copy link
Member

@rhtyd (cc @soreana ) though it is a minor change it does include AI and DB changes, so I'd say leave it for 4.16 (that is not a definite 👎 at all, just a expression of our merge principles and principles are there to be broken with)

@DaanHoogland let's merge it to 4.16.
as far as I know, 4.15 accepts only bug fixes and security fixes.

@rohityadavcloud
Copy link
Member

rohityadavcloud commented Mar 12, 2021 via email

@rohityadavcloud
Copy link
Member

@soreana can you fix the conflicts

@soreana
Copy link
Member Author

soreana commented May 10, 2021

@rhtyd Done :)

@rohityadavcloud
Copy link
Member

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Packaging result: ✔️ centos7 ✔️ centos8 ✔️ debian. SL-JID 575

Copy link
Member

@weizhouapache weizhouapache left a comment

Choose a reason for hiding this comment

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

code lgtm

@DaanHoogland
Copy link
Contributor

@rhtyd are we still considdering this for 4.15?

@rohityadavcloud rohityadavcloud changed the base branch from master to 4.15 May 11, 2021 07:25
@rohityadavcloud rohityadavcloud changed the base branch from 4.15 to master May 11, 2021 07:25
@rohityadavcloud
Copy link
Member

rohityadavcloud commented May 11, 2021

@DaanHoogland from what I read, apart from me nobody was interested in 4.15 including the author so I didn't push it any further. I just checked branch compatibility and it looks like without rebasing (+ moving any db changes to the right file) this causes conflicts on 4.15. I'm fine with what others have said. Also see your #4768 (comment)

@rohityadavcloud
Copy link
Member

@soreana can you fix the conflict? Thanks.

@nvazquez
Copy link
Contributor

Hi @soreana can you please fix the conflict?

1 similar comment
@weizhouapache
Copy link
Member

Hi @soreana can you please fix the conflict?

@soreana
Copy link
Member Author

soreana commented Jul 9, 2021

I fixed the conflict.
@weizhouapache @nvazquez @rhtyd Sorry for the late response. As I was away for couple of weeks, I completely forgot about this.

@blueorangutan
Copy link

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

@weizhouapache
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

Trillian test result (tid-1255)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 60384 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t1255-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_loadbalance.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dhcphosts.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 84 look OK, 4 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_05_ping_in_cpvm_success Failure 15.36 test_diagnostics.py
test_02_deploy_and_upgrade_kubernetes_cluster Failure 3608.65 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 3619.40 test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster Failure 0.07 test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster Failure 0.05 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.05 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 39.34 test_kubernetes_clusters.py
test_01_RVR_Network_FW_PF_SSH_default_routes_egress_true Failure 350.64 test_routers_network_ops.py
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 347.80 test_routers_network_ops.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 543.24 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 535.73 test_vpc_redundant.py
test_05_rvpc_multi_tiers Failure 506.99 test_vpc_redundant.py

@rohityadavcloud
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-1277)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 43400 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t1277-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_internal_lb.py
Intermittent failure detected: /marvin/tests/smoke/test_router_dns.py
Intermittent failure detected: /marvin/tests/smoke/test_routers_network_ops.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 86 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_02_RVR_Network_FW_PF_SSH_default_routes_egress_false Failure 344.47 test_routers_network_ops.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 404.26 test_vpc_redundant.py
test_05_rvpc_multi_tiers Failure 513.63 test_vpc_redundant.py

@davidjumani
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@davidjumani
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@nvazquez nvazquez closed this Jul 19, 2021
@nvazquez nvazquez reopened this Jul 19, 2021
@blueorangutan
Copy link

Trillian test result (tid-1310)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 67193 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t1310-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
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_vpc_redundant.py
Smoke tests completed. 78 look OK, 11 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_04_rvpc_privategw_static_routes Failure 1197.35 test_privategw_acl.py
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
ContextSuite context=TestIsolatedNetworks>:setup Error 0.00 test_routers_network_ops.py
ContextSuite context=TestRedundantIsolateNetworks>:setup Error 0.00 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.11 test_service_offerings.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL Failure 283.18 test_vpc_redundant.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 463.77 test_vpc_redundant.py

@nvazquez
Copy link
Contributor

@blueorangutan package

@blueorangutan
Copy link

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

@blueorangutan
Copy link

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

@nvazquez
Copy link
Contributor

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-1383)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 98854 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t1383-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_accounts.py
Intermittent failure detected: /marvin/tests/smoke/test_affinity_groups_projects.py
Intermittent failure detected: /marvin/tests/smoke/test_async_job.py
Intermittent failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vm_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vms_with_varied_deploymentplanners.py
Intermittent failure detected: /marvin/tests/smoke/test_deploy_vm_with_userdata.py
Intermittent failure detected: /marvin/tests/smoke/test_diagnostics.py
Intermittent failure detected: /marvin/tests/smoke/test_domain_service_offerings.py
Intermittent failure detected: /marvin/tests/smoke/test_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Intermittent failure detected: /marvin/tests/smoke/test_list_ids_parameter.py
Intermittent failure detected: /marvin/tests/smoke/test_metrics_api.py
Intermittent failure detected: /marvin/tests/smoke/test_multipleips_per_nic.py
Intermittent failure detected: /marvin/tests/smoke/test_nested_virtualization.py
Intermittent failure detected: /marvin/tests/smoke/test_network_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_network.py
Intermittent failure detected: /marvin/tests/smoke/test_nic_adapter_type.py
Intermittent failure detected: /marvin/tests/smoke/test_password_server.py
Intermittent failure detected: /marvin/tests/smoke/test_portforwardingrules.py
Intermittent failure detected: /marvin/tests/smoke/test_privategw_acl.py
Intermittent failure detected: /marvin/tests/smoke/test_projects.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Intermittent failure detected: /marvin/tests/smoke/test_volumes.py
Smoke tests completed. 66 look OK, 23 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_create_iso_with_checksum_sha1 Error 66.38 test_iso.py
test_02_create_iso_with_checksum_sha256 Error 66.38 test_iso.py
test_03_create_iso_with_checksum_md5 Error 66.40 test_iso.py
test_04_create_iso_with_no_checksum Error 66.35 test_iso.py
ContextSuite context=TestISO>:setup Error 1562.78 test_iso.py
ContextSuite context=TestAccounts>:setup Error 0.00 test_accounts.py
ContextSuite context=TestAddVmToSubDomain>:setup Error 0.00 test_accounts.py
test_DeleteDomain Error 4.00 test_accounts.py
test_forceDeleteDomain Failure 4.10 test_accounts.py
ContextSuite context=TestRemoveUserFromAccount>:setup Error 5.03 test_accounts.py
ContextSuite context=TestDomainsServiceOfferings>:setup Error 1516.59 test_domain_service_offerings.py
ContextSuite context=TestDeployVmWithAffinityGroup>:setup Error 0.00 test_affinity_groups_projects.py
ContextSuite context=TestAsyncJob>:setup Error 0.00 test_async_job.py
test_list_clusters_metrics Error 1511.88 test_metrics_api.py
test_list_vms_metrics Error 0.18 test_metrics_api.py
ContextSuite context=TestDeployVirtioSCSIVM>:setup Error 0.00 test_deploy_virtio_scsi_vm.py
ContextSuite context=TestDeployVMFromISO>:setup Error 0.00 test_deploy_vm_iso.py
ContextSuite context=TestDeployVmWithVariedPlanners>:setup Error 0.00 test_deploy_vms_with_varied_deploymentplanners.py
ContextSuite context=TestNetworkACL>:setup Error 0.00 test_network_acl.py
ContextSuite context=TestDeployVmWithUserData>:setup Error 0.00 test_deploy_vm_with_userdata.py
ContextSuite context=TestRemoteDiagnostics>:setup Error 0.00 test_diagnostics.py
test_delete_account Error 1511.35 test_network.py
test_delete_network_while_vm_on_it Error 1.11 test_network.py
test_deploy_vm_l2network Error 1.10 test_network.py
test_l2network_restart Error 2.16 test_network.py
ContextSuite context=TestPortForwarding>:setup Error 3.31 test_network.py
ContextSuite context=TestPublicIP>:setup Error 1.02 test_network.py
test_reboot_router Failure 0.04 test_network.py
test_releaseIP Error 0.54 test_network.py
ContextSuite context=TestRouterRules>:setup Error 0.58 test_network.py
ContextSuite context=TestAdapterTypeForNic>:setup Error 0.00 test_nic_adapter_type.py
test_01_invalid_upgrade_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_02_deploy_and_upgrade_kubernetes_cluster Failure 0.01 test_kubernetes_clusters.py
test_03_deploy_and_scale_kubernetes_cluster Failure 0.00 test_kubernetes_clusters.py
test_04_basic_lifecycle_kubernetes_cluster Failure 0.00 test_kubernetes_clusters.py
test_05_delete_kubernetes_cluster Failure 0.00 test_kubernetes_clusters.py
test_06_deploy_invalid_kubernetes_ha_cluster Failure 0.00 test_kubernetes_clusters.py
test_07_deploy_kubernetes_ha_cluster Failure 0.00 test_kubernetes_clusters.py
test_08_deploy_and_upgrade_kubernetes_ha_cluster Failure 0.00 test_kubernetes_clusters.py
test_09_delete_kubernetes_ha_cluster Failure 0.00 test_kubernetes_clusters.py
test_01_add_delete_kubernetes_supported_version Error 120.86 test_kubernetes_supported_versions.py
ContextSuite context=TestListIdsParams>:setup Error 0.00 test_list_ids_parameter.py
test_nic_secondaryip_add_remove Error 1511.51 test_multipleips_per_nic.py
ContextSuite context=TestNestedVirtualization>:setup Error 0.00 test_nested_virtualization.py
ContextSuite context=TestIsolatedNetworksPasswdServer>:setup Error 0.00 test_password_server.py
ContextSuite context=TestPortForwardingRules>:setup Error 0.00 test_portforwardingrules.py
ContextSuite context=TestPrivateGwACL>:setup Error 0.00 test_privategw_acl.py
ContextSuite context=TestProjectSuspendActivate>:setup Error 1518.15 test_projects.py

@weizhouapache
Copy link
Member

@blueorangutan test

@blueorangutan
Copy link

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

@blueorangutan
Copy link

Trillian test result (tid-1390)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35235 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4768-t1390-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_vpc_vpn.py
Smoke tests completed. 88 look OK, 1 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_vpc_site2site_vpn_multiple_options Failure 470.37 test_vpc_vpn.py

@nvazquez nvazquez merged commit 490658c into apache:main Jul 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants