From bd3517aa6a6af71835ef3bcbf47766317d91029e Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 12 May 2017 14:30:48 +0200 Subject: Remove interface-role-state-augmentation Interface-role is config only feature, so readers are not needed. Change-Id: I65e9b1d870e6371d7b442910ca259228b33e7b3e Signed-off-by: Marek Gradzki --- .../api/src/main/yang/interface-role.yang | 9 +--- .../fd/hc2vpp/iface/role/InterfaceRoleModule.java | 3 -- .../role/read/InterfaceRoleReadCustomizer.java | 58 ---------------------- .../role/read/InterfaceRoleReaderFactory.java | 46 ----------------- .../role/write/InterfaceRoleWriteCustomizer.java | 4 +- .../role/write/InterfaceRoleWriterFactory.java | 6 +-- 6 files changed, 6 insertions(+), 120 deletions(-) delete mode 100644 interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReadCustomizer.java delete mode 100644 interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReaderFactory.java (limited to 'interface-role') diff --git a/interface-role/api/src/main/yang/interface-role.yang b/interface-role/api/src/main/yang/interface-role.yang index 72af173b6..a41544d0c 100644 --- a/interface-role/api/src/main/yang/interface-role.yang +++ b/interface-role/api/src/main/yang/interface-role.yang @@ -4,8 +4,7 @@ module interface-role { namespace "urn:opendaylight:params:xml:ns:yang:interface:role"; prefix "if-role"; - // TODO - update revision number to 17.07 release date - revision "2017-03-15" { + revision "2017-06-15" { description "Basic specification of interface roles"; } @@ -68,11 +67,5 @@ module interface-role { uses interface-role-grouping; } - - augment /if:interfaces-state/if:interface { - ext:augment-identifier "interface-role-state-augmentation"; - - uses interface-role-grouping; - } } diff --git a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/InterfaceRoleModule.java b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/InterfaceRoleModule.java index 66b56450f..b7a3c2054 100644 --- a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/InterfaceRoleModule.java +++ b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/InterfaceRoleModule.java @@ -18,9 +18,7 @@ package io.fd.hc2vpp.iface.role; import com.google.inject.AbstractModule; import com.google.inject.multibindings.Multibinder; -import io.fd.hc2vpp.iface.role.read.InterfaceRoleReaderFactory; import io.fd.hc2vpp.iface.role.write.InterfaceRoleWriterFactory; -import io.fd.honeycomb.translate.read.ReaderFactory; import io.fd.honeycomb.translate.write.WriterFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -32,7 +30,6 @@ public class InterfaceRoleModule extends AbstractModule { @Override protected void configure() { LOG.info("Configuring interface role module"); - Multibinder.newSetBinder(binder(), ReaderFactory.class).addBinding().to(InterfaceRoleReaderFactory.class); Multibinder.newSetBinder(binder(), WriterFactory.class).addBinding().to(InterfaceRoleWriterFactory.class); LOG.info("Interface role module configured"); } diff --git a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReadCustomizer.java b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReadCustomizer.java deleted file mode 100644 index 352b33c3c..000000000 --- a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReadCustomizer.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (c) 2017 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.iface.role.read; - -import io.fd.honeycomb.translate.read.ReadContext; -import io.fd.honeycomb.translate.read.ReadFailedException; -import io.fd.honeycomb.translate.spi.read.ListReaderCustomizer; -import java.util.List; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.RolesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.Role; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.RoleBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.RoleKey; -import org.opendaylight.yangtools.concepts.Builder; -import org.opendaylight.yangtools.yang.binding.DataObject; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class InterfaceRoleReadCustomizer implements ListReaderCustomizer { - - @Nonnull - @Override - public List getAllIds(@Nonnull final InstanceIdentifier instanceIdentifier, - @Nonnull final ReadContext readContext) throws ReadFailedException { - throw new UnsupportedOperationException("Operational read not supported for interface roles"); - } - - @Override - public void merge(@Nonnull final Builder builder, @Nonnull final List list) { - ((RolesBuilder) builder).setRole(list); - } - - @Nonnull - @Override - public RoleBuilder getBuilder(@Nonnull final InstanceIdentifier instanceIdentifier) { - return new RoleBuilder(); - } - - @Override - public void readCurrentAttributes(@Nonnull final InstanceIdentifier instanceIdentifier, - @Nonnull final RoleBuilder roleBuilder, @Nonnull final ReadContext readContext) - throws ReadFailedException { - throw new UnsupportedOperationException("Operational read not supported for interface roles"); - } -} diff --git a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReaderFactory.java b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReaderFactory.java deleted file mode 100644 index 3641742bf..000000000 --- a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/read/InterfaceRoleReaderFactory.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * Copyright (c) 2017 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.iface.role.read; - -import io.fd.honeycomb.translate.impl.read.GenericListReader; -import io.fd.honeycomb.translate.read.ReaderFactory; -import io.fd.honeycomb.translate.read.registry.ModifiableReaderRegistryBuilder; -import javax.annotation.Nonnull; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.InterfacesState; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state.Interface; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315.InterfaceRoleStateAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315.InterfaceRoleStateAugmentationBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.Roles; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.RolesBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.Role; -import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; - -public class InterfaceRoleReaderFactory implements ReaderFactory { - - @Override - public void init(@Nonnull final ModifiableReaderRegistryBuilder registry) { - final InstanceIdentifier augId = - InstanceIdentifier.create(InterfacesState.class) - .child(Interface.class) - .augmentation(InterfaceRoleStateAugmentation.class); - registry.addStructuralReader(augId, InterfaceRoleStateAugmentationBuilder.class); - - final InstanceIdentifier rolesId = augId.child(Roles.class); - registry.addStructuralReader(rolesId, RolesBuilder.class); - registry.add(new GenericListReader<>(rolesId.child(Role.class), new InterfaceRoleReadCustomizer())); - } -} diff --git a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriteCustomizer.java b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriteCustomizer.java index fab3ed8c0..904829811 100644 --- a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriteCustomizer.java +++ b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriteCustomizer.java @@ -22,8 +22,8 @@ import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; import javax.annotation.Nonnull; 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._interface.role.rev170315._interface.role.grouping.roles.Role; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.RoleKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170615._interface.role.grouping.roles.Role; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170615._interface.role.grouping.roles.RoleKey; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriterFactory.java b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriterFactory.java index 537c3795e..6f6e5d6c3 100644 --- a/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriterFactory.java +++ b/interface-role/impl/src/main/java/io/fd/hc2vpp/iface/role/write/InterfaceRoleWriterFactory.java @@ -22,9 +22,9 @@ import io.fd.honeycomb.translate.write.registry.ModifiableWriterRegistryBuilder; import javax.annotation.Nonnull; 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.opendaylight.params.xml.ns.yang._interface.role.rev170315.InterfaceRoleAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.Roles; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170315._interface.role.grouping.roles.Role; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170615.InterfaceRoleAugmentation; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170615._interface.role.grouping.Roles; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang._interface.role.rev170615._interface.role.grouping.roles.Role; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; public class InterfaceRoleWriterFactory implements WriterFactory { -- cgit 1.2.3-korg