Skip to content

Commit f8f4f20

Browse files
mcpark84mcpark84
committed
Changes default HA status to false in OpenstackNetworking App.
Change-Id: Iaf34f97f90eb25cd6a8b2660e07e3390ca35c989
1 parent d572762 commit f8f4f20

File tree

13 files changed

+62
-29
lines changed

13 files changed

+62
-29
lines changed

‎apps/openstacknetworking/api/src/main/java/org/onosproject/openstacknetworking/api/Constants.java‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@
1616
package org.onosproject.openstacknetworking.api;
1717

1818
import com.google.common.collect.ImmutableMap;
19+
import org.onlab.packet.IpAddress;
1920
import org.onlab.packet.MacAddress;
2021

2122
import java.nio.charset.StandardCharsets;
@@ -143,4 +144,7 @@ private static Map<String, String> createPortNamePrefixMap() {
143144
//Additional pci vendor information will be added
144145
return ImmutableMap.of(CAVIUM_PCI_VENDOR_INFO, PORT_NAME_PREFIX_CAVIUM);
145146
}
146-
}
147+
148+
public static final boolean DEFAULT_HA_STATUS = false;
149+
public static final IpAddress DEFAULT_ACTIVE_IP_ADDRESS = IpAddress.valueOf("127.0.0.1");
150+
}

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackHaManager.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@
2626
import org.osgi.service.component.annotations.ReferenceCardinality;
2727
import org.slf4j.Logger;
2828

29+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
30+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_HA_STATUS;
2931
import static org.slf4j.LoggerFactory.getLogger;
3032

3133
/**
@@ -39,9 +41,6 @@ public class OpenstackHaManager implements OpenstackHaService {
3941

4042
protected final Logger log = getLogger(getClass());
4143

42-
private static final boolean DEFAULT_ACTIVE_STATUS = true;
43-
private static final IpAddress DEFAULT_ACTIVE_IP_ADDRESS = IpAddress.valueOf("127.0.0.1");
44-
4544
@Reference(cardinality = ReferenceCardinality.MANDATORY)
4645
protected CoreService coreService;
4746

@@ -51,7 +50,7 @@ public class OpenstackHaManager implements OpenstackHaService {
5150
@Activate
5251
protected void activate() {
5352
coreService.registerApplication(Constants.OPENSTACK_NETWORKING_APP_ID);
54-
activeFlag = DEFAULT_ACTIVE_STATUS;
53+
activeFlag = DEFAULT_HA_STATUS;
5554
activeIpAddress = DEFAULT_ACTIVE_IP_ADDRESS;
5655
log.info("Started");
5756
}

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -753,7 +753,7 @@ private void reconfigureRouters(OpenstackNode osNode) {
753753
routerIfaceAdded(osRouter, iface);
754754
});
755755
});
756-
log.info("Reconfigure routers for {}", osNode.hostname());
756+
log.debug("Reconfigure routers for {}", osNode.hostname());
757757
}
758758
}
759759
}

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingSnatHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1488,7 +1488,7 @@ private void reconfigureRouters(OpenstackNode osNode) {
14881488

14891489
setStatefulDownstreamRules(osRouter, true);
14901490
});
1491-
log.info("Reconfigure routers for {}", osNode.hostname());
1491+
log.debug("Reconfigure routers for {}", osNode.hostname());
14921492
}
14931493
}
14941494

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingIcmpHandler.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -383,7 +383,7 @@ private void reconfigureRouters(OpenstackNode osNode) {
383383
});
384384
processRouteGatewayEvent(osRouter, true);
385385
});
386-
log.info("Reconfigure routers for {}", osNode.hostname());
386+
log.debug("Reconfigure routers for {}", osNode.hostname());
387387
}
388388
}
389389
}

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/web/OpenstackFloatingIpWebResource.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import static javax.ws.rs.core.Response.created;
4343
import static javax.ws.rs.core.Response.noContent;
4444
import static javax.ws.rs.core.Response.status;
45+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
4546
import static org.onosproject.openstacknetworking.api.Constants.REST_UTF8;
4647
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.jsonToModelEntity;
4748
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.syncDelete;
@@ -82,7 +83,8 @@ public Response createFloatingIp(InputStream input) throws IOException {
8283

8384
String inputStr = IOUtils.toString(input, REST_UTF8);
8485

85-
if (!haService.isActive()) {
86+
if (!haService.isActive()
87+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
8688
return syncPost(haService, FLOATING_IPS, inputStr);
8789
}
8890

@@ -117,7 +119,8 @@ public Response updateFloatingIp(@PathParam("id") String id, InputStream input)
117119

118120
String inputStr = IOUtils.toString(input, REST_UTF8);
119121

120-
if (!haService.isActive()) {
122+
if (!haService.isActive()
123+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
121124
return syncPut(haService, FLOATING_IPS, id, inputStr);
122125
}
123126

@@ -141,7 +144,8 @@ public Response updateFloatingIp(@PathParam("id") String id, InputStream input)
141144
public Response deleteFloatingIp(@PathParam("id") String id) {
142145
log.trace(String.format(MESSAGE, "DELETE " + id));
143146

144-
if (!haService.isActive()) {
147+
if (!haService.isActive()
148+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
145149
return syncDelete(haService, FLOATING_IPS, id);
146150
}
147151

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/web/OpenstackNetworkWebResource.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static javax.ws.rs.core.Response.created;
4242
import static javax.ws.rs.core.Response.noContent;
4343
import static javax.ws.rs.core.Response.status;
44+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
4445
import static org.onosproject.openstacknetworking.api.Constants.REST_UTF8;
4546
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.jsonToModelEntity;
4647
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.syncDelete;
@@ -81,7 +82,8 @@ public Response createNetwork(InputStream input) throws IOException {
8182

8283
String inputStr = IOUtils.toString(input, REST_UTF8);
8384

84-
if (!haService.isActive()) {
85+
if (!haService.isActive()
86+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
8587
return syncPost(haService, NETWORKS, inputStr);
8688
}
8789

@@ -116,7 +118,8 @@ public Response updateNetwork(@PathParam("id") String id, InputStream input) thr
116118

117119
String inputStr = IOUtils.toString(input, REST_UTF8);
118120

119-
if (!haService.isActive()) {
121+
if (!haService.isActive()
122+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
120123
return syncPut(haService, NETWORKS, id, inputStr);
121124
}
122125

@@ -141,7 +144,8 @@ public Response updateNetwork(@PathParam("id") String id, InputStream input) thr
141144
public Response deleteNetwork(@PathParam("id") String id) {
142145
log.trace(String.format(MESSAGE, "DELETE " + id));
143146

144-
if (!haService.isActive()) {
147+
if (!haService.isActive()
148+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
145149
return syncDelete(haService, NETWORKS, id);
146150
}
147151

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/web/OpenstackPortWebResource.java‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
import static javax.ws.rs.core.Response.created;
4747
import static javax.ws.rs.core.Response.noContent;
4848
import static javax.ws.rs.core.Response.status;
49+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
4950
import static org.onosproject.openstacknetworking.api.Constants.REST_UTF8;
5051
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.jsonToModelEntity;
5152
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.syncDelete;
@@ -90,7 +91,8 @@ public Response createPorts(InputStream input) throws IOException {
9091

9192
String inputStr = IOUtils.toString(input, REST_UTF8);
9293

93-
if (!haService.isActive()) {
94+
if (!haService.isActive()
95+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
9496
return syncPost(haService, PORTS, inputStr);
9597
}
9698

@@ -124,7 +126,8 @@ public Response updatePort(@PathParam("id") String id, InputStream input) throws
124126

125127
String inputStr = IOUtils.toString(input, REST_UTF8);
126128

127-
if (!haService.isActive()) {
129+
if (!haService.isActive()
130+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
128131
return syncPut(haService, PORTS, id, inputStr);
129132
}
130133

@@ -166,7 +169,8 @@ public Response updatePort(@PathParam("id") String id, InputStream input) throws
166169
public Response deletePorts(@PathParam("id") String id) {
167170
log.trace(String.format(MESSAGE, "DELETE " + id));
168171

169-
if (!haService.isActive()) {
172+
if (!haService.isActive()
173+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
170174
return syncDelete(haService, PORTS, id);
171175
}
172176

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/web/OpenstackRouterWebResource.java‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import static javax.ws.rs.core.Response.created;
4343
import static javax.ws.rs.core.Response.noContent;
4444
import static javax.ws.rs.core.Response.status;
45+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
4546
import static org.onosproject.openstacknetworking.api.Constants.REST_UTF8;
4647
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.jsonToModelEntity;
4748
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.syncDelete;
@@ -84,7 +85,8 @@ public Response createRouter(InputStream input) throws IOException {
8485

8586
String inputStr = IOUtils.toString(input, REST_UTF8);
8687

87-
if (!haService.isActive()) {
88+
if (!haService.isActive()
89+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
8890
return syncPost(haService, ROUTERS, inputStr);
8991
}
9092

@@ -119,7 +121,8 @@ public Response updateRouter(@PathParam("id") String id, InputStream input) thro
119121

120122
String inputStr = IOUtils.toString(input, REST_UTF8);
121123

122-
if (!haService.isActive()) {
124+
if (!haService.isActive()
125+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
123126
return syncPut(haService, ROUTERS, id, inputStr);
124127
}
125128

@@ -151,7 +154,8 @@ public Response addRouterInterface(@PathParam("id") String id, InputStream input
151154

152155
String inputStr = IOUtils.toString(input, REST_UTF8);
153156

154-
if (!haService.isActive()) {
157+
if (!haService.isActive()
158+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
155159
return syncPut(haService, ROUTERS, "add_router_interface", id, inputStr);
156160
}
157161

@@ -182,7 +186,8 @@ public Response deleteRouterInterface(@PathParam("id") String id, InputStream in
182186

183187
String inputStr = IOUtils.toString(input, REST_UTF8);
184188

185-
if (!haService.isActive()) {
189+
if (!haService.isActive()
190+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
186191
return syncPut(haService, ROUTERS, "remove_router_interface", id, inputStr);
187192
}
188193

@@ -206,7 +211,8 @@ public Response deleteRouterInterface(@PathParam("id") String id, InputStream in
206211
public Response deleteRouter(@PathParam("id") String id) {
207212
log.trace(String.format(MESSAGE_ROUTER, "DELETE " + id));
208213

209-
if (!haService.isActive()) {
214+
if (!haService.isActive()
215+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
210216
return syncDelete(haService, ROUTERS, id);
211217
}
212218

‎apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/web/OpenstackSecurityGroupRuleWebResource.java‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939

4040
import static javax.ws.rs.core.Response.created;
4141
import static javax.ws.rs.core.Response.noContent;
42+
import static org.onosproject.openstacknetworking.api.Constants.DEFAULT_ACTIVE_IP_ADDRESS;
4243
import static org.onosproject.openstacknetworking.api.Constants.REST_UTF8;
4344
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.jsonToModelEntity;
4445
import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.syncDelete;
@@ -78,7 +79,8 @@ public Response createSecurityGroupRules(InputStream input) throws IOException {
7879

7980
String inputStr = IOUtils.toString(input, REST_UTF8);
8081

81-
if (!haService.isActive()) {
82+
if (!haService.isActive()
83+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
8284
return syncPost(haService, SECURITY_GROUP_RULES, inputStr);
8385
}
8486

@@ -106,7 +108,8 @@ public Response createSecurityGroupRules(InputStream input) throws IOException {
106108
public Response deleteSecurityGroupRule(@PathParam("id") String id) {
107109
log.trace(String.format(MESSAGE, "REMOVE " + id));
108110

109-
if (!haService.isActive()) {
111+
if (!haService.isActive()
112+
&& !DEFAULT_ACTIVE_IP_ADDRESS.equals(haService.getActiveIp())) {
110113
return syncDelete(haService, SECURITY_GROUP_RULES, id);
111114
}
112115

0 commit comments

Comments
 (0)