apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Revert "CLOUDSTACK-6967 merge problem resolution"

Browse Source 
This reverts commit 4610c76fa9178ca056ad523cdf980a7ee3533ef2.
This commit is contained in:
Daan Hoogland 2014-06-24 10:21:03 +02:00
parent d69e14323a
commit 91e300eb82
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/hypervisors/ovm3/pom.xml
View File

@ -23,13 +23,13 @@
<parent> <parent>
<groupId>org.apache.cloudstack</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>cloudstack-plugins</artifactId> <artifactId>cloudstack-plugins</artifactId>
<version>4.5.0-SNAPSHOT</version> <version>4.4.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath> <relativePath>../../pom.xml</relativePath>
</parent> </parent>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>net.java.dev.vcc.thirdparty</groupId> <groupId>org.apache.cloudstack</groupId>
<artifactId>xen-api</artifactId> <artifactId>xapi</artifactId>
<version>${cs.xapi.version}</version> <version>${cs.xapi.version}</version>
</dependency> </dependency>
</dependencies> </dependencies>

2
plugins/hypervisors/ovm3/src/com/cloud/hypervisor/ovm3/hypervisor/Ovm3ResourceBase.java
View File

@ -1868,7 +1868,7 @@ public class Ovm3ResourceBase implements ServerResource, HypervisorResource,
s_logger.debug("VM " + vm.getKey() + " state: " + vm.getValue() s_logger.debug("VM " + vm.getKey() + " state: " + vm.getValue()
+ ":" + convertStateToPower(vm.getValue())); + ":" + convertStateToPower(vm.getValue()));
vmStates.put(vm.getKey(), new HostVmStateReportEntry( vmStates.put(vm.getKey(), new HostVmStateReportEntry(
convertStateToPower(vm.getValue()), c.getIp())); convertStateToPower(vm.getValue()), c.getIp(), null));
} }
return vmStates; return vmStates;
} }

6
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/ManagementServerMock.java
View File

@ -327,7 +327,7 @@ public class ManagementServerMock {
_znet = _networkService.getPhysicalNetwork(id); _znet = _networkService.getPhysicalNetwork(id);
List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public); List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public);
if (nets == null || nets.isEmpty()) { if (nets == null || nets.isEmpty()) {
_networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null, null); _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null);
} }
} catch (InvalidParameterValueException e) { } catch (InvalidParameterValueException e) {
List<String> isolationMethods = new ArrayList<String>(); List<String> isolationMethods = new ArrayList<String>();
@ -337,7 +337,7 @@ public class ManagementServerMock {
"znet"); "znet");
List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public); List<PhysicalNetworkVO> nets = _physicalNetworkDao.listByZoneAndTrafficType(_zone.getId(), TrafficType.Public);
if (nets == null || nets.isEmpty()) { if (nets == null || nets.isEmpty()) {
_networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null, null); _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Public.toString(), "vlan", null, null, null, null, null, null);
} }
} }
if (_znet.getState() != PhysicalNetwork.State.Enabled) { if (_znet.getState() != PhysicalNetwork.State.Enabled) {
@ -353,7 +353,7 @@ public class ManagementServerMock {
} }
} }
if (!found) { if (!found) {
_networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), "vlan", null, null, null, null, null, null, null); _networkService.addTrafficTypeToPhysicalNetwork(_znet.getId(), TrafficType.Guest.toString(), "vlan", null, null, null, null, null, null);
} }
Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> providers = Pair<List<? extends PhysicalNetworkServiceProvider>, Integer> providers =