Skip to content

Bug fixes for primate#4214

Merged
yadvr merged 6 commits intoapache:4.14from
shapeblue:fix-for-primate
Jul 29, 2020
Merged

Bug fixes for primate#4214
yadvr merged 6 commits intoapache:4.14from
shapeblue:fix-for-primate

Conversation

@davidjumani
Copy link
Copy Markdown
Contributor

@davidjumani davidjumani commented Jul 17, 2020

Description

Adding the following fixes so primate can work without issues :

  • Adding pagination for listNetworkAclLists
  • Adding pagination for listRoles
  • Returning mshost uuid rather than msid in list hosts response
  • Allowing listVirtualMachinesMetrics to respect hostid
  • Fixing return all details in template response

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)

How Has This Been Tested?

(localhost) 🐱 > list networkacllists vpcid=0dc4efc7-82f4-48c1-ae2f-74bf9127ea40 page=3 pagesize=2
{
  "count": 24,
  "networkacllist": [
    {
      "description": "test17",
      "fordisplay": true,
      "id": "3c99bcce-8e04-443b-9015-997a35606502",
      "name": "test17",
      "vpcid": "0dc4efc7-82f4-48c1-ae2f-74bf9127ea40"
    },
    {
      "description": "test16",
      "fordisplay": true,
      "id": "f7e30024-08c9-42c5-81c0-ec4534c5893d",
      "name": "test16",
      "vpcid": "0dc4efc7-82f4-48c1-ae2f-74bf9127ea40"
    }
  ]
}
(localhost) 🐱 > list roles page=2 pagesize=2
{
  "count": 4,
  "role": [
    {
      "description": "Default domain admin role",
      "id": "d3150067-c7ed-11ea-9284-50eb71576f75",
      "name": "Domain Admin",
      "type": "DomainAdmin"
    },
    {
      "description": "Default user role",
      "id": "d315213f-c7ed-11ea-9284-50eb71576f75",
      "name": "User",
      "type": "User"
    }
  ]
}
(localhost) 🐱 > list virtualmachinesmetrics hostid=0fe40d0c-8663-4a70-9aba-492dbd8a7fa0 
(localhost) 🐱 > list virtualmachinesmetrics hostid=6fcf97a5-6ec5-4e36-8e26-5f36cb3b0e0e 
{
  "count": 1,
  "virtualmachine": [
    {
..............
(localhost) 🐱 > list hosts
{
  "count": 5,
  "host": [
    {
.................
      "managementserverid": "49bbaf18-b823-4328-9aac-bb4c8a7b860a",
.................

@yadvr yadvr added this to the 4.14.1.0 milestone Jul 17, 2020
@yadvr yadvr changed the base branch from master to 4.14 July 17, 2020 08:35
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 17, 2020

@davidjumani can you rebase against 4.14 branch?

if (cmd instanceof ListVMsCmdByAdmin) {
ListVMsCmdByAdmin aCmd = (ListVMsCmdByAdmin)cmd;
if (aCmd.getPodId() != null) {
if (_accountMgr.isRootAdmin(caller.getId())) {
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

@rhtyd Is there a better way to do this? If not, can entirely remove ListVmsCmdByAdmin since it's no longer used

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

this LGTM

@davidjumani
Copy link
Copy Markdown
Contributor Author

@rhtyd done!

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@davidjumani davidjumani marked this pull request as ready for review July 17, 2020 09:44
@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔centos7 ✔debian. JID-1588

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔centos7 ✔debian. JID-1589

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

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

Test Result Time (s) Test File

@davidjumani davidjumani changed the title Bug fixes for primate [WIP] Bug fixes for primate Jul 22, 2020
@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan package

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Packaging result: ✔centos7 ✔debian. JID-1601

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@blueorangutan
Copy link
Copy Markdown

Trillian test result (tid-2191)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 62986 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4214-t2191-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Smoke tests completed. 81 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_05_deploy_and_upgrade_kubernetes_ha_cluster Error 3620.61 test_kubernetes_clusters.py
test_06_deploy_and_invalid_upgrade_kubernetes_cluster Error 0.04 test_kubernetes_clusters.py
test_07_deploy_and_scale_kubernetes_cluster Error 0.03 test_kubernetes_clusters.py
ContextSuite context=TestKubernetesCluster>:teardown Error 35.20 test_kubernetes_clusters.py
ContextSuite context=Test01DeployVM>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test03SecuredVmMigration>:setup Error 0.00 test_vm_life_cycle.py

@davidjumani
Copy link
Copy Markdown
Contributor Author

@blueorangutan test

@blueorangutan
Copy link
Copy Markdown

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

@davidjumani davidjumani changed the title [WIP] Bug fixes for primate Bug fixes for primate Jul 27, 2020
@yadvr
Copy link
Copy Markdown
Member

yadvr commented Jul 27, 2020

Additional review/testing requested from @Pearl1594 @ravening @utchoang @shwstppr - thanx

Copy link
Copy Markdown
Contributor

@Pearl1594 Pearl1594 left a comment

Choose a reason for hiding this comment

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

LGTM

@blueorangutan
Copy link
Copy Markdown

Trillian test result (tid-2196)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 50718 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4214-t2196-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_iso.py
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_supported_versions.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_life_cycle.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Smoke tests completed. 81 look OK, 2 have error(s)
Only failed tests results shown below:

Test Result Time (s) Test File
test_01_add_delete_kubernetes_supported_version Error 1807.38 test_kubernetes_supported_versions.py
ContextSuite context=Test01DeployVM>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test02VMLifeCycle>:setup Error 0.00 test_vm_life_cycle.py
ContextSuite context=Test03SecuredVmMigration>:setup Error 0.00 test_vm_life_cycle.py

@yadvr yadvr merged commit eec5602 into apache:4.14 Jul 29, 2020
@davidjumani davidjumani deleted the fix-for-primate branch October 27, 2020 14:48
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.

6 participants