Skip to content

Adding listall to listLdapConfigurations#4164

Merged
yadvr merged 1 commit into
apache:4.13from
shapeblue:fix-list-ldap-config
Jun 24, 2020
Merged

Adding listall to listLdapConfigurations#4164
yadvr merged 1 commit into
apache:4.13from
shapeblue:fix-list-ldap-config

Conversation

@davidjumani

Copy link
Copy Markdown
Contributor

Description

Adds the listall parameter to listLdapConfigurations.
If set to true, and no domainid specified, list all LDAP configurations irrespective of the linked domain

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 ldapconfigurations listall=true 
{
  "LdapConfiguration": [
    {
      "domainid": "3eca21e9-b1f3-11ea-ba9c-50eb71576f75",
      "hostname": "primate-qa.cloudstack.cloud",
      "port": 389
    },
    {
      "domainid": "2b660440-759f-4490-99ba-cddd9cbff2af",
      "hostname": "primate-qa.cloudstack.cloud",
      "port": 389
    },
    {
      "hostname": "primate-qa.cloudstack.cloud",
      "port": 389
    }
  ],
  "count": 3
}
(localhost) 🐱 > list ldapconfigurations 
{
  "LdapConfiguration": [
    {
      "hostname": "primate-qa.cloudstack.cloud",
      "port": 389
    }
  ],
  "count": 1
}
(localhost) 🐱 > list ldapconfigurations domainid=2b660440-759f-4490-99ba-cddd9cbff2af listall=true 
{
  "LdapConfiguration": [
    {
      "domainid": "2b660440-759f-4490-99ba-cddd9cbff2af",
      "hostname": "primate-qa.cloudstack.cloud",
      "port": 389
    }
  ],
  "count": 1
}

@davidjumani

Copy link
Copy Markdown
Contributor Author

@rhtyd Added this to allow primate to work properly
@DaanHoogland Looks good ?
@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-1427

@DaanHoogland DaanHoogland left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

looks good, i'm sorry we painted ourselves in the corner like this. One thing to test though is if multiple servers are set, either globally or on a domain. will they all show.

@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-1811)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47262 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4164-t1811-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_pvlan.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_create_pvlan_network Error 0.03 test_pvlan.py
test_03_create_redundant_VPC_1tier_2VMs_2IPs_2PF_ACL_reboot_routers Failure 327.85 test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics Failure 3780.82 test_vpc_redundant.py

@davidjumani

Copy link
Copy Markdown
Contributor Author

@DaanHoogland tested and working for multiple servers

@DaanHoogland

Copy link
Copy Markdown
Contributor

@rhtyd casn you have a look as well?

@DaanHoogland
DaanHoogland requested a review from yadvr June 23, 2020 11:40

@yadvr yadvr left a comment

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.

LGTM, did not test it

@yadvr

yadvr commented Jun 24, 2020

Copy link
Copy Markdown
Member

@davidjumani can you change the base branch to at least 4.14 and kick tests again? We want any bugfixes and API improvements (for Primate) to at least go into 4.14 branch.

@davidjumani
davidjumani changed the base branch from master to 4.13 June 24, 2020 03:57
@davidjumani
davidjumani force-pushed the fix-list-ldap-config branch 2 times, most recently from 06a9683 to d3b90bb Compare June 24, 2020 04:04
@davidjumani
davidjumani force-pushed the fix-list-ldap-config branch from d3b90bb to 47fdc1e Compare June 24, 2020 04:06
@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-1441

@yadvr

yadvr commented Jun 24, 2020

Copy link
Copy Markdown
Member

@blueorangutan test

@blueorangutan

Copy link
Copy Markdown

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

@yadvr yadvr added this to the 4.13.2.0 milestone Jun 24, 2020
@blueorangutan

Copy link
Copy Markdown

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

Test Result Time (s) Test File
test_02_vpc_privategw_static_routes Failure 176.53 test_privategw_acl.py
test_03_vpc_privategw_restart_vpc_cleanup Failure 174.72 test_privategw_acl.py
test_04_rvpc_privategw_static_routes Failure 237.66 test_privategw_acl.py

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.

5 participants