[GitHub] schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails
schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails URL: https://github.com/apache/cloudstack/issues/2682#issuecomment-392967627 Alreay tried to remove `SSLv3` from `jdk.tls.disabledAlgorithms` in `/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security` but didn't work. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] schadom opened a new issue #2682: cloudstack-service-console-proxy-rdpclient - test fails
schadom opened a new issue #2682: cloudstack-service-console-proxy-rdpclient - test fails URL: https://github.com/apache/cloudstack/issues/2682 # CLOUDSTACK VERSION ~~~ * Cloudstack 4.11.0.0 stable * Ubuntu 18.04 LTS ~~~ # PROBLEM rob@cloudstack:~$ sudo apt update && sudo apt install mysql-connector-python python-software-properties debhelper openjdk-8-jdk libws-commons-util-java genisoimage libcommons-codec-java libcommons-httpclient-java liblog4j1.2-java maven rob@cloudstack:~$ wget http://www.apache.org/dyn/closer.lua/cloudstack/releases/4.11.0.0/apache-cloudstack-4.11.0.0-src.tar.bz2 rob@cloudstack:~$ tar -jxvf apache-cloudstack-4.11.0.0-src.tar.bz2 rob@cloudstack:~$ cd ./apache-cloudstack-4.11.0.0-src rob@cloudstack:~/apache-cloudstack-4.11.0.0-src$ mvn -p deps .. .. Tests run: 404, Failures: 0, Errors: 1, Skipped: 0 .. .. [INFO] Apache CloudStack Plugin - Cloudian Connector .. SUCCESS [ 9.492 s] [INFO] Apache CloudStack Plugin - Prometheus Exporter . SUCCESS [ 2.858 s] [INFO] Apache CloudStack Framework - Spring Module SUCCESS [ 5.730 s] [INFO] Apache CloudStack Secondary Storage Controller . SUCCESS [ 5.386 s] [INFO] Apache CloudStack Client UI SUCCESS [ 17.402 s] [INFO] Apache CloudStack Console Proxy - RDP Client ... FAILURE [ 9.248 s] [INFO] Apache CloudStack Console Proxy SKIPPED [INFO] Apache CloudStack Console Proxy - Server ... SKIPPED [INFO] Apache CloudStack Framework - QuickCloud ... SKIPPED [INFO] [INFO] BUILD FAILURE [INFO] [INFO] Total time: 11:22 min [INFO] Finished at: 2018-05-29T21:08:07Z [INFO] Final Memory: 100M/745M [INFO] [WARNING] The requested profile "deps" could not be activated because it does not exist. [ERROR] Failed to execute goal org.apache.maven.plugins:maven-surefire-plugin:2.18.1:test (default-test) on project cloudstack-service-console-proxy-rdpclient: There are test failures. [ERROR] [ERROR] Please refer to /home/schallert/apache-cloudstack-4.11.0.0-src/services/console-proxy-rdp/rdpconsole/target/surefire-reports for the individual test results. [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/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn -rf :cloudstack-service-console-proxy-rdpclient This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails
schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails URL: https://github.com/apache/cloudstack/issues/2682#issuecomment-392973706 Fixed it by copying `jdk.tls.disabledAlgorithms=DH keySize < 128, RSA keySize < 128, DES keySize < 128, SHA1 keySize < 128, MD5 keySize < 128, RC4` from `./apache-cloudstack-4.11.0.0-src/client/conf/java.security.ciphers.in` to `/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security`. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails
schadom commented on issue #2682: cloudstack-service-console-proxy-rdpclient - test fails URL: https://github.com/apache/cloudstack/issues/2682#issuecomment-392973706 Fixed it by copying `jdk.tls.disabledAlgorithms=DH keySize < 128, RSA keySize < 128, DES keySize < 128, SHA1 keySize < 128, MD5 keySize < 128, RC4` from `./apache-cloudstack-4.11.0.0-src/client/conf/java.security.ciphers.in` to `/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/security/java.security`. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] schadom closed issue #2682: cloudstack-service-console-proxy-rdpclient - test fails
schadom closed issue #2682: cloudstack-service-console-proxy-rdpclient - test fails URL: https://github.com/apache/cloudstack/issues/2682 This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Slair1 opened a new issue #2680: Using Source NAT option on Private Gateway does not work
Slair1 opened a new issue #2680: Using Source NAT option on Private Gateway does not work URL: https://github.com/apache/cloudstack/issues/2680 # ISSUE TYPE * Bug Report # COMPONENT NAME ~~~ VPC (Private Gateway Source NAT) ~~~ # CLOUDSTACK VERSION ~~~ At least: 4.9, 4.10, and 4.11 ~~~ # CONFIGURATION When you use the Source NAT feature of Private Gateways on a VPC. This should Source NAT all traffic from CloudStack VMs going towards IPs reachable through Private Gateways # OS / ENVIRONMENT I happen to be running KVM, but shouldn't be hypervisor specific. it is an issue in the SystemVM / VPC Router # SUMMARY There is a bug in the Private Gateway functionality, when Source NAT is enabled for the Private Gateway. When the SNAT is added to iptables, it has the source CIDR of the private gateway subnet. Since no VMs live in that private gateway subnet, the SNAT doesn’t work. # STEPS TO REPRODUCE Below is an example: - VMs have IP addresses in the 10.0.0.0/24 subnet. - The Private Gateway address is 10.101.141.2/30 In the outputs below, the SOURCE field for the new SNAT (eth3) only matches if the source is 10.101.141.0/30. Since the VM has an IP address in 10.0.0.0/24, the VMs don’t get SNAT’d as they should when talking across the private gateway. The SOURCE should be set to ANYWHERE. # BEFORE ADDING PRIVATE GATEWAY ~~~ Chain POSTROUTING (policy ACCEPT 1 packets, 52 bytes) pkts bytes target prot opt in out source destination 2 736 SNAT all -- anyeth210.0.0.0/24 anywhere to:10.0.0.1 16 1039 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ # EXPECTED RESULTS ~~~ Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 SNAT all -- anyeth3anywhere anywhere to:10.101.141.2 2 736 SNAT all -- anyeth2anywhere anywhere to:10.0.0.1 23 1515 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ # ACTUAL RESULTS ~~~ Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 SNAT all -- anyeth310.101.141.0/30 anywhere to:10.101.141.2 2 736 SNAT all -- anyeth210.0.0.0/24 anywhere to:10.0.0.1 23 1515 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ # SUGGESTED FIX It looks like CsAddress.py treats the creation of the Private Gateway SNAT as if it is a GUEST network, which works fine, except for the SNAT problem shown above. Here is the code from MASTER (line 479 is SNAT rule): ~~~ if self.get_type() in ["guest"]: ... ... self.fw.append(["nat", "front", "-A POSTROUTING -s %s -o %s -j SNAT --to-source %s" % (guestNetworkCidr, self.dev, self.address['public_ip'])]) ~~~ I am thinking we just change that to the following. I can’t think of any reason we need the source/guest CIDR specified: ~~~ if self.get_type() in ["guest"]: ... ... self.fw.append(["nat", "front", "-A POSTROUTING -o %s -j SNAT --to-source %s" % (self.dev, self.address['public_ip'])]) ~~~ # More Information Here is a link I found that further documents the Private Gateway Source NAT feature: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Source+NAT+on+private+gateway Notice, how in the SNAT shown it does not specify a source guest network CIDR - my above fix matches the example in the link above. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] Slair1 opened a new pull request #2681: Issue 2680: Source NAT option on Private Gateway
Slair1 opened a new pull request #2681: Issue 2680: Source NAT option on Private Gateway URL: https://github.com/apache/cloudstack/pull/2681 Using Source NAT option on Private Gateway does not work ## Description When you use the Source NAT feature of Private Gateways on a VPC. This should Source NAT all traffic from CloudStack VMs going towards IPs reachable through Private Gateways. This change in this PR, stops adding the Source CIDR to SNAT rules. This should be discussed/reviewed, but i can see no reason why the Source CIDR is needed. There can only be one SNAT IP per interface, except for Static (one-to-one) NATs, which still work with this change in place. The outbound interface is what matters in the rule. # SUMMARY There is a bug in the Private Gateway functionality, when Source NAT is enabled for the Private Gateway. When the SNAT is added to iptables, it has the source CIDR of the private gateway subnet. Since no VMs live in that private gateway subnet, the SNAT doesn’t work. # STEPS TO REPRODUCE Below is an example: - VMs have IP addresses in the 10.0.0.0/24 subnet. - The Private Gateway address is 10.101.141.2/30 In the outputs below, the SOURCE field for the new SNAT (eth3) only matches if the source is 10.101.141.0/30. Since the VM has an IP address in 10.0.0.0/24, the VMs don’t get SNAT’d as they should when talking across the private gateway. The SOURCE should be set to ANYWHERE. # BEFORE ADDING PRIVATE GATEWAY ~~~ Chain POSTROUTING (policy ACCEPT 1 packets, 52 bytes) pkts bytes target prot opt in out source destination 2 736 SNAT all -- anyeth210.0.0.0/24 anywhere to:10.0.0.1 16 1039 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ # EXPECTED RESULTS ~~~ Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 SNAT all -- anyeth3anywhere anywhere to:10.101.141.2 2 736 SNAT all -- anyeth2anywhere anywhere to:10.0.0.1 23 1515 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ # ACTUAL RESULTS ~~~ Chain POSTROUTING (policy ACCEPT 0 packets, 0 bytes) pkts bytes target prot opt in out source destination 0 0 SNAT all -- anyeth310.101.141.0/30 anywhere to:10.101.141.2 2 736 SNAT all -- anyeth210.0.0.0/24 anywhere to:10.0.0.1 23 1515 SNAT all -- anyeth1anywhere anywhere to:46.99.52.18 ~~~ ## Types of changes - [ ] Breaking change (fix or feature that would cause existing functionality to change) - [ ] New feature (non-breaking change which adds functionality) - [X] Bug fix (non-breaking change which fixes an issue) - [ ] Enhancement (improves an existing feature and functionality) - [ ] Cleanup (Code refactoring and cleanup, that may add test cases) ## GitHub Issue/PRs Fixes: #2680 ## Screenshots (if appropriate): ## How Has This Been Tested? ## Checklist: - [x] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [x] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [ ] I have added tests to cover my changes. - [ ] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] borisstoyanov commented on issue #2376: [4.11] Smoketest Health Check
borisstoyanov commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-392674103 @blueorangutan test This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-392674219 @borisstoyanov a 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 GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2674: Create unit test cases for 'ConfigDriveBuilder' class
DaanHoogland commented on issue #2674: Create unit test cases for 'ConfigDriveBuilder' class URL: https://github.com/apache/cloudstack/pull/2674#issuecomment-392700888 I will discuss with @PaulAngus before merging any more things in 4.11 while we an RC out. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] nvazquez opened a new pull request #2683: Add default L2 network offerings
nvazquez opened a new pull request #2683: Add default L2 network offerings URL: https://github.com/apache/cloudstack/pull/2683 ## Description Add default L2 network offerings ## 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) ## GitHub Issue/PRs ## Screenshots (if appropriate):   ## How Has This Been Tested? ## Checklist: - [x] I have read the [CONTRIBUTING](https://github.com/apache/cloudstack/blob/master/CONTRIBUTING.md) document. - [x] My code follows the code style of this project. - [ ] My change requires a change to the documentation. - [ ] I have updated the documentation accordingly. Testing - [ ] I have added tests to cover my changes. - [ ] All relevant new and existing integration tests have passed. - [ ] A full integration testsuite with all test that can run on my environment has passed. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] rhtyd commented on issue #2672: CLOUDSTACK-10377: Fix Network restart for Nuage
rhtyd commented on issue #2672: CLOUDSTACK-10377: Fix Network restart for Nuage URL: https://github.com/apache/cloudstack/pull/2672#issuecomment-392732347 @fmaximus can you address outstanding review comments? This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] DaanHoogland commented on issue #2674: Create unit test cases for 'ConfigDriveBuilder' class
DaanHoogland commented on issue #2674: Create unit test cases for 'ConfigDriveBuilder' class URL: https://github.com/apache/cloudstack/pull/2674#issuecomment-392700888 I will discuss with @PaulAngus before merging any more things in 4.11 while we have an RC out. This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] blueorangutan commented on issue #2376: [4.11] Smoketest Health Check
blueorangutan commented on issue #2376: [4.11] Smoketest Health Check URL: https://github.com/apache/cloudstack/pull/2376#issuecomment-392778457 Trillian test result (tid-2718) Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7 Total time taken: 21566 seconds Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr2376-t2718-kvm-centos7.zip Intermitten failure detected: /marvin/tests/smoke/test_deploy_virtio_scsi_vm.py Intermitten failure detected: /marvin/tests/smoke/test_privategw_acl.py Intermitten failure detected: /marvin/tests/smoke/test_vpc_vpn.py Intermitten failure detected: /marvin/tests/smoke/test_hostha_kvm.py Smoke tests completed. 64 look OK, 3 have error(s) Only failed tests results shown below: Test | Result | Time (s) | Test File --- | --- | --- | --- ContextSuite context=TestDeployVirtioSCSIVM>:setup | `Error` | 0.00 | test_deploy_virtio_scsi_vm.py test_03_vpc_privategw_restart_vpc_cleanup | `Error` | 132.90 | test_privategw_acl.py test_hostha_enable_ha_when_host_in_maintenance | `Error` | 1.71 | test_hostha_kvm.py This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] izenk commented on issue #2644: UI LDAP settings
izenk commented on issue #2644: UI LDAP settings URL: https://github.com/apache/cloudstack/issues/2644#issuecomment-392754190 Found way to watch them with ~~~ java -classpath /usr/share/cloudstack-common/lib/jasypt-1.9.2.jar org.jasypt.intf.cli.JasyptPBEStringDecryptionCLI decrypt.sh ~~~ So, UI values for some reason are not decrypted... This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix Network restart for Nuage
fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix
Network restart for Nuage
URL: https://github.com/apache/cloudstack/pull/2672#discussion_r191481436
##
File path:
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
##
@@ -528,29 +533,35 @@ public void reserve(NicProfile nic, Network network,
VirtualMachineProfile vm, D
nic.setBroadcastUri(network.getBroadcastUri());
nic.setIsolationUri(network.getBroadcastUri());
-//NicProfile does not contain the NIC UUID. We need this
information to set it in the VMInterface and VPort
-//that we create in VSP
-NicVO nicFromDb = _nicDao.findById(nic.getId());
-IPAddressVO staticNatIp =
_ipAddressDao.findByVmIdAndNetworkId(network.getId(), vm.getId());
VspVm vspVm =
_nuageVspEntityBuilder.buildVspVm(vm.getVirtualMachine(), network);
-VspNic vspNic =
_nuageVspEntityBuilder.buildVspNic(nicFromDb.getUuid(), nic);
-VspStaticNat vspStaticNat = null;
-if (staticNatIp != null) {
-VlanVO staticNatVlan =
_vlanDao.findById(staticNatIp.getVlanId());
-vspStaticNat = _nuageVspEntityBuilder.buildVspStaticNat(null,
staticNatIp, staticNatVlan, vspNic);
-}
-boolean defaultHasDns = getDefaultHasDns(networkHasDnsCache,
nicFromDb);
-VspDhcpVMOption dhcpOption =
_nuageVspEntityBuilder.buildVmDhcpOption(nicFromDb, defaultHasDns,
networkHasDns);
-ReserveVmInterfaceVspCommand cmd = new
ReserveVmInterfaceVspCommand(vspNetwork, vspVm, vspNic, vspStaticNat,
dhcpOption);
-Answer answer = _agentMgr.easySend(nuageVspHost.getId(), cmd);
+if
(!Boolean.TRUE.equals(vm.getParameter(VirtualMachineProfile.Param.RollingRestart)))
{
Review comment:
Then I would have to cast, as `vm.getParameter()` returns `Object`
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] jia3apb opened a new issue #2679: Non-admin user interface reload (ctrl+R) causes dropping session
jia3apb opened a new issue #2679: Non-admin user interface reload (ctrl+R) causes dropping session URL: https://github.com/apache/cloudstack/issues/2679 # ISSUE TYPE * Bug Report # COMPONENT NAME ~~~ UI ~~~ # CLOUDSTACK VERSION ~~~ 4.11 ~~~ # CONFIGURATION N/A # OS / ENVIRONMENT Web browser # SUMMARY Non-admin user interface reload (ctrl+R) causes "Session Expired" message, drops session and as a result redirects to login form. At the same time, Admin UI works correctly. # STEPS TO REPRODUCE ~~~ Autorize to UI by role 'User' and refresh the page with CTRL+R ~~~ # EXPECTED RESULTS ~~~ Keep the session and just reload the interface. ~~~ # ACTUAL RESULTS ~~~ Interface reload drops the Non-Admin user session. ~~~ This is an automated message from the Apache Git Service. To respond to the message, please log on GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: us...@infra.apache.org With regards, Apache Git Services
[GitHub] fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix Network restart for Nuage
fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix
Network restart for Nuage
URL: https://github.com/apache/cloudstack/pull/2672#discussion_r191499663
##
File path:
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
##
@@ -528,29 +533,35 @@ public void reserve(NicProfile nic, Network network,
VirtualMachineProfile vm, D
nic.setBroadcastUri(network.getBroadcastUri());
nic.setIsolationUri(network.getBroadcastUri());
-//NicProfile does not contain the NIC UUID. We need this
information to set it in the VMInterface and VPort
-//that we create in VSP
-NicVO nicFromDb = _nicDao.findById(nic.getId());
-IPAddressVO staticNatIp =
_ipAddressDao.findByVmIdAndNetworkId(network.getId(), vm.getId());
VspVm vspVm =
_nuageVspEntityBuilder.buildVspVm(vm.getVirtualMachine(), network);
-VspNic vspNic =
_nuageVspEntityBuilder.buildVspNic(nicFromDb.getUuid(), nic);
-VspStaticNat vspStaticNat = null;
-if (staticNatIp != null) {
-VlanVO staticNatVlan =
_vlanDao.findById(staticNatIp.getVlanId());
-vspStaticNat = _nuageVspEntityBuilder.buildVspStaticNat(null,
staticNatIp, staticNatVlan, vspNic);
-}
-boolean defaultHasDns = getDefaultHasDns(networkHasDnsCache,
nicFromDb);
-VspDhcpVMOption dhcpOption =
_nuageVspEntityBuilder.buildVmDhcpOption(nicFromDb, defaultHasDns,
networkHasDns);
-ReserveVmInterfaceVspCommand cmd = new
ReserveVmInterfaceVspCommand(vspNetwork, vspVm, vspNic, vspStaticNat,
dhcpOption);
-Answer answer = _agentMgr.easySend(nuageVspHost.getId(), cmd);
+if
(!Boolean.TRUE.equals(vm.getParameter(VirtualMachineProfile.Param.RollingRestart)))
{
+
+//NicProfile does not contain the NIC UUID. We need this
information to set it in the VMInterface and VPort
+//that we create in VSP
+NicVO nicFromDb = _nicDao.findById(nic.getId());
+IPAddressVO staticNatIp =
_ipAddressDao.findByVmIdAndNetworkId(network.getId(), vm.getId());
+VspNic vspNic =
_nuageVspEntityBuilder.buildVspNic(nicFromDb.getUuid(), nic);
+VspStaticNat vspStaticNat = null;
+if (staticNatIp != null) {
+VlanVO staticNatVlan =
_vlanDao.findById(staticNatIp.getVlanId());
+vspStaticNat =
_nuageVspEntityBuilder.buildVspStaticNat(null, staticNatIp, staticNatVlan,
vspNic);
+}
-if (answer == null || !answer.getResult()) {
-s_logger.error("ReserveVmInterfaceNuageVspCommand failed for
NIC " + nic.getId() + " attached to VM " + vm.getId() + " in network " +
network.getId());
-if ((null != answer) && (null != answer.getDetails())) {
-s_logger.error(answer.getDetails());
+boolean defaultHasDns = getDefaultHasDns(networkHasDnsCache,
nicFromDb);
+VspDhcpVMOption dhcpOption =
_nuageVspEntityBuilder.buildVmDhcpOption(nicFromDb, defaultHasDns,
networkHasDns);
+ReserveVmInterfaceVspCommand cmd = new
ReserveVmInterfaceVspCommand(vspNetwork, vspVm, vspNic, vspStaticNat,
dhcpOption);
+Answer answer = _agentMgr.easySend(nuageVspHost.getId(), cmd);
+
+if (answer == null || !answer.getResult()) {
Review comment:
The null check is on answer, not on answer.getResult().
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
[GitHub] fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix Network restart for Nuage
fmaximus commented on a change in pull request #2672: CLOUDSTACK-10377: Fix
Network restart for Nuage
URL: https://github.com/apache/cloudstack/pull/2672#discussion_r191500725
##
File path:
plugins/network-elements/nuage-vsp/src/com/cloud/network/guru/NuageVspGuestNetworkGuru.java
##
@@ -723,6 +739,32 @@ public void deallocate(Network network, NicProfile nic,
VirtualMachineProfile vm
} else {
super.deallocate(network, nic, vm);
}
+
+if (virtualMachine.getType() == VirtualMachine.Type.DomainRouter) {
Review comment:
Do we really want to go into creating methods for checking enum values?
I'm not in favor of creating that kind of method in this class,
so it should go either in VirtualMachine or in VirtualMachine.Type
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
