Enable service offerings to be scoped to domain(s) and zone(s) #3248

shwstppr · 2019-03-29T06:17:06Z

Description

Problem: Service, disk, network, and VPC offerings cannot be linked to specified multiple domain(s) and zone(s).
Root cause: Service, disk, network, and VPC offerings are independent of zones. Service and disk offerings can be linked only to a single domain/sub-domain
Solution: Service, disk, network, and VPC offerings will be allowed to be created with specified domain(s) and zone(s). Offerings linked with multiple domains and zones can be created both with UI and API. Refactored create offering API to allow the passing list of domain and zone IDs with domainid and zoneid parameter respectively. UI has been refactored to allow selecting multiple domains and zones while creating offering using multi-select elements. When the list of passed domains contain both parent and child domains, the offering will be created for the parent domain. Offering details will now show a list of linked domains and zones as a comma-separated list of names. Linked domains and zones will be stored in the cloud.*_offering_details table in the database as a separate row for each domain and zone ID with key domainid and zoneid respectively.
Linked domain(s) and zone(s) for an offering (service, disk, network, or VPC) can be updated using update*Offering API. To make a domain-specific offering public by root admin, domainid=public can be passed in the API call. To make a zone specific offering available for all zones by root admin, zoneid=all can be passed in the API call. Update Offering Access action has been added to the offerings page in UI which will allow updating linked domain(s) and zone(s) for an offering.
Domain-admins can update compute and disk offerings. However, they can not change zones for the offerings specified for their domain or subdomains. They cannot change name, display text, sort-key for offerings specified for their domains/subdomains and also other domains which are not child domain for them. They can chnage domains(within their subdomains) for the offerings specified for their domains/subdomains.

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):

Updated create offering forms

Updated disk offering details with domains and zones,

Update Offering Access UI

Cloudmonkey API call

Update offering API call

update serviceoffering id=02cd857c-0009-4f8f-8dc6-96d86745a88f domainid=public zoneid=all
{
  "serviceoffering": {
    "cpunumber": 1,
    "cpuspeed": 1000,
    "created": "2019-06-21T14:55:25+0530",
    "defaultuse": false,
    "displaytext": "lol",
    "id": "02cd857c-0009-4f8f-8dc6-96d86745a88f",
    "iscustomized": false,
    "issystem": false,
    "isvolatile": false,
    "limitcpuuse": false,
    "memory": 1234,
    "name": "lol",
    "offerha": false,
    "provisioningtype": "thin",
    "storagetype": "shared"
  }
}

update serviceoffering id=02cd857c-0009-4f8f-8dc6-96d86745a88f zoneid=3d2139c0-b122-46ec-9167-6312f5928f11,8d616250-146f-4694-a167-c6c0795f8bcf domainid=804ebc06-f5d2-46e7-b84c-670bd0a02398,3aeefdda-f1e1-4c74-a0cb-062f42ccef05
{
  "serviceoffering": {
    "cpunumber": 1,
    "cpuspeed": 1000,
    "created": "2019-06-21T14:55:25+0530",
    "defaultuse": false,
    "displaytext": "lol",
    "domain": "L11,Something",
    "domainid": "3aeefdda-f1e1-4c74-a0cb-062f42ccef05,804ebc06-f5d2-46e7-b84c-670bd0a02398",
    "id": "02cd857c-0009-4f8f-8dc6-96d86745a88f",
    "iscustomized": false,
    "issystem": false,
    "isvolatile": false,
    "limitcpuuse": false,
    "memory": 1234,
    "name": "lol",
    "offerha": false,
    "provisioningtype": "thin",
    "serviceofferingdetails": {
      "domainid": "5",
      "zoneid": "2"
    },
    "storagetype": "shared",
    "zone": "Sandbox-simulator,Sandbox-simulator1",
    "zoneid": "3d2139c0-b122-46ec-9167-6312f5928f11,8d616250-146f-4694-a167-c6c0795f8bcf"
  }
}

How Has This Been Tested?

From UI and cmk

borisstoyanov · 2019-03-29T11:00:36Z

@blueorangutan package

blueorangutan · 2019-03-29T11:01:10Z

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

blueorangutan · 2019-03-29T11:09:02Z

Packaging result: ✖centos6 ✖centos7 ✖debian. JID-2662

borisstoyanov

There seems to be some build issues here, could you please investigate @shwstppr

DaanHoogland · 2019-04-12T14:14:38Z

api/src/main/java/org/apache/cloudstack/api/command/user/offering/ListDiskOfferingsCmd.java

+            entityType = ZoneResponse.class,
+            description = "id of zone disk offering is associated with",
+            since = "4.13")
+    private Long zoneId;


only for a zone, not for domains or multiple zones?

@DaanHoogland List APIs are changed only for a single zone. Multiple domains and zones can be specified with create or update APIs.
Single zone in list API is needed as when we create storage, network or deploy VM we select or specify a particular zone. Therefore we need to query those offerings which are available for that particular zone or domain(through calling account).

DaanHoogland · 2019-04-12T14:15:49Z

api/src/main/java/org/apache/cloudstack/api/command/user/vpc/ListVPCOfferingsCmd.java

+            entityType = ZoneResponse.class,
+            description = "id of zone disk offering is associated with",
+            since = "4.13")
+    private Long zoneId;


again, only for a single zone, not domains?

DaanHoogland · 2019-04-12T14:18:05Z

api/src/main/java/org/apache/cloudstack/api/response/NetworkOfferingResponse.java

    private Boolean supportsPublicAccess;

+    @SerializedName(ApiConstants.DOMAIN_ID)
+    @Param(description = "the domain ID(s) this disk offering belongs to. Ignore this information as it is not currently applicable.")


said to be multiple but the getter does not seem to facilitate this

Multiple domains are supported with a comma-separated list of domain IDs. This is done to maintain backward compatibility and consistency. ServiceOfferingResponse and DiskOfferingResponse already had a domainId parameter and if an array of IDs would have been used instead of comma-separated string it might have broken automation scripts for some.

cmk example for VPCOffering response,

PaulAngus · 2019-04-26T14:36:58Z

@blueorangutan package

blueorangutan · 2019-04-26T14:38:03Z

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

blueorangutan · 2019-04-26T14:59:56Z

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

PaulAngus · 2019-04-26T15:46:00Z

@blueorangutan matrix

rohityadavcloud · 2019-05-23T14:35:25Z

@shwstppr can you fix the conflicts?

Allows creating storage offerings associated with particular domain(s) and zone(s). In create disk/storage offfering form UI, a mult-select control has been addded to select desired zone(s) and domain select element has been made multi-select. createDiskOffering API has been modified to allow passing list of domain and zone IDs with keys domainids and zoneids respectively. These lists are stored in DB in cloud.disk_offering_details table with 'domainids' and 'zoneids' key as string of comma separated list of IDs. Response for create, update and list disk offering APIs will return domainids, domainnames, zoneids and zonenames in details object of offering. listDiskOfferings API has been modified to allow passing zoneid to return only offerings which are associated with the zone. Signed-off-by: Abhishek Kumar <[email protected]>

Signed-off-by: Rohit Yadav <[email protected]>

blueorangutan · 2019-07-09T16:08:58Z

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

rohityadavcloud · 2019-07-12T07:10:17Z

Let's repackage one of the UI issues was fixed recently on master.
@blueorangutan package

blueorangutan · 2019-07-12T07:11:17Z

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

blueorangutan · 2019-07-12T07:50:09Z

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

Signed-off-by: Abhishek Kumar <[email protected]>

borisstoyanov · 2019-07-12T08:30:53Z

@blueorangutan package

blueorangutan · 2019-07-12T08:31:17Z

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

blueorangutan · 2019-07-12T08:51:32Z

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

borisstoyanov

LGTM, reviewed the latest fixes

rohityadavcloud · 2019-07-12T11:34:04Z

@blueorangutan test

blueorangutan · 2019-07-12T11:34:18Z

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

blueorangutan · 2019-07-12T19:27:19Z

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

Test	Result	Time (s)	Test File

anuragaw

LGTM

rohityadavcloud · 2019-07-15T11:35:13Z

Ping @PaulAngus @borisstoyanov

PaulAngus · 2019-07-16T09:23:26Z

LGTM based on manual testing.

PaulAngus

LGTM based on manual testing

rohityadavcloud · 2019-07-16T12:12:22Z

Was the branch merged @PaulAngus @shwstppr? I'll request again that PRs be squash+merged and branches not be merged as is to avoid fragmentation of commits wrt a feature or a bug.

shwstppr · 2019-07-16T13:01:14Z

Was the branch merged @PaulAngus @shwstppr? I'll request again that PRs be squash+merged and branches not be merged as is to avoid fragmentation of commits wrt a feature or a bug.

Can we revert and squash-merge again @rhtyd?

rohityadavcloud · 2019-07-16T13:19:32Z

No need.

shwstppr mentioned this pull request Mar 29, 2019

server: disk offerings for specified domain(s) and zone(s) shapeblue/cloudstack#41

Closed

5 tasks

rohityadavcloud force-pushed the storage-offering-domains-zones branch from ea163b8 to 3b9e2b5 Compare March 29, 2019 06:22

rohityadavcloud changed the title ~~server: disk offerings for specified domain(s) and zone(s)~~ [WIP DO NOT MERGE] server: disk offerings for specified domain(s) and zone(s) Mar 29, 2019

rohityadavcloud added this to the 4.13.0.0 milestone Mar 29, 2019

borisstoyanov requested changes Mar 29, 2019

View reviewed changes

shwstppr force-pushed the storage-offering-domains-zones branch 3 times, most recently from 3f03aed to 30d5f52 Compare April 1, 2019 06:21

rohityadavcloud force-pushed the storage-offering-domains-zones branch from 30d5f52 to 46e1cc6 Compare April 1, 2019 09:11

rohityadavcloud mentioned this pull request Apr 4, 2019

[WIP DO NOT MERGE] server: compute offering for specified domain(s) and zone(s) #3250

Closed

5 tasks

shwstppr changed the title ~~[WIP DO NOT MERGE] server: disk offerings for specified domain(s) and zone(s)~~ [WIP DO NOT MERGE] server: offerings for specified domain(s) and zone(s) Apr 9, 2019

DaanHoogland reviewed Apr 12, 2019

View reviewed changes

shwstppr and others added 8 commits May 24, 2019 09:56

refactorings

728afba

Signed-off-by: Rohit Yadav <[email protected]>

DB upgrade path and UI fixes

9c117f2

Signed-off-by: Rohit Yadav <[email protected]>

remove domain id usage

7721126

Signed-off-by: Rohit Yadav <[email protected]>

wip changes

5988884

Signed-off-by: Rohit Yadav <[email protected]>

wip domainId removal stuff

8cabbce

Signed-off-by: Rohit Yadav <[email protected]>

server: fix failing unit test issue

02913e9

Signed-off-by: Rohit Yadav <[email protected]>

find in set implementation

6a90246

Signed-off-by: Rohit Yadav <[email protected]>

PaulAngus changed the title ~~[WIP DO NOT MERGE] server: offerings for specified domain(s) and zone(s)~~ [WIP DO NOT MERGE] service offerings for specified domain(s) and zone(s) Jul 11, 2019

PaulAngus changed the title ~~[WIP DO NOT MERGE] service offerings for specified domain(s) and zone(s)~~ [WIP DO NOT MERGE] Enable service offerings to be scoped to domain(s) and zone(s) Jul 11, 2019

Merge branch 'master' into storage-offering-domains-zones

7010f85

shwstppr mentioned this pull request Jul 12, 2019

Network offerings dropdown is broken in UI #3487

Closed

shwstppr added 2 commits July 12, 2019 13:39

server: fix for user account able to list child domain n/w offering

cb8f58b

Signed-off-by: Abhishek Kumar <[email protected]>

ui: fix for multiple network offering listing

6d51689

Signed-off-by: Abhishek Kumar <[email protected]>

borisstoyanov approved these changes Jul 12, 2019

View reviewed changes

anuragaw approved these changes Jul 15, 2019

View reviewed changes

shwstppr closed this Jul 16, 2019

shwstppr reopened this Jul 16, 2019

shwstppr changed the title ~~[WIP DO NOT MERGE] Enable service offerings to be scoped to domain(s) and zone(s)~~ Enable service offerings to be scoped to domain(s) and zone(s) Jul 16, 2019

PaulAngus self-requested a review July 16, 2019 09:24

PaulAngus approved these changes Jul 16, 2019

View reviewed changes

PaulAngus merged commit e15c311 into apache:master Jul 16, 2019

weizhouapache mentioned this pull request Aug 19, 2021

Allow domain admins to create offering without mentioning domainid #4200

Closed

5 tasks

Enable service offerings to be scoped to domain(s) and zone(s) #3248

Enable service offerings to be scoped to domain(s) and zone(s) #3248

Uh oh!

Conversation

shwstppr commented Mar 29, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

borisstoyanov commented Mar 29, 2019

Uh oh!

blueorangutan commented Mar 29, 2019

Uh oh!

blueorangutan commented Mar 29, 2019

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

shwstppr Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

DaanHoogland Apr 12, 2019

Choose a reason for hiding this comment

Uh oh!

shwstppr Apr 12, 2019 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

PaulAngus commented Apr 26, 2019

Uh oh!

blueorangutan commented Apr 26, 2019

Uh oh!

blueorangutan commented Apr 26, 2019

Uh oh!

PaulAngus commented Apr 26, 2019

Uh oh!

rohityadavcloud commented May 23, 2019

Uh oh!

blueorangutan commented Jul 9, 2019

Uh oh!

rohityadavcloud commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

borisstoyanov commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

borisstoyanov left a comment

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

blueorangutan commented Jul 12, 2019

Uh oh!

anuragaw left a comment

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud commented Jul 15, 2019

Uh oh!

PaulAngus commented Jul 16, 2019

Uh oh!

PaulAngus left a comment

Choose a reason for hiding this comment

Uh oh!

rohityadavcloud commented Jul 16, 2019

shwstppr commented Mar 29, 2019 •

edited

Loading

shwstppr Apr 12, 2019 •

edited

Loading