diff options
author | Marek Gradzki <mgradzki@cisco.com> | 2016-12-09 12:07:40 +0100 |
---|---|---|
committer | Marek Gradzki <mgradzki@cisco.com> | 2016-12-09 13:02:00 +0100 |
commit | 14889dd50dc84954ca5ae8c2dc29d472a4549902 (patch) | |
tree | 12041fe4cccf0467855873e45a08df4ebeac2447 | |
parent | e05955468e015e10c36635b758a35f11613e96c9 (diff) |
HONEYCOMB-129: add support for setting mtu
Also updates postman collection with examples of set mtu request.
Setting mtu is not supported for local0 interface:
affected requests from the collection were updated.
Change-Id: I709192e328abad7786d3c87426b00106dac42b73
Signed-off-by: Marek Gradzki <mgradzki@cisco.com>
4 files changed, 204 insertions, 37 deletions
diff --git a/v3po/postman_rest_collection.json b/v3po/postman_rest_collection.json index f33325c1c..6c137d41e 100644 --- a/v3po/postman_rest_collection.json +++ b/v3po/postman_rest_collection.json @@ -8,7 +8,6 @@ "8f5860a3-ac28-811b-3830-52df067c1a60", "4166392e-d64c-34b9-1117-cbd36974fa7e", "7b592c36-12a3-2867-ed71-80ec74695dec", - "4a8f8191-91ce-d65c-58c9-206204603a3e", "2a3a5de9-ed06-6468-2c11-ddbdc4ec1224" ], "folders": [ @@ -78,6 +77,17 @@ "owner": "45557" }, { + "id": "eadd60bb-f2f7-0abe-d47c-383ccc3d7fae", + "name": "ETH", + "description": "Example requests for management of Ethernet type interfaces", + "order": [ + "37c2351b-42f1-b82a-b076-495e6af0a74f", + "281c0a69-3a27-a99f-6c51-df78f35cf702", + "a16cefb9-c3e6-52c7-3167-7b081b07a8db" + ], + "owner": "45557" + }, + { "id": "2e489b42-8432-15f1-f4bc-859c34a3c570", "name": "GRE-TUNNEL", "description": "", @@ -640,7 +650,7 @@ "description": "", "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", "responses": [], - "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"local0\",\r\n \"description\": \"for testing purposes only\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"routing\" : {\r\n \"ipv4-vrf-id\" : \"7\"\r\n },\r\n \"v3po:ethernet\": {\r\n \"mtu\": 64\r\n }\r\n }\r\n ]\r\n \r\n}" + "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"local0\",\r\n \"description\": \"for testing purposes only\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"routing\" : {\r\n \"ipv4-vrf-id\" : \"7\"\r\n }\r\n }\r\n ]\r\n \r\n}" }, { "id": "2d25db9f-6c65-5fe0-1602-5484c058bd1b", @@ -918,26 +928,6 @@ "rawModeData": "" }, { - "id": "4a8f8191-91ce-d65c-58c9-206204603a3e", - "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", - "url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces", - "preRequestScript": "", - "pathVariables": {}, - "method": "PUT", - "data": [], - "dataMode": "raw", - "version": 2, - "tests": "", - "currentHelper": "normal", - "helperAttributes": {}, - "time": 1460636113690, - "name": "Set interfaces bulk edit - cfg", - "description": "", - "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", - "responses": [], - "rawModeData": "{\n \"interfaces\": {\n \"interface\": [\n {\n \"name\": \"pg/stream-2\",\n \"enabled\": true,\n \"type\": \"iana-if-type:ethernetCsmacd\"\n },\n {\n \"name\": \"pg/stream-3\",\n \"enabled\": true,\n \"type\": \"iana-if-type:ethernetCsmacd\"\n },\n {\n \"name\": \"pg/stream-0\",\n \"enabled\": true,\n \"type\": \"iana-if-type:ethernetCsmacd\"\n },\n {\n \"name\": \"local0\",\n \"description\": \"for testing purposes\",\n \"type\": \"iana-if-type:ethernetCsmacd\",\n \"enabled\": true\n },\n {\n \"name\": \"pg/stream-1\",\n \"enabled\": true,\n \"type\": \"iana-if-type:ethernetCsmacd\"\n }\n ]\n }\n}" - }, - { "id": "4afe77aa-43c0-29ba-c910-4cbbea95ee07", "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", "url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/local0/ipv4", @@ -1251,7 +1241,7 @@ "description": "", "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", "responses": [], - "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"local0\",\r\n \"description\": \"for testing purposes\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"v3po:ethernet\": {\r\n \"mtu\": 64\r\n }\r\n }\r\n ]\r\n \r\n}" + "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"local0\",\r\n \"description\": \"for testing purposes\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\"\r\n }\r\n ]\r\n \r\n}" }, { "id": "8f5860a3-ac28-811b-3830-52df067c1a60", @@ -1464,6 +1454,66 @@ "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"testInterface\",\r\n \"description\": \"for testing purposes\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"link-up-down-trap-enable\": \"enabled\",\r\n \"ietf-ip:ipv4\": {\r\n \"enabled\": \"true\",\r\n \"mtu\": \"1500\",\r\n \"address\": [\r\n {\r\n \"ip\": \"1.2.3.0\",\r\n \"netmask\": \"255.255.255.0\"\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n \r\n}" }, { + "id": "37c2351b-42f1-b82a-b076-495e6af0a74f", + "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", + "url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F8%2F0", + "preRequestScript": "", + "pathVariables": {}, + "method": "PUT", + "data": [], + "dataMode": "raw", + "version": 2, + "tests": "", + "currentHelper": "normal", + "helperAttributes": {}, + "time": 1481283246237, + "name": "Set interface mtu", + "description": "", + "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", + "responses": [], + "rawModeData": "{\n \"interface\": [\n {\n \"name\": \"GigabitEthernet0/8/0\",\n \"type\": \"iana-if-type:ethernetCsmacd\",\n \"enabled\": false,\n \"v3po:ethernet\": {\n \"mtu\": 1234\n }\n }\n ]\n}" + }, + { + "id": "281c0a69-3a27-a99f-6c51-df78f35cf702", + "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", + "url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/GigabitEthernet0%2F8%2F0", + "preRequestScript": "", + "pathVariables": {}, + "method": "GET", + "data": [], + "dataMode": "raw", + "version": 2, + "tests": "", + "currentHelper": "normal", + "helperAttributes": {}, + "time": 1481283193417, + "name": "Get interface cfg", + "description": "Shows configuration for GigabitEthernet0/8/0", + "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", + "responses": [], + "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"testInterface\",\r\n \"description\": \"for testing purposes\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"link-up-down-trap-enable\": \"enabled\",\r\n \"ietf-ip:ipv4\": {\r\n \"enabled\": \"true\",\r\n \"mtu\": \"1500\",\r\n \"address\": [\r\n {\r\n \"ip\": \"1.2.3.0\",\r\n \"netmask\": \"255.255.255.0\"\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n \r\n}" + }, + { + "id": "a16cefb9-c3e6-52c7-3167-7b081b07a8db", + "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", + "url": "http://localhost:8183/restconf/operational/ietf-interfaces:interfaces-state/interface/GigabitEthernet0%2F8%2F0", + "preRequestScript": "", + "pathVariables": {}, + "method": "GET", + "data": [], + "dataMode": "raw", + "version": 2, + "tests": "", + "currentHelper": "normal", + "helperAttributes": {}, + "time": 1481283223659, + "name": "Get interface - oper", + "description": "Shows operational state for GigabitEthernet0/8/0", + "collectionId": "5bad4634-e5cf-900e-9733-0976aa9bea64", + "responses": [], + "rawModeData": "{\r\n \r\n \"interface\": [\r\n {\r\n \"name\": \"testInterface\",\r\n \"description\": \"for testing purposes\",\r\n \"type\": \"iana-if-type:ethernetCsmacd\",\r\n \"enabled\": \"true\",\r\n \"link-up-down-trap-enable\": \"enabled\",\r\n \"ietf-ip:ipv4\": {\r\n \"enabled\": \"true\",\r\n \"mtu\": \"1500\",\r\n \"address\": [\r\n {\r\n \"ip\": \"1.2.3.0\",\r\n \"netmask\": \"255.255.255.0\"\r\n }\r\n ]\r\n }\r\n }\r\n ]\r\n \r\n}" + }, + { "id": "ae996349-eec7-2ac4-9fde-1ec9fc63cd3f", "headers": "Authorization: Basic YWRtaW46YWRtaW4=\nContent-Type: application/json\n", "url": "http://localhost:8183/restconf/config/ietf-interfaces:interfaces/interface/local0/ipv4/address/127.0.0.1", diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java index c90515614..94b7f02d7 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/factory/InterfacesWriterFactory.java @@ -172,7 +172,8 @@ public final class InterfacesWriterFactory implements WriterFactory { final Set<InstanceIdentifier<?>> specificIfcTypes = Sets.newHashSet(vhostId, vxlanGpeId, vxlanGpeId, tapId); // Ethernet = - registry.add(new GenericWriter<>(VPP_IFC_AUG_ID.child(Ethernet.class), new EthernetCustomizer(jvpp))); + registry.add(new GenericWriter<>(VPP_IFC_AUG_ID.child(Ethernet.class), + new EthernetCustomizer(jvpp, ifcNamingContext))); // Routing(Execute only after specific interface customizers) = registry.addAfter( new GenericWriter<>(VPP_IFC_AUG_ID.child(Routing.class), new RoutingCustomizer(jvpp, ifcNamingContext)), diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java index ec83df831..a6110d469 100644 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java +++ b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizer.java @@ -16,43 +16,69 @@ package io.fd.hc2vpp.v3po.interfaces; -import io.fd.honeycomb.translate.spi.write.WriterCustomizer; -import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; +import io.fd.hc2vpp.common.translate.util.AbstractInterfaceTypeCustomizer; +import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.hc2vpp.common.translate.util.NamingContext; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMtu; +import io.fd.vpp.jvpp.core.future.FutureJVppCore; import javax.annotation.Nonnull; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.EthernetCsmacd; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfaceType; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.Ethernet; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -import io.fd.vpp.jvpp.core.future.FutureJVppCore; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class EthernetCustomizer extends FutureJVppCustomizer implements WriterCustomizer<Ethernet> { +public class EthernetCustomizer extends AbstractInterfaceTypeCustomizer<Ethernet> implements JvppReplyConsumer { private static final Logger LOG = LoggerFactory.getLogger(EthernetCustomizer.class); + private final NamingContext interfaceContext; - public EthernetCustomizer(final FutureJVppCore vppApi) { + public EthernetCustomizer(final FutureJVppCore vppApi, final NamingContext interfaceContext) { super(vppApi); + this.interfaceContext = interfaceContext; + } + + @Override + protected Class<? extends InterfaceType> getExpectedInterfaceType() { + return EthernetCsmacd.class; } @Override - public void writeCurrentAttributes(@Nonnull final InstanceIdentifier<Ethernet> id, + public void writeInterface(@Nonnull final InstanceIdentifier<Ethernet> id, @Nonnull final Ethernet dataAfter, @Nonnull final WriteContext writeContext) - throws WriteFailedException { - LOG.warn("Unsupported, ignoring configuration {}", dataAfter); - // VPP API does not support setting MTU + throws WriteFailedException { + setEthernetAttributes(id, dataAfter, writeContext); } @Override public void updateCurrentAttributes(@Nonnull final InstanceIdentifier<Ethernet> id, @Nonnull final Ethernet dataBefore, @Nonnull final Ethernet dataAfter, - @Nonnull final WriteContext writeContext) { - LOG.warn("Unsupported, ignoring configuration {}", dataAfter); + @Nonnull final WriteContext writeContext) throws WriteFailedException { + setEthernetAttributes(id, dataAfter, writeContext); } @Override public void deleteCurrentAttributes(@Nonnull final InstanceIdentifier<Ethernet> id, - @Nonnull final Ethernet dataBefore, @Nonnull final WriteContext writeContext) { - LOG.warn("Unsupported, ignoring configuration delete {}", id); + @Nonnull final Ethernet dataBefore, @Nonnull final WriteContext writeContext) + throws WriteFailedException.DeleteFailedException { + throw new WriteFailedException.DeleteFailedException(id, + new UnsupportedOperationException("Removing interface of Ethernet class is not supported")); + } + + private void setEthernetAttributes(@Nonnull final InstanceIdentifier<Ethernet> id, + @Nonnull final Ethernet dataAfter, @Nonnull final WriteContext writeContext) + throws WriteFailedException { + final String name = id.firstKeyOf(Interface.class).getName(); + final int index = interfaceContext.getIndex(name, writeContext.getMappingContext()); + LOG.debug("Setting Ethernet attributes for interface: {}, {}. Ethernet: {}", name, index, dataAfter); + final SwInterfaceSetMtu request = new SwInterfaceSetMtu(); + request.swIfIndex = index; + request.mtu = dataAfter.getMtu().shortValue(); + getReplyForWrite(getFutureJVpp().swInterfaceSetMtu(request).toCompletableFuture(), id); + LOG.debug("Ethernet attributes set successfully for: {}, {}. Ethernet: {}", name, index, dataAfter); } } diff --git a/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java new file mode 100644 index 000000000..b74357fdc --- /dev/null +++ b/v3po/v3po2vpp/src/test/java/io/fd/hc2vpp/v3po/interfaces/EthernetCustomizerTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2016 Cisco and/or its affiliates. + * + * 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 io.fd.hc2vpp.v3po.interfaces; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; +import io.fd.hc2vpp.common.translate.util.NamingContext; +import io.fd.honeycomb.translate.write.WriteFailedException; +import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMtu; +import io.fd.vpp.jvpp.core.dto.SwInterfaceSetMtuReply; +import org.junit.Test; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.iana._if.type.rev140508.EthernetCsmacd; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.Interfaces; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.InterfaceKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.VppInterfaceAugmentation; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.Ethernet; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.v3po.rev161214.interfaces._interface.EthernetBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; + +public class EthernetCustomizerTest extends WriterCustomizerTest { + + private static final String IFC_TEST_INSTANCE = "ifc-test-instance"; + private static final String IF_NAME = "eth0"; + private static final int IF_INDEX = 1; + private static final InstanceIdentifier<Ethernet> IF_IID = + InstanceIdentifier.create(Interfaces.class).child(Interface.class, new InterfaceKey(IF_NAME)).augmentation( + VppInterfaceAugmentation.class).child(Ethernet.class); + private EthernetCustomizer customizer; + + @Override + public void setUpTest() throws Exception { + InterfaceTypeTestUtils.setupWriteContext(writeContext, EthernetCsmacd.class); + customizer = new EthernetCustomizer(api, new NamingContext("ifcintest", IFC_TEST_INSTANCE)); + defineMapping(mappingContext, IF_NAME, IF_INDEX, IFC_TEST_INSTANCE); + } + + @Test + public void testWrite() throws WriteFailedException { + when(api.swInterfaceSetMtu(any())).thenReturn(future(new SwInterfaceSetMtuReply())); + final int mtu = 1234; + customizer.writeCurrentAttributes(IF_IID, ethernet(mtu), writeContext); + verify(api).swInterfaceSetMtu(mtuSetRequest(mtu)); + } + + @Test + public void testUpdate() throws WriteFailedException { + when(api.swInterfaceSetMtu(any())).thenReturn(future(new SwInterfaceSetMtuReply())); + final int mtu = 5678; + customizer.updateCurrentAttributes(IF_IID, mock(Ethernet.class), ethernet(mtu), writeContext); + verify(api).swInterfaceSetMtu(mtuSetRequest(mtu)); + } + + private SwInterfaceSetMtu mtuSetRequest(final int mtu) { + final SwInterfaceSetMtu request = new SwInterfaceSetMtu(); + request.swIfIndex = IF_INDEX; + request.mtu = (short)mtu; + return request; + } + + @Test(expected = WriteFailedException.class) + public void testDelete() throws WriteFailedException { + customizer.deleteCurrentAttributes(IF_IID, mock(Ethernet.class), writeContext); + } + + private static Ethernet ethernet(final int mtu) { + final EthernetBuilder ethernet = new EthernetBuilder(); + ethernet.setMtu(mtu); + return ethernet.build(); + } + +}
\ No newline at end of file |