From 55d4a1b251e1b2e36b9036b3d0b033abc38acbec Mon Sep 17 00:00:00 2001 From: Ashlee Young Date: Fri, 13 Nov 2015 17:25:44 -0800 Subject: ONOS commit d9df7bd278935c3d72ac6eeb0ff44efe1edde567 Change-Id: I319f3a3765db55034b894238fb9391eee56c6dd4 Signed-off-by: Ashlee Young --- .../src/main/java/org/onosproject/acl/AclRule.java | 6 +- .../java/org/onosproject/acl/AclWebResource.java | 4 +- .../java/org/onosproject/acl/impl/AclManager.java | 20 +-- .../org/onosproject/bgprouter/IcmpHandler.java | 4 +- .../onosproject/cordfabric/CordFabricManager.java | 4 +- .../optical/testapp/MPLSForwarding.java | 180 --------------------- .../optical/testapp/MplsForwarding.java | 180 +++++++++++++++++++++ .../main/java/org/onosproject/demo/DemoAPI.java | 49 ------ .../main/java/org/onosproject/demo/DemoApi.java | 49 ++++++ .../java/org/onosproject/demo/DemoInstaller.java | 2 +- .../java/org/onosproject/demo/DemoResource.java | 8 +- 11 files changed, 253 insertions(+), 253 deletions(-) delete mode 100644 framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java create mode 100644 framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java delete mode 100644 framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java create mode 100644 framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoApi.java (limited to 'framework/src/onos/apps') diff --git a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclRule.java b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclRule.java index 8c91da4c..cd85dea7 100644 --- a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclRule.java +++ b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclRule.java @@ -86,7 +86,7 @@ public final class AclRule { /** * Check if the first CIDR address is in (or the same as) the second CIDR address. */ - private boolean checkCIDRinCIDR(Ip4Prefix cidrAddr1, Ip4Prefix cidrAddr2) { + private boolean checkCidrInCidr(Ip4Prefix cidrAddr1, Ip4Prefix cidrAddr2) { if (cidrAddr2 == null) { return true; } else if (cidrAddr1 == null) { @@ -116,8 +116,8 @@ public final class AclRule { public boolean checkMatch(AclRule r) { return (this.dstTpPort == r.dstTpPort || r.dstTpPort == 0) && (this.ipProto == r.ipProto || r.ipProto == 0) - && (checkCIDRinCIDR(this.srcIp(), r.srcIp())) - && (checkCIDRinCIDR(this.dstIp(), r.dstIp())); + && (checkCidrInCidr(this.srcIp(), r.srcIp())) + && (checkCidrInCidr(this.dstIp(), r.dstIp())); } /** diff --git a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java index 9ec4c883..bdbcc693 100644 --- a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java +++ b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java @@ -129,7 +129,7 @@ public class AclWebResource extends AbstractWebResource { * @return 200 OK */ @DELETE - public Response clearACL() { + public Response clearAcl() { get(AclService.class).clearAcl(); return Response.ok().build(); } @@ -189,4 +189,4 @@ public class AclWebResource extends AbstractWebResource { return rule.build(); } -} \ No newline at end of file +} diff --git a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java index f5c0c204..638f0799 100644 --- a/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java +++ b/framework/src/onos/apps/acl/src/main/java/org/onosproject/acl/impl/AclManager.java @@ -90,7 +90,7 @@ public class AclManager implements AclService { /** * Checks if the given IP address is in the given CIDR address. */ - private boolean checkIpInCIDR(Ip4Address ip, Ip4Prefix cidr) { + private boolean checkIpInCidr(Ip4Address ip, Ip4Prefix cidr) { int offset = 32 - cidr.prefixLength(); int cidrPrefix = cidr.address().toInt(); int ipIntValue = ip.toInt(); @@ -111,17 +111,17 @@ public class AclManager implements AclService { DeviceId deviceId = event.subject().location().deviceId(); for (IpAddress address : event.subject().ipAddresses()) { if ((rule.srcIp() != null) ? - (checkIpInCIDR(address.getIp4Address(), rule.srcIp())) : - (checkIpInCIDR(address.getIp4Address(), rule.dstIp()))) { + (checkIpInCidr(address.getIp4Address(), rule.srcIp())) : + (checkIpInCidr(address.getIp4Address(), rule.dstIp()))) { if (!aclStore.checkIfRuleWorksInDevice(rule.id(), deviceId)) { List allowingRuleList = aclStore .getAllowingRuleByDenyingRule(rule.id()); if (allowingRuleList != null) { for (RuleId allowingRuleId : allowingRuleList) { - generateACLFlow(aclStore.getAclRule(allowingRuleId), deviceId); + generateAclFlow(aclStore.getAclRule(allowingRuleId), deviceId); } } - generateACLFlow(rule, deviceId); + generateAclFlow(rule, deviceId); } } } @@ -212,7 +212,7 @@ public class AclManager implements AclService { if (cidrAddr.prefixLength() != 32) { for (Host h : hosts) { for (IpAddress a : h.ipAddresses()) { - if (checkIpInCIDR(a.getIp4Address(), cidrAddr)) { + if (checkIpInCidr(a.getIp4Address(), cidrAddr)) { deviceIdSet.add(h.location().deviceId()); } } @@ -220,7 +220,7 @@ public class AclManager implements AclService { } else { for (Host h : hosts) { for (IpAddress a : h.ipAddresses()) { - if (checkIpInCIDR(a.getIp4Address(), cidrAddr)) { + if (checkIpInCidr(a.getIp4Address(), cidrAddr)) { deviceIdSet.add(h.location().deviceId()); return deviceIdSet; } @@ -245,10 +245,10 @@ public class AclManager implements AclService { List allowingRuleList = aclStore.getAllowingRuleByDenyingRule(rule.id()); if (allowingRuleList != null) { for (RuleId allowingRuleId : allowingRuleList) { - generateACLFlow(aclStore.getAclRule(allowingRuleId), deviceId); + generateAclFlow(aclStore.getAclRule(allowingRuleId), deviceId); } } - generateACLFlow(rule, deviceId); + generateAclFlow(rule, deviceId); } } @@ -256,7 +256,7 @@ public class AclManager implements AclService { * Generates ACL flow rule according to ACL rule * and install it into related device. */ - private void generateACLFlow(AclRule rule, DeviceId deviceId) { + private void generateAclFlow(AclRule rule, DeviceId deviceId) { if (rule == null || aclStore.checkIfRuleWorksInDevice(rule.id(), deviceId)) { return; } diff --git a/framework/src/onos/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java b/framework/src/onos/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java index 6130a2e2..be4499e9 100644 --- a/framework/src/onos/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java +++ b/framework/src/onos/apps/bgprouter/src/main/java/org/onosproject/bgprouter/IcmpHandler.java @@ -83,11 +83,11 @@ public class IcmpHandler { if (((ICMP) ipv4.getPayload()).getIcmpType() == ICMP.TYPE_ECHO_REQUEST && ipMatches) { - sendICMPResponse(ethernet, connectPoint); + sendIcmpResponse(ethernet, connectPoint); } } - private void sendICMPResponse(Ethernet icmpRequest, ConnectPoint outport) { + private void sendIcmpResponse(Ethernet icmpRequest, ConnectPoint outport) { Ethernet icmpReplyEth = new Ethernet(); diff --git a/framework/src/onos/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java b/framework/src/onos/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java index fa916865..690a3581 100644 --- a/framework/src/onos/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java +++ b/framework/src/onos/apps/cordfabric/src/main/java/org/onosproject/cordfabric/CordFabricManager.java @@ -268,7 +268,7 @@ public class CordFabricManager implements FabricService { removeVlan(vlan.vlan()); if (vlan.iptv()) { - provisionIPTV(); + provisionIpTv(); } vlan.ports().forEach(cp -> { @@ -283,7 +283,7 @@ public class CordFabricManager implements FabricService { } //FIXME: pass iptv vlan in here. - private void provisionIPTV() { + private void provisionIpTv() { TrafficSelector ipTvUp = DefaultTrafficSelector.builder() .matchVlanId(VlanId.vlanId((short) 7)) .matchInPort(PortNumber.portNumber(2)) diff --git a/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java b/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java deleted file mode 100644 index c784c82f..00000000 --- a/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MPLSForwarding.java +++ /dev/null @@ -1,180 +0,0 @@ -/* - * Copyright 2014-2015 Open Networking Laboratory - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onosproject.optical.testapp; - -import static org.slf4j.LoggerFactory.getLogger; - -import java.util.HashMap; -import java.util.Map; - -import org.apache.felix.scr.annotations.Activate; -import org.apache.felix.scr.annotations.Deactivate; -import org.apache.felix.scr.annotations.Reference; -import org.apache.felix.scr.annotations.ReferenceCardinality; -import org.onosproject.core.ApplicationId; -import org.onosproject.core.CoreService; -import org.onosproject.net.Device; -import org.onosproject.net.DeviceId; -import org.onosproject.net.PortNumber; -import org.onosproject.net.device.DeviceEvent; -import org.onosproject.net.device.DeviceListener; -import org.onosproject.net.device.DeviceService; -import org.onosproject.net.flow.DefaultFlowRule; -import org.onosproject.net.flow.DefaultTrafficSelector; -import org.onosproject.net.flow.DefaultTrafficTreatment; -import org.onosproject.net.flow.FlowRule; -import org.onosproject.net.flow.FlowRuleService; -import org.onosproject.net.flow.TrafficSelector; -import org.onosproject.net.flow.TrafficTreatment; -import org.onlab.packet.Ethernet; -import org.onlab.packet.MplsLabel; -import org.slf4j.Logger; - -/** - * Sample reactive forwarding application. - */ -//@Component(immediate = true) -public class MPLSForwarding { - - private final Logger log = getLogger(getClass()); - - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - protected FlowRuleService flowRuleService; - - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - protected CoreService coreService; - - @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) - protected DeviceService deviceService; - - private ApplicationId appId; - - private final InternalDeviceListener listener = new InternalDeviceListener(); - - private final Map uglyMap = new HashMap<>(); - - @Activate - public void activate() { - appId = coreService.registerApplication("org.onosproject.testapp" + - ".mplsfwd"); - - uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1); - uglyMap.put(DeviceId.deviceId("of:0000000000000002"), 2); - uglyMap.put(DeviceId.deviceId("of:0000000000000003"), 3); - - deviceService.addListener(listener); - - for (Device d : deviceService.getDevices()) { - pushRules(d); - } - - - log.info("Started with Application ID {}", appId.id()); - } - - @Deactivate - public void deactivate() { - flowRuleService.removeFlowRulesById(appId); - - log.info("Stopped"); - } - - - private void pushRules(Device device) { - - TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder(); - TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder(); - int inport = 1; - int outport = 2; - MplsLabel mplsLabel = MplsLabel.mplsLabel(101); - Integer switchNumber = uglyMap.get(device.id()); - if (switchNumber == null) { - return; - } - - switch (switchNumber) { - case 1: - sbuilder.matchInPort(PortNumber.portNumber(inport)); - tbuilder.setOutput(PortNumber.portNumber(outport)) - .pushMpls() - .setMpls(mplsLabel); - break; - case 2: - sbuilder.matchMplsLabel(mplsLabel) - .matchEthType(Ethernet.MPLS_UNICAST) - .matchInPort(PortNumber.portNumber(inport)); - tbuilder.setOutput(PortNumber.portNumber(outport)); - break; - case 3: - sbuilder.matchMplsLabel(mplsLabel) - .matchEthType(Ethernet.MPLS_UNICAST) - .matchInPort(PortNumber.portNumber(inport)); - tbuilder.popMpls().setOutput(PortNumber.portNumber(outport)); - break; - default: - } - - TrafficTreatment treatement = tbuilder.build(); - TrafficSelector selector = sbuilder.build(); - - FlowRule f = DefaultFlowRule.builder() - .forDevice(device.id()) - .withSelector(selector) - .withTreatment(treatement) - .withPriority(100) - .fromApp(appId) - .makeTemporary(600) - .build(); - - flowRuleService.applyFlowRules(f); - } - - - public class InternalDeviceListener implements DeviceListener { - - @Override - public void event(DeviceEvent event) { - switch (event.type()) { - case DEVICE_ADDED: - pushRules(event.subject()); - break; - case DEVICE_AVAILABILITY_CHANGED: - break; - case DEVICE_REMOVED: - break; - case DEVICE_SUSPENDED: - break; - case DEVICE_UPDATED: - break; - case PORT_ADDED: - break; - case PORT_REMOVED: - break; - case PORT_UPDATED: - break; - default: - break; - - } - - } - - } - - -} - - diff --git a/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java b/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java new file mode 100644 index 00000000..b9a4b0ca --- /dev/null +++ b/framework/src/onos/apps/optical/src/main/java/org/onosproject/optical/testapp/MplsForwarding.java @@ -0,0 +1,180 @@ +/* + * Copyright 2014-2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onosproject.optical.testapp; + +import org.apache.felix.scr.annotations.Activate; +import org.apache.felix.scr.annotations.Deactivate; +import org.apache.felix.scr.annotations.Reference; +import org.apache.felix.scr.annotations.ReferenceCardinality; +import org.onlab.packet.Ethernet; +import org.onlab.packet.MplsLabel; +import org.onosproject.core.ApplicationId; +import org.onosproject.core.CoreService; +import org.onosproject.net.Device; +import org.onosproject.net.DeviceId; +import org.onosproject.net.PortNumber; +import org.onosproject.net.device.DeviceEvent; +import org.onosproject.net.device.DeviceListener; +import org.onosproject.net.device.DeviceService; +import org.onosproject.net.flow.DefaultFlowRule; +import org.onosproject.net.flow.DefaultTrafficSelector; +import org.onosproject.net.flow.DefaultTrafficTreatment; +import org.onosproject.net.flow.FlowRule; +import org.onosproject.net.flow.FlowRuleService; +import org.onosproject.net.flow.TrafficSelector; +import org.onosproject.net.flow.TrafficTreatment; +import org.slf4j.Logger; + +import java.util.HashMap; +import java.util.Map; + +import static org.slf4j.LoggerFactory.getLogger; + +/** + * Sample reactive forwarding application. + */ +//@Component(immediate = true) +public class MplsForwarding { + + private final Logger log = getLogger(getClass()); + + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) + protected FlowRuleService flowRuleService; + + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) + protected CoreService coreService; + + @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) + protected DeviceService deviceService; + + private ApplicationId appId; + + private final InternalDeviceListener listener = new InternalDeviceListener(); + + private final Map uglyMap = new HashMap<>(); + + @Activate + public void activate() { + appId = coreService.registerApplication("org.onosproject.testapp" + + ".mplsfwd"); + + uglyMap.put(DeviceId.deviceId("of:0000000000000001"), 1); + uglyMap.put(DeviceId.deviceId("of:0000000000000002"), 2); + uglyMap.put(DeviceId.deviceId("of:0000000000000003"), 3); + + deviceService.addListener(listener); + + for (Device d : deviceService.getDevices()) { + pushRules(d); + } + + + log.info("Started with Application ID {}", appId.id()); + } + + @Deactivate + public void deactivate() { + flowRuleService.removeFlowRulesById(appId); + + log.info("Stopped"); + } + + + private void pushRules(Device device) { + + TrafficSelector.Builder sbuilder = DefaultTrafficSelector.builder(); + TrafficTreatment.Builder tbuilder = DefaultTrafficTreatment.builder(); + int inport = 1; + int outport = 2; + MplsLabel mplsLabel = MplsLabel.mplsLabel(101); + Integer switchNumber = uglyMap.get(device.id()); + if (switchNumber == null) { + return; + } + + switch (switchNumber) { + case 1: + sbuilder.matchInPort(PortNumber.portNumber(inport)); + tbuilder.setOutput(PortNumber.portNumber(outport)) + .pushMpls() + .setMpls(mplsLabel); + break; + case 2: + sbuilder.matchMplsLabel(mplsLabel) + .matchEthType(Ethernet.MPLS_UNICAST) + .matchInPort(PortNumber.portNumber(inport)); + tbuilder.setOutput(PortNumber.portNumber(outport)); + break; + case 3: + sbuilder.matchMplsLabel(mplsLabel) + .matchEthType(Ethernet.MPLS_UNICAST) + .matchInPort(PortNumber.portNumber(inport)); + tbuilder.popMpls().setOutput(PortNumber.portNumber(outport)); + break; + default: + } + + TrafficTreatment treatement = tbuilder.build(); + TrafficSelector selector = sbuilder.build(); + + FlowRule f = DefaultFlowRule.builder() + .forDevice(device.id()) + .withSelector(selector) + .withTreatment(treatement) + .withPriority(100) + .fromApp(appId) + .makeTemporary(600) + .build(); + + flowRuleService.applyFlowRules(f); + } + + + public class InternalDeviceListener implements DeviceListener { + + @Override + public void event(DeviceEvent event) { + switch (event.type()) { + case DEVICE_ADDED: + pushRules(event.subject()); + break; + case DEVICE_AVAILABILITY_CHANGED: + break; + case DEVICE_REMOVED: + break; + case DEVICE_SUSPENDED: + break; + case DEVICE_UPDATED: + break; + case PORT_ADDED: + break; + case PORT_REMOVED: + break; + case PORT_UPDATED: + break; + default: + break; + + } + + } + + } + + +} + + diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java deleted file mode 100644 index 00956763..00000000 --- a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoAPI.java +++ /dev/null @@ -1,49 +0,0 @@ -/* - * Copyright 2014-2015 Open Networking Laboratory - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.onosproject.demo; - -import com.fasterxml.jackson.databind.JsonNode; - -import java.util.Optional; - -/** - * Simple demo api interface. - */ -public interface DemoAPI { - - enum InstallType { MESH, RANDOM } - - /** - * Tests flow subsystem based on the parameters supplied. - * - * @param params the test parameters - * @return JSON representation - */ - JsonNode flowTest(Optional params); - - /** - * Installs intents based on the installation type. - * @param type the installation type. - * @param runParams run params - */ - void setup(InstallType type, Optional runParams); - - /** - * Uninstalls all existing intents. - */ - void tearDown(); - -} diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoApi.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoApi.java new file mode 100644 index 00000000..1e594157 --- /dev/null +++ b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoApi.java @@ -0,0 +1,49 @@ +/* + * Copyright 2014-2015 Open Networking Laboratory + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.onosproject.demo; + +import com.fasterxml.jackson.databind.JsonNode; + +import java.util.Optional; + +/** + * Simple demo api interface. + */ +public interface DemoApi { + + enum InstallType { MESH, RANDOM } + + /** + * Tests flow subsystem based on the parameters supplied. + * + * @param params the test parameters + * @return JSON representation + */ + JsonNode flowTest(Optional params); + + /** + * Installs intents based on the installation type. + * @param type the installation type. + * @param runParams run params + */ + void setup(InstallType type, Optional runParams); + + /** + * Uninstalls all existing intents. + */ + void tearDown(); + +} diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java index a408e695..0bddc083 100644 --- a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java +++ b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoInstaller.java @@ -87,7 +87,7 @@ import static org.slf4j.LoggerFactory.getLogger; */ @Component(immediate = true) @Service -public class DemoInstaller implements DemoAPI { +public class DemoInstaller implements DemoApi { private final Logger log = getLogger(getClass()); diff --git a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoResource.java b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoResource.java index e0c97dd8..e3a5a2d8 100644 --- a/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoResource.java +++ b/framework/src/onos/apps/test/demo/src/main/java/org/onosproject/demo/DemoResource.java @@ -51,7 +51,7 @@ public class DemoResource extends BaseResource { public Response flowTest(InputStream input) throws IOException { ObjectMapper mapper = new ObjectMapper(); JsonNode cfg = mapper.readTree(input); - DemoAPI demo = get(DemoAPI.class); + DemoApi demo = get(DemoApi.class); return Response.ok(demo.flowTest(Optional.ofNullable(cfg)).toString()).build(); } @@ -75,9 +75,9 @@ public class DemoResource extends BaseResource { } - DemoAPI.InstallType type = DemoAPI.InstallType.valueOf( + DemoApi.InstallType type = DemoApi.InstallType.valueOf( cfg.get("type").asText().toUpperCase()); - DemoAPI demo = get(DemoAPI.class); + DemoApi demo = get(DemoApi.class); demo.setup(type, Optional.ofNullable(cfg.get("runParams"))); return Response.ok(mapper.createObjectNode().toString()).build(); @@ -93,7 +93,7 @@ public class DemoResource extends BaseResource { @Produces(MediaType.APPLICATION_JSON) public Response tearDown() { ObjectMapper mapper = new ObjectMapper(); - DemoAPI demo = get(DemoAPI.class); + DemoApi demo = get(DemoApi.class); demo.tearDown(); return Response.ok(mapper.createObjectNode().toString()).build(); } -- cgit 1.2.3-korg