server: allow listing custom offerings for a running VM #5420

shwstppr · 2021-09-08T10:45:48Z

Description

listServiceOffering API when called for a running VM only fails to list all possible offerings especially the custom offerings and all offerings when VM is deployed using a custom offering.
This PR improves the list behviour by adding adding appropriate conditions for the custom offerings.

Fixes #5412

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

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Offerings and VMs

(local) 🦐 > list serviceofferings filter=id,name,cpunumber,cpuspeed,memory,serviceofferingdetails
{
  "count": 6,
  "serviceoffering": [
    {
      "cpunumber": 1,
      "cpuspeed": 500,
      "id": "c17c21bb-faa4-4c14-9774-142260546670",
      "memory": 512,
      "name": "Small Instance"
    },
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "0a785dc5-ff8d-48ed-82b2-e24cbd9587b9",
      "memory": 1024,
      "name": "Medium Instance"
    },
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "3801bb99-4077-4685-919f-2ae51fce90a9",
      "memory": 1536,
      "name": "fixed"
    },
    {
      "cpuspeed": 1000,
      "id": "fe7de1af-b045-4749-a88f-c20a50082c7b",
      "name": "Constrained",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "2560",
        "mincpunumber": "1",
        "minmemory": "256"
      }
    },
    {
      "id": "3799cd94-8284-485e-81f0-bc3c1e6a29f9",
      "name": "Unconstrained"
    },
    {
      "cpuspeed": 1000,
      "id": "b1423e9e-9fcf-48c1-b156-b563cf9bf4dd",
      "name": "Constrained-1",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "3072",
        "mincpunumber": "2",
        "minmemory": "512"
      }
    }
  ]
}
(local) 🦐 > list virtualmachines ids=112b9b4a-12e9-4cfc-8bd7-0e49eabb211f,00774881-64cf-45d1-8c9c-7bdaf7f195da filter=id,name,serviceofferingid,serviceofferingname,details,state
{
  "count": 2,
  "virtualmachine": [
    {
      "details": {
        "cpuNumber": "2",
        "memory": "1024"
      },
      "id": "00774881-64cf-45d1-8c9c-7bdaf7f195da",
      "name": "t5",
      "serviceofferingid": "fe7de1af-b045-4749-a88f-c20a50082c7b",
      "serviceofferingname": "Constrained",
      "state": "Running"
    },
    {
      "details": {},
      "id": "112b9b4a-12e9-4cfc-8bd7-0e49eabb211f",
      "name": "t3",
      "serviceofferingid": "c17c21bb-faa4-4c14-9774-142260546670",
      "serviceofferingname": "Small Instance",
      "state": "Running"
    }
  ]
}

Before change:

(local) 🐣 > list serviceofferings filter=id,name,cpunumber,cpuspeed,memory,serviceofferingdetails virtualmachineid=112b9b4a-12e9-4cfc-8bd7-0e49eabb211f 
{
  "count": 2,
  "serviceoffering": [
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "0a785dc5-ff8d-48ed-82b2-e24cbd9587b9",
      "memory": 1024,
      "name": "Medium Instance"
    },
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "3801bb99-4077-4685-919f-2ae51fce90a9",
      "memory": 1536,
      "name": "fixed"
    }
  ]
}
(local) 🐓 > list serviceofferings filter=id,name,cpunumber,cpuspeed,memory,serviceofferingdetails virtualmachineid=00774881-64cf-45d1-8c9c-7bdaf7f195da

After change:

(local) 🐕 > list serviceofferings filter=id,name,cpunumber,cpuspeed,memory,serviceofferingdetails virtualmachineid=112b9b4a-12e9-4cfc-8bd7-0e49eabb211f 
{
  "count": 5,
  "serviceoffering": [
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "0a785dc5-ff8d-48ed-82b2-e24cbd9587b9",
      "memory": 1024,
      "name": "Medium Instance"
    },
    {
      "cpunumber": 1,
      "cpuspeed": 1000,
      "id": "3801bb99-4077-4685-919f-2ae51fce90a9",
      "memory": 1536,
      "name": "fixed"
    },
    {
      "cpuspeed": 1000,
      "id": "fe7de1af-b045-4749-a88f-c20a50082c7b",
      "name": "Constrained",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "2560",
        "mincpunumber": "1",
        "minmemory": "256"
      }
    },
    {
      "id": "3799cd94-8284-485e-81f0-bc3c1e6a29f9",
      "name": "Unconstrained"
    },
    {
      "cpuspeed": 1000,
      "id": "b1423e9e-9fcf-48c1-b156-b563cf9bf4dd",
      "name": "Constrained-1",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "3072",
        "mincpunumber": "2",
        "minmemory": "512"
      }
    }
  ]
}
(local) 🦑 > list serviceofferings filter=id,name,cpunumber,cpuspeed,memory,serviceofferingdetails virtualmachineid=00774881-64cf-45d1-8c9c-7bdaf7f195da 
{
  "count": 3,
  "serviceoffering": [
    {
      "cpuspeed": 1000,
      "id": "fe7de1af-b045-4749-a88f-c20a50082c7b",
      "name": "Constrained",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "2560",
        "mincpunumber": "1",
        "minmemory": "256"
      }
    },
    {
      "id": "3799cd94-8284-485e-81f0-bc3c1e6a29f9",
      "name": "Unconstrained"
    },
    {
      "cpuspeed": 1000,
      "id": "b1423e9e-9fcf-48c1-b156-b563cf9bf4dd",
      "name": "Constrained-1",
      "serviceofferingdetails": {
        "maxcpunumber": "4",
        "maxmemory": "3072",
        "mincpunumber": "2",
        "minmemory": "512"
      }
    }
  ]
}

listServiceOffering API when called for a running VM only fails to list all possible offerings especially the custom offerings and all offerings when VM is deployed using a custom offering. This PR improves the list behviour by adding adding appropriate conditions for the custom offerings. Fixes apache#5412 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2021-09-08T10:46:09Z

@blueorangutan package

blueorangutan · 2021-09-08T10:47:04Z

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

blueorangutan · 2021-09-08T11:43:54Z

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

shwstppr · 2021-09-09T17:42:55Z

@blueorangutan test

blueorangutan · 2021-09-09T17:46:05Z

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

blueorangutan · 2021-09-10T04:22:54Z

Trillian test result (tid-2004)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35694 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5420-t2004-kvm-centos7.zip
Smoke tests completed. 89 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

rohityadavcloud

LGTM - did not test the PR

nvazquez

Code LGTM

DaanHoogland

clgtm

rohityadavcloud · 2021-09-15T09:25:38Z

ping @shwstppr - can you fix the conflict?

shwstppr · 2021-09-15T09:55:32Z

@blueorangutan package

blueorangutan · 2021-09-15T09:57:02Z

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

blueorangutan · 2021-09-15T10:50:55Z

Packaging result: ✔️ el7 ✖️ el8 ✔️ debian ✖️ suse15. SL-JID 1267

nvazquez · 2021-09-16T04:06:14Z

@blueorangutan package

blueorangutan · 2021-09-16T04:07:04Z

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

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

davidjumani · 2021-09-16T05:06:14Z

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

+                    }
+                    vmMemory = NumbersUtil.parseInt(details.get(ApiConstants.MEMORY), 0);
+                }
+                if (vmCpu != null && vmCpu > 0) {


Would it be better to have a single method to take cpu number, speed and memory and return a single sc instead ?

Not sure if that would add any benefit as that single SearchCriteria will also be a combination of these three SearchCriterias with AND condition

blueorangutan · 2021-09-16T05:12:53Z

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

rohityadavcloud · 2021-09-16T05:17:53Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-09-16T05:20:02Z

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

Co-authored-by: davidjumani <dj.davidjumani1994@gmail.com>

shwstppr · 2021-09-16T05:36:48Z

@rhtyd will restart tests as had to make a change
@blueorangutan package

blueorangutan · 2021-09-16T05:37:03Z

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

blueorangutan · 2021-09-16T06:21:41Z

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

shwstppr · 2021-09-16T06:23:26Z

@blueorangutan test centos7 vmware-67u3

blueorangutan · 2021-09-16T06:26:03Z

@shwstppr a Trillian-Jenkins test job (centos7 mgmt + vmware-67u3) has been kicked to run smoke tests

davidjumani

Verified, list all offering either unconstrained or constrained and GTE than the current value

blueorangutan · 2021-09-16T18:24:04Z

Trillian test result (tid-2084)
Environment: vmware-67u3 (x2), Advanced Networking with Mgmt server 7
Total time taken: 41764 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr5420-t2084-vmware-67u3.zip
Smoke tests completed. 89 look OK, 0 have errors
Only failed tests results shown below:

Test	Result	Time (s)	Test File

sureshanaparti · 2021-09-16T20:16:58Z

Merging based on approvals and test results

shwstppr closed this Sep 9, 2021

shwstppr reopened this Sep 9, 2021

rohityadavcloud requested review from sureshanaparti, nvazquez, GabrielBrascher, DaanHoogland and rohityadavcloud September 13, 2021 09:07

rohityadavcloud approved these changes Sep 13, 2021

View reviewed changes

nvazquez added this to the 4.16.0.0 milestone Sep 14, 2021

nvazquez added status:needs-testing type:bug labels Sep 14, 2021

nvazquez approved these changes Sep 14, 2021

View reviewed changes

DaanHoogland approved these changes Sep 14, 2021

View reviewed changes

Merge branch 'main' into allow-listserviceoffering-customoff

52c4f20

davidjumani reviewed Sep 16, 2021

View reviewed changes

server/src/main/java/com/cloud/api/query/QueryManagerImpl.java Outdated Show resolved Hide resolved

davidjumani reviewed Sep 16, 2021

View reviewed changes

davidjumani removed the status:needs-testing label Sep 16, 2021

Update server/src/main/java/com/cloud/api/query/QueryManagerImpl.java

f09d4dd

Co-authored-by: davidjumani <dj.davidjumani1994@gmail.com>

davidjumani approved these changes Sep 16, 2021

View reviewed changes

sureshanaparti approved these changes Sep 16, 2021

View reviewed changes

sureshanaparti merged commit 981dac7 into apache:main Sep 16, 2021

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

server: allow listing custom offerings for a running VM #5420

server: allow listing custom offerings for a running VM #5420

shwstppr commented Sep 8, 2021

shwstppr commented Sep 8, 2021

blueorangutan commented Sep 8, 2021

blueorangutan commented Sep 8, 2021

shwstppr commented Sep 9, 2021

blueorangutan commented Sep 9, 2021

blueorangutan commented Sep 10, 2021

rohityadavcloud left a comment

nvazquez left a comment

DaanHoogland left a comment

rohityadavcloud commented Sep 15, 2021

shwstppr commented Sep 15, 2021

blueorangutan commented Sep 15, 2021

blueorangutan commented Sep 15, 2021

nvazquez commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

davidjumani Sep 16, 2021

shwstppr Sep 16, 2021

blueorangutan commented Sep 16, 2021

rohityadavcloud commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

shwstppr commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

shwstppr commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

davidjumani left a comment

blueorangutan commented Sep 16, 2021

sureshanaparti commented Sep 16, 2021

server: allow listing custom offerings for a running VM #5420

server: allow listing custom offerings for a running VM #5420

Conversation

shwstppr commented Sep 8, 2021

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

shwstppr commented Sep 8, 2021

blueorangutan commented Sep 8, 2021

blueorangutan commented Sep 8, 2021

shwstppr commented Sep 9, 2021

blueorangutan commented Sep 9, 2021

blueorangutan commented Sep 10, 2021

rohityadavcloud left a comment

Choose a reason for hiding this comment

nvazquez left a comment

Choose a reason for hiding this comment

DaanHoogland left a comment

Choose a reason for hiding this comment

rohityadavcloud commented Sep 15, 2021

shwstppr commented Sep 15, 2021

blueorangutan commented Sep 15, 2021

blueorangutan commented Sep 15, 2021

nvazquez commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

davidjumani Sep 16, 2021

Choose a reason for hiding this comment

shwstppr Sep 16, 2021

Choose a reason for hiding this comment

blueorangutan commented Sep 16, 2021

rohityadavcloud commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

shwstppr commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

shwstppr commented Sep 16, 2021

blueorangutan commented Sep 16, 2021

davidjumani left a comment

Choose a reason for hiding this comment

blueorangutan commented Sep 16, 2021

sureshanaparti commented Sep 16, 2021