From 5420b338d60f93bfe7455221942f285e76b23972 Mon Sep 17 00:00:00 2001 From: ruilin cai Date: Mon, 20 Mar 2023 14:24:26 -0400 Subject: Add interfaces in actn-client and modified pom files Change-Id: Ia9e905cde40e3d70777c98285f1f703b51f1decf Signed-off-by: ruilin cai Issue-ID: INT-2213 --- actn-interface-tools/actn-client/pom.xml | 58 ++++++++++++++++++++++ .../actnclient/api/ActnDataConverter.java | 42 ++++++++++++++++ .../actnclient/api/ActnInterface.java | 33 ++++++++++++ .../actnclient/api/CustomerEthService.java | 23 +++++++++ .../actnclient/api/CustomerOtnTopology.java | 23 +++++++++ .../actnclient/api/CustomerOtnTunnel.java | 23 +++++++++ .../actnclient/api/CustomerTopology.java | 23 +++++++++ actn-interface-tools/actn-model/pom.xml | 10 ++-- 8 files changed, 230 insertions(+), 5 deletions(-) create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnDataConverter.java create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnInterface.java create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerEthService.java create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTopology.java create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTunnel.java create mode 100644 actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerTopology.java diff --git a/actn-interface-tools/actn-client/pom.xml b/actn-interface-tools/actn-client/pom.xml index a2d0782..9450159 100644 --- a/actn-interface-tools/actn-client/pom.xml +++ b/actn-interface-tools/actn-client/pom.xml @@ -36,6 +36,8 @@ 11 11 2.6.1 + 2.11.0 + 22.0 @@ -43,6 +45,62 @@ actn-model 1.0-SNAPSHOT + + commons-io + commons-io + 2.11.0 + + + com.google.guava + guava + ${guava.version} + + + junit + junit + 4.12 + test + + + + com.fasterxml.jackson.core + jackson-databind + ${jackson.version} + + + + + com.fasterxml.jackson.core + jackson-core + ${jackson.version} + + + + com.fasterxml.jackson.core + jackson-annotations + ${jackson.version} + + + + com.squareup.retrofit2 + retrofit + 2.7.2 + + + com.squareup.retrofit2 + converter-jackson + 2.3.0 + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + javax.annotation + javax.annotation-api + 1.3.2 + \ No newline at end of file diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnDataConverter.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnDataConverter.java new file mode 100644 index 0000000..e6eb42d --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnDataConverter.java @@ -0,0 +1,42 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + + +import org.onosproject.yang.gen.v11.ietfethtranservice.rev20210111.ietfethtranservice.DefaultEthtSvc; +import org.onosproject.yang.gen.v11.ietfnetwork.rev20180226.ietfnetwork.networks.Network; +import org.onosproject.yang.gen.v11.ietfte.rev20210220.ietfte.tunnelsgrouping.tunnels.DefaultTunnel; +public abstract class ActnDataConverter { + CustomerOtnTopology convertActnOtnTopology(Network actnOtnTopology) throws Exception { + throw new Exception("unsupported method"); + } + CustomerOtnTunnel convertActnOtnTunnel(DefaultTunnel actnOtnTunnel) throws Exception { + throw new Exception("unsupported method"); + } + DefaultTunnel convertActnOtnTunnel(CustomerOtnTunnel customerOtnTunnel) throws Exception { + throw new Exception("unsupported method"); + } + CustomerEthService convertActnEthService(DefaultEthtSvc actnEthService) throws Exception { + throw new Exception("unsupported method"); + } + DefaultEthtSvc convertActnEthService(CustomerEthService customerEthService) throws Exception { + throw new Exception("unsupported method"); + } +} diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnInterface.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnInterface.java new file mode 100644 index 0000000..5325807 --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/ActnInterface.java @@ -0,0 +1,33 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + +public interface ActnInterface { + CustomerTopology getNetworkTopology(String topologyId); + + void createOtnTunnel(CustomerOtnTunnel customerOtnTunnel); + + CustomerOtnTunnel getOtnTunnel(String actnOtnTunnelId); + + void createEthService(CustomerEthService customerEthService); + + CustomerEthService getEthService(String actnEthServiceId); +} + diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerEthService.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerEthService.java new file mode 100644 index 0000000..9c4aede --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerEthService.java @@ -0,0 +1,23 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + +public abstract class CustomerEthService { +} diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTopology.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTopology.java new file mode 100644 index 0000000..d57c0f7 --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTopology.java @@ -0,0 +1,23 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + +public abstract class CustomerOtnTopology extends CustomerTopology{ +} diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTunnel.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTunnel.java new file mode 100644 index 0000000..4390c57 --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerOtnTunnel.java @@ -0,0 +1,23 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + +public abstract class CustomerOtnTunnel { +} diff --git a/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerTopology.java b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerTopology.java new file mode 100644 index 0000000..a9cd142 --- /dev/null +++ b/actn-interface-tools/actn-client/src/main/java/org/onap/integration/actninterfacetools/actnclient/api/CustomerTopology.java @@ -0,0 +1,23 @@ +/* + * ============LICENSE_START======================================================= + * Actn Interface Tools + * ================================================================================ + * Copyright (C) 2023 Huawei Canada Limited. + * ================================================================================ + * 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. + * ============LICENSE_END========================================================= + */ +package org.onap.integration.actninterfacetools.actnclient.api; + +public abstract class CustomerTopology { +} diff --git a/actn-interface-tools/actn-model/pom.xml b/actn-interface-tools/actn-model/pom.xml index 4ec713a..a4a53b5 100644 --- a/actn-interface-tools/actn-model/pom.xml +++ b/actn-interface-tools/actn-model/pom.xml @@ -39,11 +39,11 @@ 2.6.1 - - org.onosproject - onos-apps-yang - 1.11.0-SNAPSHOT - + + + + + org.onosproject -- cgit 1.2.3-korg