You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by GitBox <gi...@apache.org> on 2022/11/23 11:23:44 UTC
[GitHub] [cloudstack] soreana opened a new pull request, #6918: Override vr service offering
soreana opened a new pull request, #6918:
URL: https://github.com/apache/cloudstack/pull/6918
### Description
As of now, it is possible to override the virtual router service offering with global, domain, and account level configurations. What if a customer wants to change the service offering for only one network? There isn't such an option in Cloudstack. As an admin, you can only override the network offering for a domain, account, or global, affecting all the networks in that domain, account, or zone. This pull request aims to add a network-level setting to override the virtual router service offering per network.
<!--- Describe your changes in DETAIL - And how has behaviour functionally changed. -->
<!-- For new features, provide link to FS, dev ML discussion etc. -->
<!-- In case of bug fix, the expected and actual behaviours, steps to reproduce. -->
<!-- When "Fixes: #<id>" is specified, the issue/PR will automatically be closed when this PR gets merged -->
<!-- For addressing multiple issues/PRs, use multiple "Fixes: #<id>" -->
<!-- Fixes: # -->
<!--- ********************************************************************************* -->
<!--- NOTE: AUTOMATATION USES THE DESCRIPTIONS TO SET LABELS AND PRODUCE DOCUMENTATION. -->
<!--- PLEASE PUT AN 'X' in only **ONE** box -->
<!--- ********************************************************************************* -->
### 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)
- [x] 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
- [x] Major
- [ ] Minor
### How Has This Been Tested?
<!-- Please describe in detail how you tested your changes. -->
<!-- Include details of your testing environment, and the tests you ran to -->
<!-- see how your change affects other areas of the code, etc. -->
To test this feature, please follow the below steps:
1. Create a network
2. Create VM in that network (to create a VR)
3. List the network and get the UUID of the network
4. Check the service offering of the network
5. Create a new router service offering
6. Set the `network.router.service.offering` to the UUID of the service offering for the network using the cmk
7. Restart the network with clean up
8. Check the service offering of the network
Useful `cmk` commands:
```
(localcloud) 🐱 > list networks filter=id,name
{
"count": 2,
"network": [
{
"id": "c9d70872-b877-4f02-92b5-b4b08e1095d7",
"name": "isolated-network"
},
{
"id": "1ebf1ca9-7930-4f2f-8263-8da1840f02fc",
"name": "shared"
}
]
}
(localcloud) 🐱 > list configurations networkid=c9d70872-b877-4f02-92b5-b4b08e1095d7
{
"configuration": [
{
"category": "Advanced",
"description": "Uuid of the service offering used by virtual routers of this network; if NULL - account/system offering will be used",
"isdynamic": true,
"name": "network.router.service.offering",
"scope": "network",
"value": ""
}
],
"count": 1
}
(localcloud) 🐱 > list routers filter=serviceofferingid,serviceofferingname
{
"count": 1,
"router": [
{
"serviceofferingid": "f37ed5fd-6f26-4316-8b27-dbebb0b56a5a"
"serviceofferingname": "System Offering For Software Router"
}
]
}
(localcloud) 🐱 > update configuration networkid=c9d70872-b877-4f02-92b5-b4b08e1095d7 name="network.router.service.offering" value="5ad7f2c4-29e0-460b-901b-05ee8de8a0df"
{
"configuration": {
"category": "Advanced",
"description": "Uuid of the service offering used by virtual routers of this network; if NULL - account/system offering will be used",
"isdynamic": true,
"name": "network.router.service.offering",
"scope": "network",
"value": "5ad7f2c4-29e0-460b-901b-05ee8de8a0df"
}
}
(localcloud) 🐱 > restart network id=c9d70872-b877-4f02-92b5-b4b08e1095d7 cleanup=true
{
"success": true
}
(localcloud) 🐱 > list routers filter=serviceofferingid,serviceofferingname
{
"count": 1,
"router": [
{
"serviceofferingid": "5ad7f2c4-29e0-460b-901b-05ee8de8a0df"
"serviceofferingname": "Medium Instance"
}
]
}
```
<!-- Please read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/main/CONTRIBUTING.md) document -->
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557203219
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557539261
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 6100
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Support network-scope settings and add setting to override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1738813352
Packaging result [SF]: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 7153
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1496143216
@soreana 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1764819415
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1365455137
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
`ResourceDetailsDaoBase` is an abstract class, it can not be parent of an interface. Shall I make NetworkDetailsDao abstract class as well?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1360969085
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1369075920
@DaanHoogland The `CreateNetworkOfferingTest` fails and I don't know why :(
Build packages with -DskipTests, they were working. I'm trouble shooting to see what went wrong, let me know if you found anything.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368121407
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1325067807
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 4629
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1572203261
@DaanHoogland Should I be worried? :D
```
[INFO] ------------------------------------------------------------------------
Error: Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar (default-cli) on project cloudstack: Project not found. Please check the 'sonar.projectKey' and 'sonar.organization' properties, the 'SONAR_TOKEN' environment variable, or contact the project administrator -> [Help 1]
Error:
Error: To see the full stack trace of the errors, re-run Maven with the -e switch.
Error: Re-run Maven using the -X switch to enable full debug logging.
Error:
Error: For more information about the errors and possible solutions, please read the following articles:
Error: [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
Error:
Error: After correcting the problems, you can resume the build with the command
Error: mvn <args> -rf :cloudstack
Error: Process completed with exit code 1.
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1363561434
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java:
##########
@@ -86,6 +87,12 @@ public class ResetCfgCmd extends BaseCmd {
description = "the ID of the Image Store to reset the parameter value for corresponding image store")
private Long imageStoreId;
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the ID of the Network to update the parameter value for corresponding network")
Review Comment:
add `since` ?
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -105,6 +106,12 @@ public class ListCfgsByCmd extends BaseListCmd {
@Parameter(name = ApiConstants.PARENT, type = CommandType.STRING, description = "lists configuration by parent name (primarily used for UI)", since = "4.18.0")
private String parentName;
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the ID of the Network to update the parameter value for corresponding network")
Review Comment:
add `since` ?
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java:
##########
@@ -86,6 +87,12 @@ public class ResetCfgCmd extends BaseCmd {
description = "the ID of the Image Store to reset the parameter value for corresponding image store")
private Long imageStoreId;
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the ID of the Network to update the parameter value for corresponding network")
Review Comment:
update -> reset ?
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java:
##########
@@ -101,9 +101,10 @@ protected void createEmptyScopeLevelMappings() {
_scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.Account, new HashSet<ConfigKey<?>>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
+ _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<>());
Review Comment:
you can remove `ConfigKey` from other lines as well
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -105,6 +106,12 @@ public class ListCfgsByCmd extends BaseListCmd {
@Parameter(name = ApiConstants.PARENT, type = CommandType.STRING, description = "lists configuration by parent name (primarily used for UI)", since = "4.18.0")
private String parentName;
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the ID of the Network to update the parameter value for corresponding network")
Review Comment:
update -> list ?
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
could extend `ResourceDetailsDaoBase` instead of `ResourceDetailsDao`
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
+
boolean isNetworkUsageHidden(long networkId);
+
+ Map<String, String> findDetails(long networkId);
Review Comment:
this can be replaced by ResourceDetailsDaoBase.listDetailsKeyPairs
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java:
##########
@@ -90,6 +91,12 @@ public class UpdateCfgCmd extends BaseCmd {
validations = ApiArgValidator.PositiveNumber)
private Long imageStoreId;
+ @Parameter(name = ApiConstants.NETWORK_ID,
+ type = CommandType.UUID,
+ entityType = NetworkResponse.class,
+ description = "the ID of the Network to update the parameter value for corresponding network")
Review Comment:
also here
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1053447723
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
Thanks for verifying that. I will resolve this conversation then :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1502954161
@soreana a Jenkins job has been kicked to build packages. It will be bundled with
SystemVM template(s). I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554592986
Packaging result [LL]: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 6039
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6918: Support network-scope settings and add setting to override vr service offering
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1739713082
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Support network-scope settings and add setting to override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1738720753
@weizhouapache a [SF] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] weizhouapache commented on pull request #6918: Override vr service offering
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1738718484
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1360969311
@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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1052416162
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
@JoaoJandre I didn't know that ACS uses the enums' order. It is surprising for me cause the order might change over time. :)
Anyway, I'm not aware of any regression but I'm redoing the changes just to be safe.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1054157282
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -172,8 +183,11 @@ public void execute() {
if (getDomainId() != null) {
cfgResponse.setScope("domain");
}
- if (getImageStoreId() != null){
- cfgResponse.setScope("imagestore");
+ if (getImageStoreId() != null) {
+ cfgResponse.setScope("imagestore");
+ }
+ if (getNetworkId() != null) {
+ cfgResponse.setScope(ConfigKey.Scope.Network.name());
Review Comment:
@soreana , you have a compile error here:
```
08:58:05 [ERROR] COMPILATION ERROR :
08:58:05 [INFO] -------------------------------------------------------------
08:58:05 [ERROR] /jenkins/workspace/acs-centos7-pkg-builder/dist/rpmbuild/BUILD/cloudstack-4.18.0.0-SNAPSHOT/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:[190,52] error: package ConfigKey.Scope does not exist
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] github-actions[bot] commented on pull request #6918: Override vr service offering
Posted by github-actions.
github-actions[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1410119266
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557463518
@blueorangutan package
Sorry to keep you busy. I promise it would be the last package of the day :D
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1573527684
> @DaanHoogland Should I be worried? :D
>
> ```
> [INFO] ------------------------------------------------------------------------
> Error: Failed to execute goal org.sonarsource.scanner.maven:sonar-maven-plugin:3.9.1.2184:sonar (default-cli) on project cloudstack: Project not found. Please check the 'sonar.projectKey' and 'sonar.organization' properties, the 'SONAR_TOKEN' environment variable, or contact the project administrator -> [Help 1]
> Error:
> Error: To see the full stack trace of the errors, re-run Maven with the -e switch.
> Error: Re-run Maven using the -X switch to enable full debug logging.
> Error:
> Error: For more information about the errors and possible solutions, please read the following articles:
> Error: [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
> Error:
> Error: After correcting the problems, you can resume the build with the command
> Error: mvn <args> -rf :cloudstack
> Error: Process completed with exit code 1.
> ```
Not about Sonar, it is disabled for now (we should really remove it) due to security concerns. The other three failing actions should pass though.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368201891
@DaanHoogland Happy new year. :)
I tried to fix the test failure, but I couldn't. Can you have a look when you have time please?
```
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest1
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.fork(ForkStarter.java:669)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:282)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:245)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeProvider(AbstractSurefireMojo.java:1183)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] stephankruggg commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
stephankruggg commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1059405999
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -1072,6 +1100,21 @@ public Pair<Configuration, String> resetConfiguration(final ResetCfgCmd cmd) thr
newValue = optionalValue.isPresent() ? optionalValue.get().toString() : defaultValue;
break;
+ case Network:
+ final NetworkVO network = _networkDao.findById(id);
+ if (network == null) {
+ throw new InvalidParameterValueException("unable to find network by id " + id);
Review Comment:
```suggestion
throw new InvalidParameterValueException(String.format("Unable to find network by ID [%s].", id));
```
##########
server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java:
##########
@@ -725,6 +729,21 @@ public String updateConfiguration(final long userId, final String name, final St
}
break;
+ case Network:
+ final NetworkVO network = _networkDao.findById(resourceId);
+ if (network == null) {
+ throw new InvalidParameterValueException("unable to find network by id " + resourceId);
Review Comment:
```suggestion
throw new InvalidParameterValueException(String.format("Unable to find network by ID [%s].", resourceId));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1568034721
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6918: Override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1093041768
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java:
##########
@@ -93,9 +93,10 @@ protected void createEmptyScopeLevelMappings() {
_scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.Account, new HashSet<ConfigKey<?>>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.Domain, new HashSet<ConfigKey<?>>());
+ _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.ManagementServer, new HashSet<ConfigKey<?>>());
+ _scopeLevelConfigsMap.put(ConfigKey.Scope.Network, new HashSet<ConfigKey<?>>());
Review Comment:
```suggestion
_scopeLevelConfigsMap.put(ConfigKey.Scope.Network, new HashSet<>());
```
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/impl/ConfigDepotImpl.java:
##########
@@ -93,9 +93,10 @@ protected void createEmptyScopeLevelMappings() {
_scopeLevelConfigsMap.put(ConfigKey.Scope.Cluster, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.StoragePool, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.Account, new HashSet<ConfigKey<?>>());
- _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
_scopeLevelConfigsMap.put(ConfigKey.Scope.Domain, new HashSet<ConfigKey<?>>());
+ _scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<ConfigKey<?>>());
Review Comment:
```suggestion
_scopeLevelConfigsMap.put(ConfigKey.Scope.ImageStore, new HashSet<>());
```
diamond operator instead of type spec (not useful anyway)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368201819
@DaanHoogland Happy new year. :)
I tried to fix the test failure, but I couldn't. Can you have a look when you have time please?
```
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest1
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.fork(ForkStarter.java:669)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:282)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:245)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeProvider(AbstractSurefireMojo.java:1183)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1365692476
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
Thanks for checking 🙏
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
Thanks for checking 🙏
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1812672426
@soreana @weizhouapache any update?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1835891691
@shwstppr a [SL] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1835889125
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-2088075830
@soreana you can copy the PR into a new branch if you which. More importantly, is there more work to be done on this?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1325029951
@soreana 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368123453
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: el9 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 5145
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368201779
@DaanHoogland Happy new year. :)
I tried to fix the test failure, but I couldn't. Can you have a look when you have time please?
```
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest1
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.fork(ForkStarter.java:669)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:282)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:245)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeProvider(AbstractSurefireMojo.java:1183)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1572293757
Packaging result [LL]: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 6068
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557205229
@soreana a [SF] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1411875434
@soreana i ran this in a debugger and for some reason your PR tries to load `~/.m2/repository/com/sun/xml/bind/jaxb-core/2.3.0/jaxb-api.jar` during testing, which doesn´t exist.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1503021152
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 5897
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1496141900
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1777368030
> >
> > Please take it into consideration. e.g. can the details be listed/updated/removed ?
>
> @weizhouapache I couldn't check the Tungsten fabric but looking at the code there shouldn't be a problem, when the details are added there is also a mechanism to delete it.
>
> In `NetworkOrchestrator` it adds virtual router public ip as a network details in the following lines however that details never stored in the db. I'm checking to see if it is a deviation of my PR or it was always like this.
>
> https://github.com/apache/cloudstack/blob/543c54c7189937fe15e2c74db2277795e13a7a1c/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java#L801-L803
>
> https://github.com/apache/cloudstack/blob/543c54c7189937fe15e2c74db2277795e13a7a1c/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java#L712-L719
>
> ```sql
> MariaDB [cloud]> select * from network_details;
> Empty set (0.001 sec)
>
> MariaDB [cloud]>
> ```
>
> I haven't check the reset yet.
@soreana
thanks for checking.
my concern is, should we manage (list/update/delete) the network details above via API as well?
currently they are managed by some internal processes in cloudstack.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1777388471
> @weizhouapache Without this PR, the `network_details` is again empty after setting the router IP address. So it is not this PR's issue.
@soreana
I created some shared networks in my testing, and got the following network details
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-2087687154
@phsm @benj-n
Hey Guys,
By any chance, do you have any update about this PR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1496141127
@DaanHoogland I removed these lines and the build error gone. I don't know what was wrong. 🤷♂️
```diff
diff --git a/server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
index 33747b0342..6beba0b212 100644
--- a/server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
+++ b/server/src/test/java/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
@@ -56,7 +56,6 @@ import com.cloud.network.dao.FirewallRulesDcidrsDaoImpl;
import com.cloud.network.dao.IPAddressDaoImpl;
import com.cloud.network.dao.LoadBalancerDao;
import com.cloud.network.dao.NetworkDao;
-import com.cloud.network.dao.NetworkDetailsDao;
import com.cloud.network.dao.NetworkDomainDaoImpl;
import com.cloud.network.dao.NetworkServiceMapDaoImpl;
import com.cloud.network.dao.PhysicalNetworkDaoImpl;
@@ -325,11 +324,6 @@ public class
return Mockito.mock(DomainDetailsDao.class);
}
- @Bean
- public NetworkDetailsDao networkDetailsDao() {
- return Mockito.mock(NetworkDetailsDao.class);
- }
-
@Bean
public DataStoreManager dataStoreManager() {
return Mockito.mock(DataStoreManager.class);
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554701713
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554555350
@weizhouapache Can I add this to 4.18.1 ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1567955680
@DaanHoogland a [SF] Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1567952173
@blueorangutan test
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1059545671
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -172,8 +183,11 @@ public void execute() {
if (getDomainId() != null) {
cfgResponse.setScope("domain");
}
- if (getImageStoreId() != null){
- cfgResponse.setScope("imagestore");
+ if (getImageStoreId() != null) {
+ cfgResponse.setScope("imagestore");
+ }
+ if (getNetworkId() != null) {
+ cfgResponse.setScope(ConfigKey.Scope.Network.name());
Review Comment:
It is fixed now. I missed an import. That might be due to a recent rebase with the main branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368121611
@soreana 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1361014968
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 5042
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368901764
@soreana I haven't had a chance to investigate very deeply yet, but at my laptop it also crashes with
```
[ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.22.2:test (default-test) on project cloud-server: There are test failures.
[ERROR]
[ERROR] Please refer to /home/dahn/apache/cloudstack/server/target/surefire-reports for the individual test results.
[ERROR] Please refer to dump files (if any exist) [date].dump, [date]-jvmRun[N].dump and [date].dumpstream.
[ERROR] The forked VM terminated without properly saying goodbye. VM crash or System.exit called?
[ERROR] Command was /bin/sh -c cd /home/dahn/apache/cloudstack/server && /home/dahn/.jdks/azul-11.0.15/bin/java -Djava.security.egd=file:/dev/./urandom -noverify -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom org.apache.maven.surefire.booter.ForkedBooter /home/dahn/apache/cloudstack/server/target/surefire 2022-12-31T15-16-34_362-jvmRun1 surefire6779432936451500986tmp surefire_139610296058936276723tmp
[ERROR] Error occurred in starting fork, check output in log
[ERROR] Process Exit Code: 1
[ERROR] Crashed tests:
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest
[ERROR] org.apache.maven.surefire.booter.SurefireBooterForkException: The forked VM terminated without properly saying goodbye. VM crash or System.exit called?
[ERROR] Command was /bin/sh -c cd /home/dahn/apache/cloudstack/server && /home/dahn/.jdks/azul-11.0.15/bin/java -Djava.security.egd=file:/dev/./urandom -noverify -Xmx2048m -XX:MaxPermSize=512m -Djava.security.egd=file:/dev/./urandom org.apache.maven.surefire.booter.ForkedBooter /home/dahn/apache/cloudstack/server/target/surefire 2022-12-31T15-16-34_362-jvmRun1 surefire6779432936451500986tmp surefire_139610296058936276723tmp
[ERROR] Error occurred in starting fork, check output in log
[ERROR] Process Exit Code: 1
[ERROR] Crashed tests:
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.fork(ForkStarter.java:669)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:282)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:245)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeProvider(AbstractSurefireMojo.java:1183)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeAfterPreconditionsChecked(AbstractSurefireMojo.java:1011)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.execute(AbstractSurefireMojo.java:857)
[ERROR] at org.apache.maven.plugin.DefaultBuildPluginManager.executeMojo(DefaultBuildPluginManager.java:137)
[ERROR] at org.apache.maven.lifecycle.internal.MojoExecutor.doExecute(MojoExecutor.java:301)
[ERROR] at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:211)
[ERROR] at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:165)
[ERROR] at org.apache.maven.lifecycle.internal.MojoExecutor.execute(MojoExecutor.java:157)
[ERROR] at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:121)
[ERROR] at org.apache.maven.lifecycle.internal.LifecycleModuleBuilder.buildProject(LifecycleModuleBuilder.java:81)
[ERROR] at org.apache.maven.lifecycle.internal.builder.singlethreaded.SingleThreadedBuilder.build(SingleThreadedBuilder.java:56)
[ERROR] at org.apache.maven.lifecycle.internal.LifecycleStarter.execute(LifecycleStarter.java:127)
[ERROR] at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:294)
[ERROR] at org.apache.maven.DefaultMaven.doExecute(DefaultMaven.java:192)
[ERROR] at org.apache.maven.DefaultMaven.execute(DefaultMaven.java:105)
[ERROR] at org.apache.maven.cli.MavenCli.execute(MavenCli.java:960)
[ERROR] at org.apache.maven.cli.MavenCli.doMain(MavenCli.java:293)
[ERROR] at org.apache.maven.cli.MavenCli.main(MavenCli.java:196)
[ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
[ERROR] at java.base/jdk.internal.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:62)
[ERROR] at java.base/jdk.internal.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
[ERROR] at java.base/java.lang.reflect.Method.invoke(Method.java:566)
[ERROR] at org.codehaus.plexus.classworlds.launcher.Launcher.launchEnhanced(Launcher.java:282)
[ERROR] at org.codehaus.plexus.classworlds.launcher.Launcher.launch(Launcher.java:225)
[ERROR] at org.codehaus.plexus.classworlds.launcher.Launcher.mainWithExitCode(Launcher.java:406)
[ERROR] at org.codehaus.plexus.classworlds.launcher.Launcher.main(Launcher.java:347)
[ERROR]
[ERROR] -> [Help 1]
[ERROR]
[ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch.
[ERROR] Re-run Maven using the -X switch to enable full debug logging.
[ERROR]
[ERROR] For more information about the errors and possible solutions, please read the following articles:
[ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoExecutionException
[ERROR]
[ERROR] After correcting the problems, you can resume the build with the command
[ERROR] mvn <args> -rf :cloud-server
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1764450294
@soreana , can you look at the build errors?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "shwstppr (via GitHub)" <gi...@apache.org>.
shwstppr commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1752579624
@soreana can please check merge conflicts and lit errors
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1047138466
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
I thought it would be better if the Account and Domain sit together. :)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6918: Override vr service offering
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1496238171
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6918)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG) [1 Bug](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL) [12 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_coverage&view=list) [12.3% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] rohityadavcloud commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
rohityadavcloud commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1325075607
@soreana can you check build failures? I also see failing coverage and quality checks
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] sonarcloud[bot] commented on pull request #6918: Override vr service offering
Posted by "sonarcloud[bot] (via GitHub)" <gi...@apache.org>.
sonarcloud[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1503042398
SonarCloud Quality Gate failed. [](https://sonarcloud.io/dashboard?id=apache_cloudstack&pullRequest=6918)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG) [1 Bug](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=BUG)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY) [0 Vulnerabilities](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=VULNERABILITY)
[](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT) [](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT) [0 Security Hotspots](https://sonarcloud.io/project/security_hotspots?id=apache_cloudstack&pullRequest=6918&resolved=false&types=SECURITY_HOTSPOT)
[](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL) [](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL) [12 Code Smells](https://sonarcloud.io/project/issues?id=apache_cloudstack&pullRequest=6918&resolved=false&types=CODE_SMELL)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_coverage&view=list) [12.3% Coverage](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_coverage&view=list)
[](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_duplicated_lines_density&view=list) [0.0% Duplication](https://sonarcloud.io/component_measures?id=apache_cloudstack&pullRequest=6918&metric=new_duplicated_lines_density&view=list)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557247395
> > @weizhouapache Can I add this to 4.18.1 milestone?
>
> this is an improvement , not a bug fix I would prefer to add it to 4.19 @shwstppr @soreana
@weizhouapache Oh okay, I though that minor release may contain some small features. Never mind, I will target it for 4.19 then. :-)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] weizhouapache commented on pull request #6918: Override vr service offering
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557219757
> @weizhouapache Can I add this to 4.18.1 milestone?
this is an improvement , not a bug fix
I would prefer to add it to 4.19 @shwstppr @soreana
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1752639446
> @soreana can please check merge conflicts and lint errors
@shwstppr Sure, I can not do it in upcoming days, but I will do it later this week.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1771446711
> @soreana
> left some comments
>
> currently `NetworkDetailsDao` is used in some java classes.
> ```
> $ git grep 'new NetworkDetailVO'
> engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java: NetworkDetailVO detailVO = new NetworkDetailVO(networkPersisted.getId(), ApiConstants.ISOLATED_PVLAN_TYPE, network.getPvlanType().toString(), true);
> engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java: super.addDetail(new NetworkDetailVO(resourceId, key, value, display));
> plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: NetworkDetailVO networkDetailVO = new NetworkDetailVO(publicNetwork.getId(), "vrf",
> plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: networkDetailVO = new NetworkDetailVO(network.getId(), "vrf",
> server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(dstNetworkId, networkDetail.getName(), networkDetail.getValue(), networkDetail.isDisplay()));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, String.valueOf(hideIpAddressUsage), false));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetwork.getId()), true));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, hideIpAddressUsage.toString(), false));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: NetworkDetailVO networkDetail = new NetworkDetailVO(network.getId(), Network.updatingInSequence, "true", true);
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(privateNetwork.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetworkId), true));
>
> ```
> Please take it into consideration. e.g. can the details be listed/updated/removed ?
@soreana
Can you have a look at lines above?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1772244449
> > @soreana
> > left some comments
> > currently `NetworkDetailsDao` is used in some java classes.
> > ```
> > $ git grep 'new NetworkDetailVO'
> > engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java: NetworkDetailVO detailVO = new NetworkDetailVO(networkPersisted.getId(), ApiConstants.ISOLATED_PVLAN_TYPE, network.getPvlanType().toString(), true);
> > engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java: super.addDetail(new NetworkDetailVO(resourceId, key, value, display));
> > plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: NetworkDetailVO networkDetailVO = new NetworkDetailVO(publicNetwork.getId(), "vrf",
> > plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: networkDetailVO = new NetworkDetailVO(network.getId(), "vrf",
> > server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(dstNetworkId, networkDetail.getName(), networkDetail.getValue(), networkDetail.isDisplay()));
> > server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, String.valueOf(hideIpAddressUsage), false));
> > server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetwork.getId()), true));
> > server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, hideIpAddressUsage.toString(), false));
> > server/src/main/java/com/cloud/network/NetworkServiceImpl.java: NetworkDetailVO networkDetail = new NetworkDetailVO(network.getId(), Network.updatingInSequence, "true", true);
> > server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(privateNetwork.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetworkId), true));
> > ```
> >
> >
> > Please take it into consideration. e.g. can the details be listed/updated/removed ?
>
> @soreana Can you have a look at lines above?
@weizhouapache I'm on it, I will get back to you later today.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1764819006
> @soreana , can you look at the build errors?
@DaanHoogland I've fixed the build issue. Let me know what you think.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1044421053
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -172,8 +183,11 @@ public void execute() {
if (getDomainId() != null) {
cfgResponse.setScope("domain");
}
- if (getImageStoreId() != null){
- cfgResponse.setScope("imagestore");
+ if (getImageStoreId() != null) {
+ cfgResponse.setScope("imagestore");
+ }
+ if (getNetworkId() != null) {
+ cfgResponse.setScope("network");
Review Comment:
```suggestion
cfgResponse.setScope(ConfigKey.Scope.Network.name());
```
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java:
##########
@@ -171,6 +182,9 @@ public void execute() {
if (getDomainId() != null) {
response.setScope("domain");
}
+ if (getNetworkId() != null) {
+ response.setScope("network");
Review Comment:
```suggestion
response.setScope(ConfigKey.Scope.Network.name());
```
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java:
##########
@@ -157,6 +168,9 @@ public void execute() {
if (getImageStoreId() != null) {
response.setScope(ConfigKey.Scope.ImageStore.name());
}
+ if (getNetworkId() != null) {
+ response.setScope("network");
Review Comment:
```suggestion
response.setScope(ConfigKey.Scope.Network.name());
```
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
Why change the `Domain` position on the enum?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1057585241
##########
api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java:
##########
@@ -172,8 +183,11 @@ public void execute() {
if (getDomainId() != null) {
cfgResponse.setScope("domain");
}
- if (getImageStoreId() != null){
- cfgResponse.setScope("imagestore");
+ if (getImageStoreId() != null) {
+ cfgResponse.setScope("imagestore");
+ }
+ if (getNetworkId() != null) {
+ cfgResponse.setScope(ConfigKey.Scope.Network.name());
Review Comment:
Thanks 👍
I'm checking that.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1052308831
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
@soreana, in some places in ACS, the enums' order affect the feature's behavior (for instance, the AccountType's ordinal is saved into the database). Would this reordering affect the feature's behavior or cause any type of regression?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
DaanHoogland commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1053020703
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
@JoaoJandre @soreana `scope`is stored in the DB as text. I don´t think it matters. I could imagine using ordinal numbers in some enums but not for this one.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] JoaoJandre commented on a diff in pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
JoaoJandre commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1053300957
##########
framework/config/src/main/java/org/apache/cloudstack/framework/config/ConfigKey.java:
##########
@@ -34,7 +34,7 @@
public static final String CATEGORY_ALERT = "Alert";
public static enum Scope {
- Global, Zone, Cluster, StoragePool, Account, ManagementServer, ImageStore, Domain
+ Global, Zone, Cluster, StoragePool, Account, Domain, ManagementServer, ImageStore, Network
Review Comment:
> @JoaoJandre I didn't know that ACS uses the enums' order. It is surprising for me cause the order might change over time. :) Anyway, I'm not aware of any regression but I'm redoing the changes just to be safe.
Yeah, generally It is not the best idea to use the enums' order, but unfortunately it is done in some places.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1324918735
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554546981
@soreana a [LL] Jenkins job has been kicked to build packages. It will be bundled with
SystemVM template(s). I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554707861
Packaging result [LL]: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: el9 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 6040
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1559127930
> clgtm
Thanks @DaanHoogland. I've applied your changes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557214448
Packaging result: :heavy_multiplication_x: el7 :heavy_multiplication_x: el8 :heavy_multiplication_x: el9 :heavy_multiplication_x: debian :heavy_multiplication_x: suse15. SL-JID 6099
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1502953510
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1496242785
Packaging result: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 5855
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] codecov[bot] commented on pull request #6918: Override vr service offering
Posted by "codecov[bot] (via GitHub)" <gi...@apache.org>.
codecov[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1497732136
## [Codecov](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#6918](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (2939c86) into [main](https://codecov.io/gh/apache/cloudstack/commit/57ff125f83d10385f01e2adc62cfc6c8c92cc7fe?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (57ff125) will **increase** coverage by `0.00%`.
> The diff coverage is `11.95%`.
```diff
@@ Coverage Diff @@
## main #6918 +/- ##
==========================================
Coverage 12.69% 12.69%
- Complexity 8660 8671 +11
==========================================
Files 2718 2718
Lines 256192 256454 +262
Branches 39930 39983 +53
==========================================
+ Hits 32518 32565 +47
- Misses 219540 219749 +209
- Partials 4134 4140 +6
```
| [Impacted Files](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [server/src/main/java/com/cloud/api/ApiDBUtils.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9BcGlEQlV0aWxzLmphdmE=) | `0.16% <0.00%> (-0.01%)` | :arrow_down: |
| [...src/main/java/com/cloud/api/ApiResponseHelper.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2FwaS9BcGlSZXNwb25zZUhlbHBlci5qYXZh) | `3.82% <0.00%> (-0.01%)` | :arrow_down: |
| [.../cloud/configuration/ConfigurationManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL2NvbmZpZ3VyYXRpb24vQ29uZmlndXJhdGlvbk1hbmFnZXJJbXBsLmphdmE=) | `15.15% <0.00%> (-0.10%)` | :arrow_down: |
| [...ork/router/VirtualNetworkApplianceManagerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL25ldHdvcmsvcm91dGVyL1ZpcnR1YWxOZXR3b3JrQXBwbGlhbmNlTWFuYWdlckltcGwuamF2YQ==) | `2.73% <ø> (ø)` | |
| [...in/java/com/cloud/server/ManagementServerImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL3NlcnZlci9NYW5hZ2VtZW50U2VydmVySW1wbC5qYXZh) | `5.64% <0.00%> (-0.02%)` | :arrow_down: |
| [...a/com/cloud/network/dao/NetworkDetailsDaoImpl.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-ZW5naW5lL3NjaGVtYS9zcmMvbWFpbi9qYXZhL2NvbS9jbG91ZC9uZXR3b3JrL2Rhby9OZXR3b3JrRGV0YWlsc0Rhb0ltcGwuamF2YQ==) | `10.20% <11.11%> (-9.80%)` | :arrow_down: |
| [.../router/deployment/RouterDeploymentDefinition.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvb3JnL2FwYWNoZS9jbG91ZHN0YWNrL25ldHdvcmsvcm91dGVyL2RlcGxveW1lbnQvUm91dGVyRGVwbG95bWVudERlZmluaXRpb24uamF2YQ==) | `83.00% <45.45%> (-2.19%)` | :arrow_down: |
| [...network/router/VirtualNetworkApplianceManager.java](https://codecov.io/gh/apache/cloudstack/pull/6918?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-c2VydmVyL3NyYy9tYWluL2phdmEvY29tL2Nsb3VkL25ldHdvcmsvcm91dGVyL1ZpcnR1YWxOZXR3b3JrQXBwbGlhbmNlTWFuYWdlci5qYXZh) | `100.00% <100.00%> (ø)` | |
... and [10 files with indirect coverage changes](https://codecov.io/gh/apache/cloudstack/pull/6918/indirect-changes?src=pr&el=tree-more&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
:mega: We’re building smart automated test selection to slash your CI/CD build times. [Learn more](https://about.codecov.io/iterative-testing/?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1572199001
@soreana a [LL] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1572198437
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1777367234
@weizhouapache Without this PR, the `network_details` is again empty after setting the router IP address. So it is not this PR's issue.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1365455137
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
`ResourceDetailsDaoBase` is an abstract class, it can not be parent of an interface. Shall I make NetworkDetailsDao abstract class as well? What do you think?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by GitBox <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1368201999
@DaanHoogland Happy new year. :)
I tried to fix the test failure, but I couldn't. Can you have a look when you have time please?
```
[ERROR] org.apache.cloudstack.networkoffering.CreateNetworkOfferingTest1
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.fork(ForkStarter.java:669)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:282)
[ERROR] at org.apache.maven.plugin.surefire.booterclient.ForkStarter.run(ForkStarter.java:245)
[ERROR] at org.apache.maven.plugin.surefire.AbstractSurefireMojo.executeProvider(AbstractSurefireMojo.java:1183)
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557218429
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554702468
@soreana a [LL] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] soreana commented on pull request #6918: Override vr service offering
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1554546604
@blueorangutan package
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] blueorangutan commented on pull request #6918: Override vr service offering
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1557465110
@soreana a [SF] Jenkins job has been kicked to build packages. It will be bundled with
Sorry to keep you busy. I promise it would be the last package of the day :D SystemVM template(s). I'll keep you posted as I make progress.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [cloudstack] DaanHoogland closed pull request #6918: Support network-scope settings and add setting to override vr service offering
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland closed pull request #6918: Support network-scope settings and add setting to override vr service offering
URL: https://github.com/apache/cloudstack/pull/6918
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1764929841
Packaging result [SF]: :heavy_check_mark: el7 :heavy_check_mark: el8 :heavy_check_mark: el9 :heavy_check_mark: debian :heavy_check_mark: suse15. SL-JID 7388
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1766644695
@DaanHoogland @shwstppr The PR is ready for review and test, please have a look.
The following code block repeated in [ResetCfgCmd.java](https://github.com/Leaseweb/cloudstack/blob/aec06ab53df26607393d933e352e9b7b2f844fd1/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ResetCfgCmd.java#L147-L172), [UpdateCfgCmd.java](https://github.com/Leaseweb/cloudstack/blob/aec06ab53df26607393d933e352e9b7b2f844fd1/api/src/main/java/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java#L194-L212), and [ListCfgsByCmd.java](https://github.com/Leaseweb/cloudstack/blob/aec06ab53df26607393d933e352e9b7b2f844fd1/api/src/main/java/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java#L194-L218). I don't have any nice way to extract it. Let me know if you have any better idea.
```java
if (!matchesConfigurationGroup(cfgResponse)) {
return;
}
cfgResponse.setObjectName("configuration");
if (getZoneId() != null) {
cfgResponse.setScope("zone");
}
if (getClusterId() != null) {
cfgResponse.setScope("cluster");
}
if (getStoragepoolId() != null) {
cfgResponse.setScope("storagepool");
}
if (getAccountId() != null) {
cfgResponse.setScope("account");
}
if (getDomainId() != null) {
cfgResponse.setScope("domain");
}
if (getImageStoreId() != null){
cfgResponse.setScope("imagestore");
}
if (getNetworkId() != null) {
cfgResponse.setScope("network");
}
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "blueorangutan (via GitHub)" <gi...@apache.org>.
blueorangutan commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1764832975
@soreana a [SF] 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.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "weizhouapache (via GitHub)" <gi...@apache.org>.
weizhouapache commented on code in PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#discussion_r1365565967
##########
engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDao.java:
##########
@@ -16,10 +16,26 @@
// under the License.
package com.cloud.network.dao;
+import java.util.Map;
+import java.util.List;
+
import org.apache.cloudstack.resourcedetail.ResourceDetailsDao;
import com.cloud.utils.db.GenericDao;
public interface NetworkDetailsDao extends GenericDao<NetworkDetailVO, Long>, ResourceDetailsDao<NetworkDetailVO> {
Review Comment:
@soreana
sorry for the mistake. I just noticed NetworkDetailsDaoImpl extends ResourceDetailsDaoBase already.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1777180110
> NetworkDetailVO
@weizhouapache The `NetworkDetailVO` in the following locations have been used, it is possible to list/update/remove a `NetworkDetailVO` using `NetworkDetailsDao`.
They
> @soreana left some comments
>
> currently `NetworkDetailsDao` is used in some java classes.
>
> ```
> $ git grep 'new NetworkDetailVO'
> engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java: NetworkDetailVO detailVO = new NetworkDetailVO(networkPersisted.getId(), ApiConstants.ISOLATED_PVLAN_TYPE, network.getPvlanType().toString(), true);
> engine/schema/src/main/java/com/cloud/network/dao/NetworkDetailsDaoImpl.java: super.addDetail(new NetworkDetailVO(resourceId, key, value, display));
> plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: NetworkDetailVO networkDetailVO = new NetworkDetailVO(publicNetwork.getId(), "vrf",
> plugins/network-elements/tungsten/src/main/java/org/apache/cloudstack/network/tungsten/service/TungstenServiceImpl.java: networkDetailVO = new NetworkDetailVO(network.getId(), "vrf",
> server/src/main/java/com/cloud/network/NetworkMigrationManagerImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(dstNetworkId, networkDetail.getName(), networkDetail.getValue(), networkDetail.isDisplay()));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, String.valueOf(hideIpAddressUsage), false));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetwork.getId()), true));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(network.getId(), Network.hideIpAddressUsage, hideIpAddressUsage.toString(), false));
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: NetworkDetailVO networkDetail = new NetworkDetailVO(network.getId(), Network.updatingInSequence, "true", true);
> server/src/main/java/com/cloud/network/NetworkServiceImpl.java: _networkDetailsDao.persist(new NetworkDetailVO(privateNetwork.getId(), Network.AssociatedNetworkId, String.valueOf(associatedNetworkId), true));
> ```
>
> Please take it into consideration. e.g. can the details be listed/updated/removed ?
@weizhouapache I couldn't check the Tungsten fabric but looking at the code there shouldn't be a problem, when the details are added there is also a mechanism to delete it.
In `NetworkOrchestrator` it adds virtual router public ip as a network details in the following lines however that details never stored in the db. I'm checking to see if it is a deviation of my PR or it was always like this.
https://github.com/apache/cloudstack/blob/543c54c7189937fe15e2c74db2277795e13a7a1c/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java#L801-L803
https://github.com/apache/cloudstack/blob/543c54c7189937fe15e2c74db2277795e13a7a1c/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java#L712-L719
```sql
MariaDB [cloud]> select * from network_details;
Empty set (0.001 sec)
MariaDB [cloud]>
```
I haven't check the reset.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "DaanHoogland (via GitHub)" <gi...@apache.org>.
DaanHoogland commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1787303872
@soreana @weizhouapache , what is the way forward for this PR? (do we move to 4.20 or close it?)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "github-actions[bot] (via GitHub)" <gi...@apache.org>.
github-actions[bot] commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-1951823060
This pull request has merge conflicts. Dear author, please fix the conflicts and sync your branch with the base branch.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
Re: [PR] Support network-scope settings and add setting to override vr service offering [cloudstack]
Posted by "soreana (via GitHub)" <gi...@apache.org>.
soreana commented on PR #6918:
URL: https://github.com/apache/cloudstack/pull/6918#issuecomment-2088953610
> @soreana you can copy the PR into a new branch if you which. More importantly, is there more work to be done on this?
@DaanHoogland I reached out to my former colleagues to see what are the options.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@cloudstack.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org