Skip to content

fix typo c&p bug in externalId feature UI - #2534

Closed
DaanHoogland wants to merge 77 commits into
4.11from
DaanHoogland-patch-1
Closed

fix typo c&p bug in externalId feature UI#2534
DaanHoogland wants to merge 77 commits into
4.11from
DaanHoogland-patch-1

Conversation

@DaanHoogland

Copy link
Copy Markdown
Contributor

see #2533

Description

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)

Screenshots (if appropriate):

How Has This Been Tested?

Checklist:

  • I have read the CONTRIBUTING document.
  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
    Testing
  • I have added tests to cover my changes.
  • All relevant new and existing integration tests have passed.
  • A full integration testsuite with all test that can run on my environment has passed.

@blueorangutan package

yadvr and others added 30 commits January 15, 2018 17:43
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
#2283)

Remove maven standard module (which only a few were using) and get ride of maven customization for the projects structure.

- moved all directories to src/main/java, src/main/resources, src/main/scripts, src/test/java, src/test/resources
- grep scan to search for src/com and src/org left over
- grep for <project>/scripts to fix pom.xml configuration
- remove custom <build> configuration in pom.xml

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
- CLOUDSTACK-10244: Cache whether to migrate storage

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This fixes move refactoring error introduced in #2283 
For instance, the class DatadiskTO is supposed to be in com.cloud.agent.api.to package. However, the folder structure it was placed in is com.cloud.agent.api.api.to.

Skip tests for cloud-plugin-hypervisor-ovm3:
For some unknown reason, there are quite a lot of broken test cases for cloud-plugin-hypervisor-ovm3. They might have appeared after some dependency upgrade and was overlooked by the person updating them. I checked them to see if they could be fixed, but these tests are not developed in a clear and clean manner. On top of that, we do not see (at least I) people using OVM3-hypervisor with ACS. Therefore, I decided to skip them.

Identention corrected to use spaces instead of tabs in XML files
- CLOUDSTACK-10239: Fallback to default provider if needed (#2430)
- CLOUDSTACK-10255: Fix agent logrotate (#2429)
…2431)

* CLOUDSTACK-10225: Remove unused methods from StringUtils

Signed-off-by: Wido den Hollander <wido@widodh.nl>

* CLOUDSTACK-10225: Deprecate StringUtils.isNotBlank

Signed-off-by: Wido den Hollander <wido@widodh.nl>

* CLOUDSTACK-10225: Make isNotBlank a wrapper around Apache Commons

Signed-off-by: Wido den Hollander <wido@widodh.nl>
…vice offering

ACS is accounting the resources properly when deploying VMs with custom service offerings. However, there are other methods (such as updateResourceCount) that do not execute the resource accounting properly, and these methods update the resource count for an account in the database. Therefore, if a user deploys VMs with custom service offerings, and later this user calls the “updateResourceCount” method, it (the method) will only account for VMs with normal service offerings, and update this as the number of resources used by the account. This will result in a smaller number of resources to be accounted for the given account than the real used value. The problem becomes worse because if the user starts to delete these VMs, it is possible to reach negative values of resources allocated (breaking all of the resource limiting for accounts). This is a very serious attack vector for public cloud providers!
CLOUDSTACK-10269: On deletion of role set name to null (#2444)
CLOUDSTACK-10146 checksum in java instead of script (#2405)
CLOUDSTACK-10222: Clean snaphosts from primary storage when taking (#2398)

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
…2432)

- We should return a boolean and not a String 'true' or 'false'. Although this output is never checked by the calling function(s).
- Do not use == False or == None as that is not according to the Python specs.
- Calling just print 'hello' is deprecated and won't work in newer Python versions. We should use the print() function.
- Remove unused and commented function.
- Use logging.warning() instead of logging.warn()
- Use subprocess.check_output() for execution. This is the Python way of executing commands.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
The ACL rules editing/addition page is not user-friendly. Users are not able to see in a single view all of the detail of the ACL rule (they need to use a scroll bar on the horizontal). The problem becomes worse when there are a considerable number of rules. Therefore, we are proposing the following changes:

1- Instead of using the table to create new ACL, we can create a button like the one presented in attached pictures, where users can click, and then a modal popup would appear and users would be able to create the new ACL there. This is similar to the workings of the ACL edit button.
2 - Remove the ability to add new ACL via table where they are presented. All ACLs should be entered via the “New ACL” button. Therefore, the section “Add ACL” would be removed as well;
3 - Move the action section of the list ACL table to the most left position;

These changes would reduce the information in the table and facilitate users to add new rules and easily edit them as well.
[CLOUDSTACK-10128] Simplify the search for hosts to execute commands
[CLOUDSTACK-10293] Single view network ACL rules listing
CLOUDSTACK-10295 Marvin: add support for password-enabled templates
[CLOUDSTACK-10283] Sudo to setup agent keystore, fail on host add.
yadvr and others added 12 commits March 27, 2018 22:53
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
…es (#2510)

* Add log stack traces

* Change log stack traces

Add original stack trace to the new throw and delete the error logs
…an ACL rule (#2496)

* [CLOUDSTACK-10332] Users are not able to change/edit the protocol of an ACL rule

* Code formatting
…ls (#2414)

* [CLOUDSTACK-10241] Duplicated file SRs being created in XenServer pools

Due to a race condition between multiple management servers, in some rare cases, CloudStack is creating multiple file SRs to the same secondary folder. This causes a problem when introducing the SR to the XenServer pools, as “there will be VDIs with duplicated UUIDs“. The VDIs are the same, but they are seen in different SRs, and therefore cause an error.

The solution to avoid race conditions between management servers is to use a deterministic srUuid for the file SR to be created (we are leaving XenServer with the burden of managing race conditions). The UUID is based on the SR file path and is generated using  UUID#nameUUIDFromBytes. Therefore, if there is an SR with the generated UUID, this means that some other management server has just created it. An exception will occur and it will contain a message saying 'Db_exn.Uniqueness_constraint_violation'. In these unlikely events, we catch the exception and use the method retrieveAlreadyConfiguredSrWithoutException to get the SR that has already been created for the given mount point.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
* 4.11:
  CLOUDSTACK-10287 package require open jdk 1.8 (#2519)
  make Broadcast- and IsolationURI visible to admin (#2520)
In cloudstack no-one person or organisation will ever be able to run all tests involving all kinds of hardware. make the checklist more realistic in this perspective.
@blueorangutan

Copy link
Copy Markdown

@DaanHoogland 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: ✔centos6 ✔centos7 ✔debian. JID-1873

@resmo

resmo commented Apr 5, 2018

Copy link
Copy Markdown
Member

@DaanHoogland just a hint, if you use the keyword "closes issue" github will close the issue after merge of the PR.

@borisstoyanov borisstoyanov 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.

LGTM, no integration tests required since it's a UI change

@resmo resmo 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

@resmo

resmo commented Apr 5, 2018

Copy link
Copy Markdown
Member

target (branch) should be changed to 4.11 before merge

@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, if you think 4.11 can benefit from the changes, send the PR for 4.11.

@DaanHoogland
DaanHoogland changed the base branch from master to 4.11 April 5, 2018 13:03
@DaanHoogland

Copy link
Copy Markdown
Contributor Author

simple github rebase won't work

@DaanHoogland
DaanHoogland changed the base branch from 4.11 to master April 5, 2018 13:04
@blueorangutan

Copy link
Copy Markdown

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

@rafaelweingartner

Copy link
Copy Markdown
Member

@DaanHoogland did this before. You will need to do the following:

  • get the branch DaanHoogland-patch-1
  • reset --hard origin/4.11
  • checrry-pick your commits here to top of 4.11 (conflicts may arise here)
  • execute a push -f to this branch
  • change the target branch here to 4.11

@DaanHoogland

Copy link
Copy Markdown
Contributor Author

Yeah thanks @rafaelweingartner . I just recreated copying those few lines. Won't mess the end result any way.
see #2536

@DaanHoogland
DaanHoogland deleted the DaanHoogland-patch-1 branch April 5, 2018 13:11
@blueorangutan

Copy link
Copy Markdown

Packaging result: ✔centos6 ✔centos7 ✔debian. JID-1875

@DaanHoogland
DaanHoogland changed the base branch from master to 4.11 April 24, 2018 13:39
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.