From 8807fc8677eb4e231858462f11c3fb22c756f482 Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 17 Dec 2010 09:57:48 -0800 Subject: [PATCH] Don't send applyLB command to the backend when domR is stopped. --- .../com/cloud/agent/api/to/IpAddressTO.java | 73 +++++++++++++++++++ .../router/DomainRouterManagerImpl.java | 2 +- 2 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 api/src/com/cloud/agent/api/to/IpAddressTO.java diff --git a/api/src/com/cloud/agent/api/to/IpAddressTO.java b/api/src/com/cloud/agent/api/to/IpAddressTO.java new file mode 100644 index 00000000000..a64ca7dfa5c --- /dev/null +++ b/api/src/com/cloud/agent/api/to/IpAddressTO.java @@ -0,0 +1,73 @@ +package com.cloud.agent.api.to; + +public class IpAddressTO { + + private String publicIp; + private boolean sourceNat; + private boolean add; + private boolean oneToOneNat; + private boolean firstIP; + private String vlanId; + private String vlanGateway; + private String vlanNetmask; + private String vifMacAddress; + private String guestIp; + + + public IpAddressTO(String ipAddress, boolean add, boolean firstIP, boolean sourceNat, String vlanId, String vlanGateway, String vlanNetmask, String vifMacAddress, String guestIp) { + this.publicIp = ipAddress; + this.add = add; + this.firstIP = firstIP; + this.sourceNat = sourceNat; + this.vlanId = vlanId; + this.vlanGateway = vlanGateway; + this.vlanNetmask = vlanNetmask; + this.vifMacAddress = vifMacAddress; + this.guestIp = guestIp; + } + + public String getGuestIp(){ + return guestIp; + } + + public String getPublicIp() { + return publicIp; + } + + public boolean isAdd() { + return add; + } + + public boolean isOneToOneNat(){ + return this.oneToOneNat; + } + + public boolean isFirstIP() { + return firstIP; + } + + public void setSourceNat(boolean sourceNat) { + this.sourceNat = sourceNat; + } + + public boolean isSourceNat() { + return sourceNat; + } + + public String getVlanId() { + return vlanId; + } + + public String getVlanGateway() { + return vlanGateway; + } + + public String getVlanNetmask() { + return vlanNetmask; + } + + public String getVifMacAddress() { + return vifMacAddress; + } + +} diff --git a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java index 60245bd840f..dae1e57c096 100644 --- a/server/src/com/cloud/network/router/DomainRouterManagerImpl.java +++ b/server/src/com/cloud/network/router/DomainRouterManagerImpl.java @@ -2074,7 +2074,7 @@ public class DomainRouterManagerImpl implements DomainRouterManager, DomainRoute throw new ResourceUnavailableException("Unable to apply lb rules"); } - if (router.getState() == State.Running || router.getState() == State.Starting || router.getState() == State.Stopped) { + if (router.getState() == State.Running || router.getState() == State.Starting) { Commands cmds = new Commands(OnError.Continue); List lbs = new ArrayList();