server: fix listnetworkofferings with domain, refactor listvpofferings #6748

shwstppr · 2022-09-19T06:42:49Z

Description

Fixes #6745

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?

Using API with cmk,

(local) 🍂 > create domain name=d1
{
  "domain": {
    "haschild": false,
    "id": "afd89eeb-da02-4701-8b87-df0701d8c4a8",
    "level": 1,
    "name": "d1",
    "parentdomainid": "fcb3da55-37e0-11ed-b99e-645d8651f45a",
    "parentdomainname": "ROOT",
    "path": "ROOT/d1",
    "secondarystoragetotal": 0
  }
}
(local) 🐷 > create domain name=d2
{
  "domain": {
    "haschild": false,
    "id": "e52fe7a9-0f29-4463-84c4-21bcadf0b99f",
    "level": 1,
    "name": "d2",
    "parentdomainid": "fcb3da55-37e0-11ed-b99e-645d8651f45a",
    "parentdomainname": "ROOT",
    "path": "ROOT/d2",
    "secondarystoragetotal": 0
  }
}
(local) 🙉 > create networkoffering name=n1 displaytext=n1 domainid=fcb3da55-37e0-11ed-b99e-645d8651f45a,fcb3da55-37e0-11ed-b99e-645d8651f45a guestiptype=Isolated traffictype=Guest
{
  "networkoffering": {
    "availability": "Optional",
    "conservemode": true,
    "created": "2022-09-19T12:07:33+0530",
    "displaytext": "n1",
    "domain": "/",
    "domainid": "fcb3da55-37e0-11ed-b99e-645d8651f45a",
    "egressdefaultpolicy": true,
    "forvpc": false,
    "guestiptype": "Isolated",
    "hasannotations": false,
    "id": "391ae3f6-a931-44d7-9ed4-5e24b8bbffe4",
    "internetprotocol": "IPv4",
    "isdefault": false,
    "ispersistent": false,
    "name": "n1",
    "networkrate": 200,
    "service": [],
    "serviceofferingid": "08886d07-11eb-48e1-ac7f-f0f92fbfe085",
    "specifyipranges": false,
    "specifyvlan": false,
    "state": "Disabled",
    "supportspublicaccess": false,
    "supportsstrechedl2subnet": false,
    "traffictype": "Guest"
  }
}
(local) 🍄 > list networkofferings domainid=afd89eeb-da02-4701-8b87-df0701d8c4a8 filter=id,name,state
{
  "count": 15,
  "networkoffering": [
    {
      "id": "32c33040-c64b-4f2a-aa4e-fefd72e5e4d4",
      "name": "DefaultSharedNetworkOfferingWithSGService",
      "state": "Enabled"
    },
    ...
    {
      "id": "391ae3f6-a931-44d7-9ed4-5e24b8bbffe4",
      "name": "n1",
      "state": "Disabled"
    }
  ]
}
(local) 🐞 > list networkofferings domainid=e52fe7a9-0f29-4463-84c4-21bcadf0b99f  filter=id,name,state
{
  "count": 15,
  "networkoffering": [
    {
      "id": "32c33040-c64b-4f2a-aa4e-fefd72e5e4d4",
      "name": "DefaultSharedNetworkOfferingWithSGService",
      "state": "Enabled"
    },
    ...
    {
      "id": "391ae3f6-a931-44d7-9ed4-5e24b8bbffe4",
      "name": "n1",
      "state": "Disabled"
    }
  ]
}

acs-robot · 2022-09-19T06:44:04Z

Found UI changes, kicking a new UI QA build
@blueorangutan ui

blueorangutan · 2022-09-19T06:45:03Z

@acs-robot a Jenkins job has been kicked to build UI QA env. I'll keep you posted as I make progress.

blueorangutan · 2022-09-19T06:50:12Z

UI build: ✔️
Live QA URL: http://qa.cloudstack.cloud:8080/client/pr/6748 (SL-JID-2379)

sonarqubecloud · 2022-09-19T07:50:16Z

Kudos, SonarCloud Quality Gate passed!

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

9.8% Coverage
0.0% Duplication

codecov · 2022-09-19T08:40:36Z

Codecov Report

Merging #6748 (744d839) into main (5665782) will increase coverage by 0.00%.
The diff coverage is 2.94%.

@@            Coverage Diff             @@
##               main    #6748    +/-   ##
==========================================
  Coverage     11.76%   11.77%            
- Complexity     7661     7669     +8     
==========================================
  Files          2503     2505     +2     
  Lines        245958   246169   +211     
  Branches      38374    38390    +16     
==========================================
+ Hits          28946    28995    +49     
- Misses       213248   213402   +154     
- Partials       3764     3772     +8

Impacted Files	Coverage Δ
.../main/java/com/cloud/domain/dao/DomainDaoImpl.java	`19.49% <0.00%> (-1.89%)`	⬇️
...ain/java/com/cloud/network/vpc/VpcManagerImpl.java	`8.62% <0.00%> (-0.03%)`	⬇️
.../cloud/configuration/ConfigurationManagerImpl.java	`12.51% <20.00%> (+0.03%)`	⬆️
...com/cloud/agent/manager/ConnectedAgentAttache.java	`25.00% <0.00%> (-12.50%)`	⬇️
...m/resource/wrapper/LibvirtReadyCommandWrapper.java	`61.53% <0.00%> (-11.19%)`	⬇️
...dstack/network/contrail/model/ModelObjectBase.java	`21.15% <0.00%> (-7.70%)`	⬇️
...ava/com/cloud/upgrade/dao/Upgrade41510to41520.java	`12.50% <0.00%> (-1.79%)`	⬇️
...ava/com/cloud/upgrade/dao/Upgrade41720to41800.java	`0.64% <0.00%> (-1.25%)`	⬇️
...ava/com/cloud/upgrade/dao/Upgrade41520to41600.java	`6.45% <0.00%> (-1.02%)`	⬇️
...udstack/consoleproxy/ConsoleAccessManagerImpl.java	`5.30% <0.00%> (-0.25%)`	⬇️
... and 25 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

DaanHoogland · 2022-12-13T09:01:31Z

@blueorangutan package

blueorangutan · 2022-12-13T09:02:03Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2022-12-13T18:15:11Z

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

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

shwstppr · 2022-12-14T08:10:21Z

Not ready. Need to test after latest commit

shwstppr · 2023-01-10T07:56:32Z

@blueorangutan package

blueorangutan · 2023-01-10T07:57:05Z

@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-01-10T08:49:15Z

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

Fixes apache#6745 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2023-01-13T11:06:25Z

@blueorangutan package

blueorangutan · 2023-01-13T11:07:04Z

@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

shwstppr · 2023-01-13T11:14:38Z

@blueorangutan package

blueorangutan · 2023-01-13T11:15:04Z

@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-01-13T11:59:46Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 5264

DaanHoogland · 2023-01-20T10:59:04Z

@blueorangutan package

blueorangutan · 2023-01-20T11:00:04Z

@DaanHoogland a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

shwstppr · 2023-01-20T11:16:25Z

@DaanHoogland refactor to use DomainManagerImpl is failing build with unit test failures in CreateNetworkOfferingTest. I don't have a solution for it right now

blueorangutan · 2023-01-20T12:01:34Z

Packaging result: ✖️ el7 ✖️ el8 ✖️ el9 ✖️ debian ✖️ suse15. SL-JID 5346

shwstppr · 2023-01-20T12:28:08Z

@blueorangutan package

blueorangutan · 2023-01-20T12:29:03Z

@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-01-20T13:22:46Z

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

DaanHoogland · 2023-01-20T14:01:06Z

@blueorangutan test

blueorangutan · 2023-01-20T14:02:03Z

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

blueorangutan · 2023-01-21T02:43:53Z

Trillian test result (tid-5928)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 44332 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6748-t5928-kvm-centos7.zip
Smoke tests completed. 107 look OK, 0 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File

DaanHoogland

code looks good.

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr · 2023-01-23T10:31:23Z

@blueorangutan package

blueorangutan · 2023-01-23T10:32:04Z

@shwstppr a Jenkins job has been kicked to build packages. It will be bundled with KVM, XenServer and VMware SystemVM templates. I'll keep you posted as I make progress.

blueorangutan · 2023-01-23T11:26:10Z

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

DaanHoogland · 2023-01-23T11:27:24Z

@blueorangutan test

sonarqubecloud · 2023-01-23T11:28:02Z

SonarCloud Quality Gate failed.

0 Bugs
0 Vulnerabilities
0 Security Hotspots
0 Code Smells

5.8% Coverage
0.0% Duplication

blueorangutan · 2023-01-23T11:28:03Z

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

vladimirpetrov

LGTM based on manual testing.

blueorangutan · 2023-01-24T00:32:54Z

Trillian test result (tid-5956)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 45713 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr6748-t5956-kvm-centos7.zip
Smoke tests completed. 106 look OK, 1 have errors, 0 did not run
Only failed and skipped tests results shown below:

Test	Result	Time (s)	Test File
test_08_upgrade_kubernetes_ha_cluster	`Failure`	578.42	test_kubernetes_clusters.py

apache#6748)

boring-cyborg bot added component:networking component:vpc labels Sep 19, 2022

DaanHoogland added this to the 4.18.0.0 milestone Sep 27, 2022

GutoVeronezi reviewed Dec 13, 2022

View reviewed changes

boring-cyborg bot added the component:api label Dec 28, 2022

boring-cyborg bot added component:agent component:build component:compute component:orchestration component:storage distro:ubuntu labels Jan 13, 2023

shwstppr added 4 commits January 13, 2023 13:59

server: fix listnetworkofferings with domain, refactor listvpofferings

875d2e8

Fixes apache#6745 Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

address comments

6f87729

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

consistency

146d5da

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

refactor

6c06e95

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

shwstppr force-pushed the fix-offering-domain-listing branch from 867fc4b to 6c06e95 Compare January 13, 2023 08:30

shwstppr force-pushed the fix-offering-domain-listing branch from 8f4d943 to 98cbcff Compare January 16, 2023 07:13

shwstppr force-pushed the fix-offering-domain-listing branch from 98cbcff to 6c06e95 Compare January 20, 2023 12:27

shwstppr marked this pull request as ready for review January 21, 2023 04:39

DaanHoogland approved these changes Jan 23, 2023

View reviewed changes

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java Outdated Show resolved Hide resolved

DaanHoogland assigned vladimirpetrov Jan 23, 2023

refactor

744d839

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>

vladimirpetrov approved these changes Jan 23, 2023

View reviewed changes

DaanHoogland merged commit 2dd2955 into apache:main Jan 24, 2023

DaanHoogland deleted the fix-offering-domain-listing branch January 24, 2023 08:30

stephankruggg pushed a commit to scclouds/cloudstack that referenced this pull request Jan 25, 2023

server: fix listnetworkofferings with domain, refactor listvpofferings (

233fb57

apache#6748)

server: fix listnetworkofferings with domain, refactor listvpofferings #6748

server: fix listnetworkofferings with domain, refactor listvpofferings #6748

Uh oh!

Conversation

shwstppr commented Sep 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

Feature/Enhancement Scale or Bug Severity

Feature/Enhancement Scale

Bug Severity

Screenshots (if appropriate):

How Has This Been Tested?

Uh oh!

acs-robot commented Sep 19, 2022

Uh oh!

blueorangutan commented Sep 19, 2022

Uh oh!

blueorangutan commented Sep 19, 2022

Uh oh!

sonarqubecloud bot commented Sep 19, 2022

Uh oh!

codecov bot commented Sep 19, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

DaanHoogland commented Dec 13, 2022

Uh oh!

blueorangutan commented Dec 13, 2022

Uh oh!

blueorangutan commented Dec 13, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

shwstppr commented Dec 14, 2022

Uh oh!

shwstppr commented Jan 10, 2023

Uh oh!

blueorangutan commented Jan 10, 2023

Uh oh!

blueorangutan commented Jan 10, 2023

Uh oh!

shwstppr commented Jan 13, 2023

Uh oh!

blueorangutan commented Jan 13, 2023

Uh oh!

shwstppr commented Jan 13, 2023

Uh oh!

blueorangutan commented Jan 13, 2023

Uh oh!

blueorangutan commented Jan 13, 2023

Uh oh!

DaanHoogland commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 20, 2023

Uh oh!

shwstppr commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 20, 2023

Uh oh!

shwstppr commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 20, 2023

Uh oh!

DaanHoogland commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 20, 2023

Uh oh!

blueorangutan commented Jan 21, 2023

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

shwstppr commented Jan 23, 2023

Uh oh!

shwstppr commented Sep 19, 2022 •

edited

Loading

codecov bot commented Sep 19, 2022 •

edited

Loading