etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed publicNetworkGuru to set Broadcast URI for Public tagged network.

This commit is contained in:
alena 2010-12-21 10:24:56 -08:00
parent 91573b6252
commit 51d1aa2f95
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
server/src/com/cloud/network/guru/PublicNetworkGuru.java
View File

@ -78,15 +78,16 @@ public class PublicNetworkGuru extends AdapterBase implements NetworkGuru {
nic.setIp4Address(ip.getAddress());
nic.setGateway(ip.getGateway());
nic.setNetmask(ip.getNetmask());
if(ip.getVlanTag().equalsIgnoreCase("untagged"))
nic.setIsolationUri(URI.create("vlan://untagged"));
else
nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
if(!ip.getVlanTag().equalsIgnoreCase("untagged"))
nic.setBroadcastUri(URI.create("vlan://untagged"));
else
nic.setBroadcastUri(BroadcastDomainType.Vlan.toUri(ip.getVlanTag()));
if(ip.getVlanTag() != null && ip.getVlanTag().equalsIgnoreCase("untagged")) {
nic.setIsolationUri(URI.create("vlan://untagged"));
nic.setBroadcastUri(URI.create("vlan://untagged"));
nic.setBroadcastType(BroadcastDomainType.Native);
} else if (ip.getVlanTag() != null){
nic.setIsolationUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastUri(IsolationType.Vlan.toUri(ip.getVlanTag()));
nic.setBroadcastType(BroadcastDomainType.Vlan);
}
nic.setFormat(AddressFormat.Ip4);
nic.setReservationId(String.valueOf(ip.getVlanTag()));
nic.setMacAddress(ip.getMacAddress());