From abd7814ef36ed9135c6e80b79ece76238d50a39c Mon Sep 17 00:00:00 2001 From: Maros Marsalek Date: Tue, 12 Apr 2016 10:13:25 +0200 Subject: HONEYCOMB-8: Remove references to VPP from data layer Change-Id: Ia8ceb1f6e16c5148514ee2add55ff78533d8fe1e Signed-off-by: Marek Gradzki Signed-off-by: Maros Marsalek --- v3po/data-api/pom.xml | 2 +- .../fd/honeycomb/v3po/data/DataTreeSnapshot.java | 34 +++++++++++++++++ .../fd/honeycomb/v3po/data/ModifiableDataTree.java | 44 ++++++++++++++++++++++ .../fd/honeycomb/v3po/data/ReadableDataTree.java | 39 +++++++++++++++++++ .../honeycomb/v3po/data/ReadableVppDataTree.java | 39 ------------------- .../io/fd/honeycomb/v3po/data/VppDataTree.java | 44 ---------------------- .../honeycomb/v3po/data/VppDataTreeSnapshot.java | 34 ----------------- 7 files changed, 118 insertions(+), 118 deletions(-) create mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/DataTreeSnapshot.java create mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ModifiableDataTree.java create mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableDataTree.java delete mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableVppDataTree.java delete mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTree.java delete mode 100644 v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTreeSnapshot.java (limited to 'v3po/data-api') diff --git a/v3po/data-api/pom.xml b/v3po/data-api/pom.xml index 88be38d9f..60073734d 100644 --- a/v3po/data-api/pom.xml +++ b/v3po/data-api/pom.xml @@ -32,7 +32,7 @@ org.opendaylight.controller sal-common-api - 1.3.0-Beryllium + 1.3.0-Beryllium diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/DataTreeSnapshot.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/DataTreeSnapshot.java new file mode 100644 index 000000000..cae459299 --- /dev/null +++ b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/DataTreeSnapshot.java @@ -0,0 +1,34 @@ +/* + * 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.honeycomb.v3po.data; + +import com.google.common.annotations.Beta; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; + +/** + * Read-only snapshot of a {@link ReadableDataTree}. + */ +@Beta +public interface DataTreeSnapshot extends ReadableDataTree { + + /** + * Creates a new data tree modification. + * + * @return A new data tree modification + */ + DataTreeModification newModification(); +} diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ModifiableDataTree.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ModifiableDataTree.java new file mode 100644 index 000000000..8b21ddf24 --- /dev/null +++ b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ModifiableDataTree.java @@ -0,0 +1,44 @@ +/* + * 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.honeycomb.v3po.data; + +import com.google.common.annotations.Beta; +import io.fd.honeycomb.v3po.translate.TranslationException; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; +import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; + +/** + * Facade over data tree that allows tree modification. + */ +@Beta +public interface ModifiableDataTree { + /** + * Alters data tree using supplied modification. + * + * @param modification data tree modification + * @throws DataValidationFailedException if modification data is not valid + * @throws TranslationException if failed while updating data tree state + */ + void modify(final DataTreeModification modification) throws DataValidationFailedException, TranslationException; + + /** + * Creates read-only snapshot of a ModifiableDataTree. + * + * @return Data tree snapshot. + */ + DataTreeSnapshot takeSnapshot(); +} diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableDataTree.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableDataTree.java new file mode 100644 index 000000000..1cb8f806d --- /dev/null +++ b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableDataTree.java @@ -0,0 +1,39 @@ +/* + * 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.honeycomb.v3po.data; + +import com.google.common.annotations.Beta; +import com.google.common.base.Optional; +import com.google.common.util.concurrent.CheckedFuture; +import javax.annotation.Nonnull; +import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; +import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; + +/** + * Facade over data tree that allows reading tree nodes. + */ +@Beta +public interface ReadableDataTree { + /** + * Reads a particular node from the data tree. + * + * @param path Path of the node + * @return a CheckFuture containing the result of the read. + */ + CheckedFuture>, ReadFailedException> read(@Nonnull final YangInstanceIdentifier path); +} diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableVppDataTree.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableVppDataTree.java deleted file mode 100644 index 22a52aa41..000000000 --- a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/ReadableVppDataTree.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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.honeycomb.v3po.data; - -import com.google.common.annotations.Beta; -import com.google.common.base.Optional; -import com.google.common.util.concurrent.CheckedFuture; -import javax.annotation.Nonnull; -import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException; -import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; -import org.opendaylight.yangtools.yang.data.api.schema.NormalizedNode; - -/** - * Facade over VPP data tree that allows reading tree nodes. - */ -@Beta -public interface ReadableVppDataTree { - /** - * Reads a particular node from the VPP data tree. - * - * @param path Path of the node - * @return a CheckFuture containing the result of the read. - */ - CheckedFuture>, ReadFailedException> read(@Nonnull final YangInstanceIdentifier path); -} diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTree.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTree.java deleted file mode 100644 index dffd22d3a..000000000 --- a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTree.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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.honeycomb.v3po.data; - -import com.google.common.annotations.Beta; -import io.fd.honeycomb.v3po.translate.TranslationException; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataValidationFailedException; - -/** - * Facade over VPP data tree that allows tree modification. - */ -@Beta -public interface VppDataTree { - /** - * Commits modification to VPP data tree. - * - * @param modification VPP data tree modification - * @throws DataValidationFailedException if modification data is not valid - * @throws TranslationException if commit failed while updating VPP state - */ - void commit(final DataTreeModification modification) throws DataValidationFailedException, TranslationException; - - /** - * Creates read-only snapshot of a VppDataTree. - * - * @return Data tree snapshot. - */ - VppDataTreeSnapshot takeSnapshot(); -} diff --git a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTreeSnapshot.java b/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTreeSnapshot.java deleted file mode 100644 index 665a2e0ae..000000000 --- a/v3po/data-api/src/main/java/io/fd/honeycomb/v3po/data/VppDataTreeSnapshot.java +++ /dev/null @@ -1,34 +0,0 @@ -/* - * 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.honeycomb.v3po.data; - -import com.google.common.annotations.Beta; -import org.opendaylight.yangtools.yang.data.api.schema.tree.DataTreeModification; - -/** - * Read-only snapshot of a {@link ReadableVppDataTree}. - */ -@Beta -public interface VppDataTreeSnapshot extends ReadableVppDataTree { - - /** - * Creates a new VPP data tree modification. - * - * @return A new data tree modification - */ - DataTreeModification newModification(); -} -- cgit 1.2.3-korg