From 25c01b5d31053e1a8520c54e24e94f0493619a8e Mon Sep 17 00:00:00 2001 From: Michal Cmarada Date: Fri, 4 Jan 2019 08:59:46 +0100 Subject: Revert Statistics This reverts commit 91db56913c9b1fc9292637adf4d96a052a737f61. This reverts commit cdc4d09c152e985c93016ff61789bc699b97883d. Change-Id: I06cba1968f7379a7daa98b9e66375a5d4127b499 Signed-off-by: Michal Cmarada --- .../cache/InterfaceCacheStatisticsDumpManager.java | 37 ------------ .../InterfaceCacheStatisticsDumpManagerImpl.java | 65 ---------------------- ...nterfaceCacheStatisticsDumpManagerProvider.java | 27 --------- .../cache/InterfaceCacheStatisticsSample.java | 48 ---------------- 4 files changed, 177 deletions(-) delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManager.java delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerImpl.java delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerProvider.java delete mode 100644 v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsSample.java (limited to 'v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache') diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManager.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManager.java deleted file mode 100644 index 9f4912331..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManager.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * 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.interfacesstate.cache; - -import io.fd.vpp.jvpp.core.dto.VnetPerInterfaceCombinedCounters; -import java.time.LocalDateTime; -import javax.annotation.Nullable; - -public interface InterfaceCacheStatisticsDumpManager { - @Nullable - InterfaceCacheStatisticsSample getStatisticsData(int ifcSwIndex); - - void setStatisticsData(VnetPerInterfaceCombinedCounters data, LocalDateTime captureTime, int ifcSwIndex); - - @Nullable - int[] getEnabledInterfaces(); - - void disableInterface(int ifcSwIndex); - - void disableAll(); - - void enableInterface(int index); -} diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerImpl.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerImpl.java deleted file mode 100644 index d3d62e35c..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerImpl.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * 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.interfacesstate.cache; - -import io.fd.vpp.jvpp.core.dto.VnetPerInterfaceCombinedCounters; -import java.time.LocalDateTime; -import java.util.HashMap; -import javax.annotation.Nullable; - -public class InterfaceCacheStatisticsDumpManagerImpl implements InterfaceCacheStatisticsDumpManager { - - private final HashMap statistics; - - public InterfaceCacheStatisticsDumpManagerImpl() { - statistics = new HashMap<>(); - } - - @Nullable - @Override - public InterfaceCacheStatisticsSample getStatisticsData(final int ifcSwIndex) { - return statistics.getOrDefault(ifcSwIndex, null); - } - - @Override - public void setStatisticsData(final VnetPerInterfaceCombinedCounters data, LocalDateTime captureTime, - final int ifcSwIndex) { - statistics.put(ifcSwIndex, new InterfaceCacheStatisticsSample(data, captureTime)); - } - - @Nullable - @Override - public int[] getEnabledInterfaces() { - return statistics.keySet().stream().mapToInt(i -> i).toArray(); - } - - @Override - public void disableInterface(final int ifcSwIndex) { - statistics.remove(ifcSwIndex); - } - - @Override - public void disableAll() { - statistics.clear(); - } - - @Override - public void enableInterface(final int index) { - statistics.put(index, - new InterfaceCacheStatisticsSample(new VnetPerInterfaceCombinedCounters(), LocalDateTime.now())); - } -} diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerProvider.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerProvider.java deleted file mode 100644 index 70c40aa4c..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsDumpManagerProvider.java +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * 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.interfacesstate.cache; - -import com.google.inject.Provider; - -public class InterfaceCacheStatisticsDumpManagerProvider implements Provider { - - @Override - public InterfaceCacheStatisticsDumpManager get() { - return new InterfaceCacheStatisticsDumpManagerImpl(); - } -} diff --git a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsSample.java b/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsSample.java deleted file mode 100644 index 86417d99e..000000000 --- a/v3po/v3po2vpp/src/main/java/io/fd/hc2vpp/v3po/interfacesstate/cache/InterfaceCacheStatisticsSample.java +++ /dev/null @@ -1,48 +0,0 @@ -/* - * Copyright (c) 2019 PANTHEON.tech. - * - * 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.interfacesstate.cache; - -import io.fd.vpp.jvpp.core.dto.VnetPerInterfaceCombinedCounters; -import java.time.LocalDateTime; -import java.time.format.DateTimeFormatter; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.DateAndTime; - -public class InterfaceCacheStatisticsSample { - private final VnetPerInterfaceCombinedCounters data; - private final DateAndTime captureTime; - private static final String DATE_AND_TIME_PATTERN = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'"; - - public InterfaceCacheStatisticsSample(final VnetPerInterfaceCombinedCounters data, - final LocalDateTime currentTime) { - this(data, DateAndTime - .getDefaultInstance(currentTime.format(DateTimeFormatter.ofPattern(DATE_AND_TIME_PATTERN)))); - } - - public InterfaceCacheStatisticsSample(final VnetPerInterfaceCombinedCounters data, - final DateAndTime currentTime) { - this.data = data; - this.captureTime = currentTime; - } - - public VnetPerInterfaceCombinedCounters getData() { - return data; - } - - public DateAndTime getCaptureTime() { - return captureTime; - } -} -- cgit 1.2.3-korg