From 9b778fbf7d3fb12cd8da87cc732298ade05e17ab Mon Sep 17 00:00:00 2001 From: pfamelis Date: Fri, 8 Dec 2023 16:18:21 +0200 Subject: [PATCH 1/3] refactor: moved eu.teraflow to org.etsi.tfs for ztp component --- src/ztp/pom.xml | 2 +- .../etsi/tfs}/ztp/ContextSubscriber.java | 8 +- .../etsi/tfs}/ztp/Serializer.java | 70 +- .../etsi/tfs}/ztp/SimpleLivenessCheck.java | 2 +- .../etsi/tfs}/ztp/SimpleReadinessCheck.java | 2 +- .../etsi/tfs}/ztp/ZtpConfiguration.java | 2 +- .../etsi/tfs}/ztp/ZtpGateway.java | 2 +- .../etsi/tfs}/ztp/ZtpGatewayImpl.java | 8 +- .../etsi/tfs}/ztp/ZtpService.java | 6 +- .../etsi/tfs}/ztp/ZtpServiceImpl.java | 10 +- .../etsi/tfs}/ztp/acl/AclAction.java | 2 +- .../etsi/tfs}/ztp/acl/AclEntry.java | 2 +- .../tfs}/ztp/acl/AclForwardActionEnum.java | 2 +- .../etsi/tfs}/ztp/acl/AclLogActionEnum.java | 2 +- .../etsi/tfs}/ztp/acl/AclMatch.java | 2 +- .../etsi/tfs}/ztp/acl/AclRuleSet.java | 4 +- .../etsi/tfs}/ztp/acl/AclRuleTypeEnum.java | 2 +- .../etsi/tfs}/ztp/common/Util.java | 2 +- .../etsi/tfs}/ztp/context/ContextGateway.java | 6 +- .../tfs}/ztp/context/ContextGatewayImpl.java | 8 +- .../etsi/tfs}/ztp/context/ContextService.java | 6 +- .../tfs}/ztp/context/ContextServiceImpl.java | 6 +- .../ztp/context/model/ConfigActionEnum.java | 2 +- .../tfs}/ztp/context/model/ConfigRule.java | 2 +- .../tfs}/ztp/context/model/ConfigRuleAcl.java | 4 +- .../ztp/context/model/ConfigRuleCustom.java | 2 +- .../ztp/context/model/ConfigRuleType.java | 2 +- .../ztp/context/model/ConfigRuleTypeAcl.java | 2 +- .../context/model/ConfigRuleTypeCustom.java | 2 +- .../etsi/tfs}/ztp/context/model/Device.java | 4 +- .../tfs}/ztp/context/model/DeviceConfig.java | 2 +- .../ztp/context/model/DeviceDriverEnum.java | 2 +- .../tfs}/ztp/context/model/DeviceEvent.java | 2 +- .../model/DeviceOperationalStatus.java | 2 +- .../etsi/tfs}/ztp/context/model/Empty.java | 2 +- .../etsi/tfs}/ztp/context/model/EndPoint.java | 6 +- .../tfs}/ztp/context/model/EndPointId.java | 2 +- .../etsi/tfs}/ztp/context/model/Event.java | 2 +- .../tfs}/ztp/context/model/EventTypeEnum.java | 2 +- .../tfs}/ztp/context/model/GpsPosition.java | 2 +- .../etsi/tfs}/ztp/context/model/Location.java | 2 +- .../tfs}/ztp/context/model/LocationType.java | 2 +- .../model/LocationTypeGpsPosition.java | 2 +- .../ztp/context/model/LocationTypeRegion.java | 2 +- .../tfs}/ztp/context/model/TopologyId.java | 2 +- .../etsi/tfs}/ztp/device/DeviceGateway.java | 8 +- .../tfs}/ztp/device/DeviceGatewayImpl.java | 10 +- .../etsi/tfs}/ztp/device/DeviceService.java | 8 +- .../tfs}/ztp/device/DeviceServiceImpl.java | 8 +- .../kpi_sample_types/model/KpiSampleType.java | 2 +- .../etsi/tfs}/ztp/model/DeviceRole.java | 2 +- .../etsi/tfs}/ztp/model/DeviceRoleConfig.java | 4 +- .../etsi/tfs}/ztp/model/DeviceRoleId.java | 2 +- .../etsi/tfs}/ztp/model/DeviceRoleType.java | 2 +- .../etsi/tfs}/ztp/model/DeviceState.java | 2 +- .../etsi/tfs}/ztp/ConfigRuleTypeTest.java | 28 +- .../etsi/tfs}/ztp/ContextSubscriberTest.java | 10 +- .../etsi/tfs}/ztp/EndPointCreationTest.java | 14 +- .../etsi/tfs}/ztp/LocationTypeTest.java | 8 +- .../etsi/tfs}/ztp/MockZtpConfiguration.java | 2 +- .../etsi/tfs}/ztp/SerializerTest.java | 74 +- .../tfs}/ztp/ZtpFunctionalServiceTest.java | 34 +- .../etsi/tfs}/ztp/ZtpServiceTest.java | 42 +- .../grpc/context/ContextOuterClass.java | 1411 +++++++++++++---- .../grpc/kpi_sample_types/KpiSampleTypes.java | 24 +- .../grpc/monitoring/Monitoring.java | 378 ++++- src/ztp/target/kubernetes/kubernetes.yml | 28 +- 67 files changed, 1648 insertions(+), 663 deletions(-) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ContextSubscriber.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/Serializer.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/SimpleLivenessCheck.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/SimpleReadinessCheck.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpConfiguration.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpGateway.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpGatewayImpl.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpService.java (87%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpServiceImpl.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclAction.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclEntry.java (98%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclForwardActionEnum.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclLogActionEnum.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclMatch.java (98%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclRuleSet.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/acl/AclRuleTypeEnum.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/common/Util.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/ContextGateway.java (86%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/ContextGatewayImpl.java (91%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/ContextService.java (86%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/ContextServiceImpl.java (90%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigActionEnum.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRule.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRuleAcl.java (93%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRuleCustom.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRuleType.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRuleTypeAcl.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/ConfigRuleTypeCustom.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/Device.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/DeviceConfig.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/DeviceDriverEnum.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/DeviceEvent.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/DeviceOperationalStatus.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/Empty.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/EndPoint.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/EndPointId.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/Event.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/EventTypeEnum.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/GpsPosition.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/Location.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/LocationType.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/LocationTypeGpsPosition.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/LocationTypeRegion.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/context/model/TopologyId.java (96%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/device/DeviceGateway.java (82%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/device/DeviceGatewayImpl.java (90%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/device/DeviceService.java (82%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/device/DeviceServiceImpl.java (88%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/kpi_sample_types/model/KpiSampleType.java (94%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/model/DeviceRole.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/model/DeviceRoleConfig.java (93%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/model/DeviceRoleId.java (97%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/model/DeviceRoleType.java (95%) rename src/ztp/src/main/java/{eu/teraflow => org/etsi/tfs}/ztp/model/DeviceState.java (95%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/ConfigRuleTypeTest.java (81%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/ContextSubscriberTest.java (97%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/EndPointCreationTest.java (93%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/LocationTypeTest.java (88%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/MockZtpConfiguration.java (97%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/SerializerTest.java (97%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpFunctionalServiceTest.java (95%) rename src/ztp/src/test/java/{eu/teraflow => org/etsi/tfs}/ztp/ZtpServiceTest.java (93%) diff --git a/src/ztp/pom.xml b/src/ztp/pom.xml index aeadbc572..c62f5d52e 100644 --- a/src/ztp/pom.xml +++ b/src/ztp/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - eu.teraflow + org.etsi.tfs ztp 0.2.0 TeraFlow ZTP Component diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ContextSubscriber.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ContextSubscriber.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/ContextSubscriber.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ContextSubscriber.java index 0d2c63209..9afd60a57 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ContextSubscriber.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ContextSubscriber.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; -import eu.teraflow.ztp.context.ContextService; -import eu.teraflow.ztp.context.model.Event; -import eu.teraflow.ztp.context.model.EventTypeEnum; import io.quarkus.runtime.StartupEvent; import java.time.Duration; import javax.enterprise.context.ApplicationScoped; import javax.enterprise.event.Observes; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.ContextService; +import org.etsi.tfs.ztp.context.model.Event; +import org.etsi.tfs.ztp.context.model.EventTypeEnum; import org.jboss.logging.Logger; @ApplicationScoped diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/Serializer.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/Serializer.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java index 0a1bd670a..cf49280a8 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/Serializer.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import acl.Acl; import context.ContextOuterClass; @@ -25,43 +25,43 @@ import context.ContextOuterClass.DeviceId; import context.ContextOuterClass.DeviceOperationalStatusEnum; import context.ContextOuterClass.Location.LocationCase; import context.ContextOuterClass.Uuid; -import eu.teraflow.ztp.acl.AclAction; -import eu.teraflow.ztp.acl.AclEntry; -import eu.teraflow.ztp.acl.AclForwardActionEnum; -import eu.teraflow.ztp.acl.AclLogActionEnum; -import eu.teraflow.ztp.acl.AclMatch; -import eu.teraflow.ztp.acl.AclRuleSet; -import eu.teraflow.ztp.acl.AclRuleTypeEnum; -import eu.teraflow.ztp.context.model.ConfigActionEnum; -import eu.teraflow.ztp.context.model.ConfigRule; -import eu.teraflow.ztp.context.model.ConfigRuleAcl; -import eu.teraflow.ztp.context.model.ConfigRuleCustom; -import eu.teraflow.ztp.context.model.ConfigRuleTypeAcl; -import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.DeviceDriverEnum; -import eu.teraflow.ztp.context.model.DeviceEvent; -import eu.teraflow.ztp.context.model.DeviceOperationalStatus; -import eu.teraflow.ztp.context.model.Empty; -import eu.teraflow.ztp.context.model.EndPoint; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.Event; -import eu.teraflow.ztp.context.model.EventTypeEnum; -import eu.teraflow.ztp.context.model.GpsPosition; -import eu.teraflow.ztp.context.model.Location; -import eu.teraflow.ztp.context.model.LocationTypeGpsPosition; -import eu.teraflow.ztp.context.model.LocationTypeRegion; -import eu.teraflow.ztp.context.model.TopologyId; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.ztp.model.DeviceRole; -import eu.teraflow.ztp.model.DeviceRoleConfig; -import eu.teraflow.ztp.model.DeviceRoleId; -import eu.teraflow.ztp.model.DeviceRoleType; -import eu.teraflow.ztp.model.DeviceState; import java.util.stream.Collectors; import javax.inject.Singleton; import kpi_sample_types.KpiSampleTypes; +import org.etsi.tfs.ztp.acl.AclAction; +import org.etsi.tfs.ztp.acl.AclEntry; +import org.etsi.tfs.ztp.acl.AclForwardActionEnum; +import org.etsi.tfs.ztp.acl.AclLogActionEnum; +import org.etsi.tfs.ztp.acl.AclMatch; +import org.etsi.tfs.ztp.acl.AclRuleSet; +import org.etsi.tfs.ztp.acl.AclRuleTypeEnum; +import org.etsi.tfs.ztp.context.model.ConfigActionEnum; +import org.etsi.tfs.ztp.context.model.ConfigRule; +import org.etsi.tfs.ztp.context.model.ConfigRuleAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleCustom; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.DeviceDriverEnum; +import org.etsi.tfs.ztp.context.model.DeviceEvent; +import org.etsi.tfs.ztp.context.model.DeviceOperationalStatus; +import org.etsi.tfs.ztp.context.model.Empty; +import org.etsi.tfs.ztp.context.model.EndPoint; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.Event; +import org.etsi.tfs.ztp.context.model.EventTypeEnum; +import org.etsi.tfs.ztp.context.model.GpsPosition; +import org.etsi.tfs.ztp.context.model.Location; +import org.etsi.tfs.ztp.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; +import org.etsi.tfs.ztp.context.model.TopologyId; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.ztp.model.DeviceRole; +import org.etsi.tfs.ztp.model.DeviceRoleConfig; +import org.etsi.tfs.ztp.model.DeviceRoleId; +import org.etsi.tfs.ztp.model.DeviceRoleType; +import org.etsi.tfs.ztp.model.DeviceState; import ztp.Ztp; import ztp.Ztp.ZtpDeviceState; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/SimpleLivenessCheck.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleLivenessCheck.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/SimpleLivenessCheck.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleLivenessCheck.java index b5d40e903..70188bc47 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/SimpleLivenessCheck.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleLivenessCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/SimpleReadinessCheck.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleReadinessCheck.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/SimpleReadinessCheck.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleReadinessCheck.java index d98b3370d..3e4b996ba 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/SimpleReadinessCheck.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/SimpleReadinessCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpConfiguration.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpConfiguration.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/ZtpConfiguration.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpConfiguration.java index 4e0ab96fa..3fafac995 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpConfiguration.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import io.smallrye.config.ConfigMapping; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpGateway.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGateway.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/ZtpGateway.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGateway.java index 69b3f5550..6fcda5ca6 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpGateway.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGateway.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import ztp.ZtpService; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpGatewayImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGatewayImpl.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/ZtpGatewayImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGatewayImpl.java index bc5604817..a07b933bc 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpGatewayImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpGatewayImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import context.ContextOuterClass; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.model.DeviceRoleId; -import eu.teraflow.ztp.model.DeviceState; import io.quarkus.grpc.GrpcService; import io.smallrye.mutiny.Uni; import javax.inject.Inject; import org.eclipse.microprofile.metrics.MetricUnits; import org.eclipse.microprofile.metrics.annotation.Counted; import org.eclipse.microprofile.metrics.annotation.Timed; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.model.DeviceRoleId; +import org.etsi.tfs.ztp.model.DeviceState; import ztp.Ztp; import ztp.Ztp.DeviceRoleConfig; import ztp.Ztp.DeviceRoleState; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpService.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpService.java similarity index 87% rename from src/ztp/src/main/java/eu/teraflow/ztp/ZtpService.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpService.java index a86aec75e..4d842f977 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpService.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpService.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; public interface ZtpService { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpServiceImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpServiceImpl.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/ZtpServiceImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpServiceImpl.java index f4bbfc3f7..28109871f 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/ZtpServiceImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/ZtpServiceImpl.java @@ -14,15 +14,15 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; -import eu.teraflow.ztp.context.ContextService; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.device.DeviceService; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.ContextService; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.device.DeviceService; import org.jboss.logging.Logger; @ApplicationScoped diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclAction.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclAction.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclAction.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclAction.java index 4f2b3c717..6364f53fc 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclAction.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public class AclAction { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclEntry.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclEntry.java similarity index 98% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclEntry.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclEntry.java index 78ff008c8..97da7127a 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclEntry.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public class AclEntry { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclForwardActionEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclForwardActionEnum.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclForwardActionEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclForwardActionEnum.java index 86afe71de..a1fe20a0c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclForwardActionEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclForwardActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public enum AclForwardActionEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclLogActionEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclLogActionEnum.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclLogActionEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclLogActionEnum.java index 0c7223532..340267ec1 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclLogActionEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclLogActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public enum AclLogActionEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclMatch.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclMatch.java similarity index 98% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclMatch.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclMatch.java index 513bcaece..156ff74a1 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclMatch.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclMatch.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public class AclMatch { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleSet.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleSet.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleSet.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleSet.java index 2c5efbd38..4e9c706ad 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleSet.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleSet.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; -import eu.teraflow.ztp.common.Util; import java.util.List; +import org.etsi.tfs.ztp.common.Util; public class AclRuleSet { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleTypeEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleTypeEnum.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleTypeEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleTypeEnum.java index 5abf7ab9a..1c5256a2c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/acl/AclRuleTypeEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/acl/AclRuleTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.acl; +package org.etsi.tfs.ztp.acl; public enum AclRuleTypeEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/common/Util.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/common/Util.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/common/Util.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/common/Util.java index f5135113c..7586759a9 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/common/Util.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/common/Util.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.common; +package org.etsi.tfs.ztp.common; import java.util.List; import java.util.stream.Collectors; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGateway.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGateway.java similarity index 86% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGateway.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGateway.java index 0d835ee73..c51c6999e 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGateway.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGateway.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.ztp.context; +package org.etsi.tfs.ztp.context; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceEvent; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceEvent; public interface ContextGateway { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGatewayImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGatewayImpl.java similarity index 91% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGatewayImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGatewayImpl.java index 286242fe1..405da63be 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextGatewayImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextGatewayImpl.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package eu.teraflow.ztp.context; +package org.etsi.tfs.ztp.context; import context.ContextOuterClass; import context.MutinyContextServiceGrpc.MutinyContextServiceStub; -import eu.teraflow.ztp.Serializer; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceEvent; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.ztp.Serializer; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceEvent; @ApplicationScoped public class ContextGatewayImpl implements ContextGateway { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextService.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextService.java similarity index 86% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/ContextService.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextService.java index d9942c160..754de60c6 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextService.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.ztp.context; +package org.etsi.tfs.ztp.context; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceEvent; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceEvent; public interface ContextService { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextServiceImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextServiceImpl.java similarity index 90% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/ContextServiceImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextServiceImpl.java index 7a2bca7c3..cd0b09b38 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/ContextServiceImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/ContextServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.ztp.context; +package org.etsi.tfs.ztp.context; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceEvent; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceEvent; @ApplicationScoped public class ContextServiceImpl implements ContextService { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigActionEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigActionEnum.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigActionEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigActionEnum.java index f85dc5a89..a91b212cf 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigActionEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public enum ConfigActionEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRule.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRule.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRule.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRule.java index a375101c1..6f78bf101 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRule.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class ConfigRule { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleAcl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleAcl.java similarity index 93% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleAcl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleAcl.java index 1a8942cf9..8503904cb 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleAcl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleAcl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; -import eu.teraflow.ztp.acl.AclRuleSet; +import org.etsi.tfs.ztp.acl.AclRuleSet; public class ConfigRuleAcl { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleCustom.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleCustom.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleCustom.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleCustom.java index 2cf6dd69f..48cc64ed0 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleCustom.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class ConfigRuleCustom { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleType.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleType.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleType.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleType.java index 2e11fc6b1..fb040718c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleType.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public interface ConfigRuleType { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeAcl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeAcl.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeAcl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeAcl.java index 5405faa73..c10b35568 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeAcl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeAcl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class ConfigRuleTypeAcl implements ConfigRuleType { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeCustom.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeCustom.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeCustom.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeCustom.java index 5cc4a17fb..55cac7bfb 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/ConfigRuleTypeCustom.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/ConfigRuleTypeCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class ConfigRuleTypeCustom implements ConfigRuleType { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Device.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Device.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/Device.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Device.java index 3bb1e7a3a..494a06fe5 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Device.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Device.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; -import eu.teraflow.ztp.common.Util; import java.util.List; +import org.etsi.tfs.ztp.common.Util; public class Device { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceConfig.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceConfig.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceConfig.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceConfig.java index 077524842..e70a7ec75 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceConfig.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; import java.util.List; import java.util.stream.Collectors; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceDriverEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceDriverEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java index fe623175a..7c87b0638 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceDriverEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public enum DeviceDriverEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceEvent.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceEvent.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceEvent.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceEvent.java index 8ab56ec7c..71b0d77af 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceEvent.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceEvent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; import java.util.Optional; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceOperationalStatus.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceOperationalStatus.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceOperationalStatus.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceOperationalStatus.java index b171d31e1..373f928ca 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/DeviceOperationalStatus.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceOperationalStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public enum DeviceOperationalStatus { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Empty.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Empty.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/Empty.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Empty.java index adeaaaafc..912788b5d 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Empty.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Empty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class Empty { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPoint.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPoint.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPoint.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPoint.java index 51378048e..634793a4f 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPoint.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPoint.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; -import eu.teraflow.ztp.common.Util; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; import java.util.List; +import org.etsi.tfs.ztp.common.Util; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; public class EndPoint { private final EndPointId endPointId; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPointId.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPointId.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPointId.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPointId.java index ddda2eb43..059ebf3eb 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EndPointId.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EndPointId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class EndPointId { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Event.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Event.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/Event.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Event.java index 045b8482b..552e2c2ec 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Event.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Event.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class Event { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EventTypeEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EventTypeEnum.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/EventTypeEnum.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EventTypeEnum.java index b732a26cd..97f669136 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/EventTypeEnum.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/EventTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public enum EventTypeEnum { UNDEFINED, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/GpsPosition.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/GpsPosition.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/GpsPosition.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/GpsPosition.java index c0dc6e3e7..67c6b58c1 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/GpsPosition.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/GpsPosition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class GpsPosition { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Location.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Location.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/Location.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Location.java index fa937d91c..da514f711 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/Location.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/Location.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class Location { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationType.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationType.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationType.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationType.java index e4338c42b..a376d428c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationType.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public interface LocationType { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeGpsPosition.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeGpsPosition.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeGpsPosition.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeGpsPosition.java index f4d510e65..e8b8ce5a0 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeGpsPosition.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeGpsPosition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class LocationTypeGpsPosition implements LocationType { private final GpsPosition gpsPosition; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeRegion.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeRegion.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeRegion.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeRegion.java index 8691de642..92916dc9c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/LocationTypeRegion.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/LocationTypeRegion.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class LocationTypeRegion implements LocationType { private final String region; diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/TopologyId.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/TopologyId.java similarity index 96% rename from src/ztp/src/main/java/eu/teraflow/ztp/context/model/TopologyId.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/TopologyId.java index 574c075d5..c2c5720b4 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/context/model/TopologyId.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/TopologyId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.context.model; +package org.etsi.tfs.ztp.context.model; public class TopologyId { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGateway.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGateway.java similarity index 82% rename from src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGateway.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGateway.java index 7302abf48..87bf1b759 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGateway.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGateway.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.ztp.device; +package org.etsi.tfs.ztp.device; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.Empty; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.Empty; public interface DeviceGateway { Uni getInitialConfiguration(String deviceId); diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGatewayImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGatewayImpl.java similarity index 90% rename from src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGatewayImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGatewayImpl.java index aea3368a0..cb8ff578c 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceGatewayImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceGatewayImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package eu.teraflow.ztp.device; +package org.etsi.tfs.ztp.device; import device.DeviceService; -import eu.teraflow.ztp.Serializer; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.Empty; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.ztp.Serializer; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.Empty; @ApplicationScoped public class DeviceGatewayImpl implements DeviceGateway { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceService.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceService.java similarity index 82% rename from src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceService.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceService.java index 1f2e6d9ad..e89f99bcd 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceService.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.ztp.device; +package org.etsi.tfs.ztp.device; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.Empty; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.Empty; public interface DeviceService { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceServiceImpl.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceServiceImpl.java similarity index 88% rename from src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceServiceImpl.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceServiceImpl.java index 67446b8c2..1d889ec0a 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/device/DeviceServiceImpl.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/device/DeviceServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.ztp.device; +package org.etsi.tfs.ztp.device; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.Empty; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.Empty; @ApplicationScoped public class DeviceServiceImpl implements DeviceService { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/kpi_sample_types/model/KpiSampleType.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/kpi_sample_types/model/KpiSampleType.java similarity index 94% rename from src/ztp/src/main/java/eu/teraflow/ztp/kpi_sample_types/model/KpiSampleType.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/kpi_sample_types/model/KpiSampleType.java index 6db242d9d..53973637f 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/kpi_sample_types/model/KpiSampleType.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/kpi_sample_types/model/KpiSampleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.kpi_sample_types.model; +package org.etsi.tfs.ztp.kpi_sample_types.model; public enum KpiSampleType { UNKNOWN, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRole.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRole.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRole.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRole.java index 061d500be..50d44d27d 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRole.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRole.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.model; +package org.etsi.tfs.ztp.model; public class DeviceRole { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleConfig.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleConfig.java similarity index 93% rename from src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleConfig.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleConfig.java index badcf0588..8594c6fbc 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleConfig.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleConfig.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package eu.teraflow.ztp.model; +package org.etsi.tfs.ztp.model; -import eu.teraflow.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.DeviceConfig; public class DeviceRoleConfig { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleId.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleId.java similarity index 97% rename from src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleId.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleId.java index dd482fb05..ac51beb55 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleId.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.model; +package org.etsi.tfs.ztp.model; public class DeviceRoleId { diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleType.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleType.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleType.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleType.java index 7db0cab71..8ca7e2f5f 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceRoleType.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceRoleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.model; +package org.etsi.tfs.ztp.model; public enum DeviceRoleType { NONE, diff --git a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceState.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceState.java similarity index 95% rename from src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceState.java rename to src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceState.java index ee953862c..2b133f0e3 100644 --- a/src/ztp/src/main/java/eu/teraflow/ztp/model/DeviceState.java +++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/model/DeviceState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp.model; +package org.etsi.tfs.ztp.model; public enum DeviceState { UNDEFINED, diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/ConfigRuleTypeTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/ConfigRuleTypeTest.java similarity index 81% rename from src/ztp/src/test/java/eu/teraflow/ztp/ConfigRuleTypeTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/ConfigRuleTypeTest.java index 435164a35..7bac8d8d9 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/ConfigRuleTypeTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/ConfigRuleTypeTest.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.ztp.acl.AclAction; -import eu.teraflow.ztp.acl.AclEntry; -import eu.teraflow.ztp.acl.AclForwardActionEnum; -import eu.teraflow.ztp.acl.AclLogActionEnum; -import eu.teraflow.ztp.acl.AclMatch; -import eu.teraflow.ztp.acl.AclRuleSet; -import eu.teraflow.ztp.acl.AclRuleTypeEnum; -import eu.teraflow.ztp.context.model.ConfigRuleAcl; -import eu.teraflow.ztp.context.model.ConfigRuleCustom; -import eu.teraflow.ztp.context.model.ConfigRuleTypeAcl; -import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.TopologyId; import io.quarkus.test.junit.QuarkusTest; import java.util.List; +import org.etsi.tfs.ztp.acl.AclAction; +import org.etsi.tfs.ztp.acl.AclEntry; +import org.etsi.tfs.ztp.acl.AclForwardActionEnum; +import org.etsi.tfs.ztp.acl.AclLogActionEnum; +import org.etsi.tfs.ztp.acl.AclMatch; +import org.etsi.tfs.ztp.acl.AclRuleSet; +import org.etsi.tfs.ztp.acl.AclRuleTypeEnum; +import org.etsi.tfs.ztp.context.model.ConfigRuleAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleCustom; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.TopologyId; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/ContextSubscriberTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/ContextSubscriberTest.java similarity index 97% rename from src/ztp/src/test/java/eu/teraflow/ztp/ContextSubscriberTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/ContextSubscriberTest.java index 9d3d6956c..0265bbfad 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/ContextSubscriberTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/ContextSubscriberTest.java @@ -14,22 +14,22 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import context.ContextOuterClass; -import eu.teraflow.ztp.context.ContextGateway; -import eu.teraflow.ztp.context.model.DeviceEvent; -import eu.teraflow.ztp.context.model.Event; -import eu.teraflow.ztp.context.model.EventTypeEnum; import io.quarkus.runtime.StartupEvent; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Multi; import java.util.UUID; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.ContextGateway; +import org.etsi.tfs.ztp.context.model.DeviceEvent; +import org.etsi.tfs.ztp.context.model.Event; +import org.etsi.tfs.ztp.context.model.EventTypeEnum; import org.junit.jupiter.api.Test; import org.mockito.Mockito; import ztp.Ztp; diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/EndPointCreationTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/EndPointCreationTest.java similarity index 93% rename from src/ztp/src/test/java/eu/teraflow/ztp/EndPointCreationTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/EndPointCreationTest.java index cb935cd4a..e920bfa9b 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/EndPointCreationTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/EndPointCreationTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import eu.teraflow.ztp.context.model.EndPoint; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.Location; -import eu.teraflow.ztp.context.model.LocationTypeRegion; -import eu.teraflow.ztp.context.model.TopologyId; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; import io.quarkus.test.junit.QuarkusTest; import java.util.List; +import org.etsi.tfs.ztp.context.model.EndPoint; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.Location; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; +import org.etsi.tfs.ztp.context.model.TopologyId; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/LocationTypeTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/LocationTypeTest.java similarity index 88% rename from src/ztp/src/test/java/eu/teraflow/ztp/LocationTypeTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/LocationTypeTest.java index 4f038a6ad..53e2711aa 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/LocationTypeTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/LocationTypeTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.ztp.context.model.GpsPosition; -import eu.teraflow.ztp.context.model.LocationTypeGpsPosition; -import eu.teraflow.ztp.context.model.LocationTypeRegion; import io.quarkus.test.junit.QuarkusTest; +import org.etsi.tfs.ztp.context.model.GpsPosition; +import org.etsi.tfs.ztp.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/MockZtpConfiguration.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/MockZtpConfiguration.java similarity index 97% rename from src/ztp/src/test/java/eu/teraflow/ztp/MockZtpConfiguration.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/MockZtpConfiguration.java index aa554cbc3..bce235c7f 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/MockZtpConfiguration.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/MockZtpConfiguration.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import io.smallrye.config.SmallRyeConfig; import javax.enterprise.context.ApplicationScoped; diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/SerializerTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java similarity index 97% rename from src/ztp/src/test/java/eu/teraflow/ztp/SerializerTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java index 8441255f3..5a7887a04 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/SerializerTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -24,46 +24,46 @@ import context.ContextOuterClass; import context.ContextOuterClass.DeviceId; import context.ContextOuterClass.DeviceOperationalStatusEnum; import context.ContextOuterClass.Uuid; -import eu.teraflow.ztp.acl.AclAction; -import eu.teraflow.ztp.acl.AclEntry; -import eu.teraflow.ztp.acl.AclForwardActionEnum; -import eu.teraflow.ztp.acl.AclLogActionEnum; -import eu.teraflow.ztp.acl.AclMatch; -import eu.teraflow.ztp.acl.AclRuleSet; -import eu.teraflow.ztp.acl.AclRuleTypeEnum; -import eu.teraflow.ztp.context.model.ConfigActionEnum; -import eu.teraflow.ztp.context.model.ConfigRule; -import eu.teraflow.ztp.context.model.ConfigRuleAcl; -import eu.teraflow.ztp.context.model.ConfigRuleCustom; -import eu.teraflow.ztp.context.model.ConfigRuleTypeAcl; -import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.DeviceDriverEnum; -import eu.teraflow.ztp.context.model.DeviceEvent; -import eu.teraflow.ztp.context.model.DeviceOperationalStatus; -import eu.teraflow.ztp.context.model.Empty; -import eu.teraflow.ztp.context.model.EndPoint.EndPointBuilder; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.Event; -import eu.teraflow.ztp.context.model.EventTypeEnum; -import eu.teraflow.ztp.context.model.GpsPosition; -import eu.teraflow.ztp.context.model.Location; -import eu.teraflow.ztp.context.model.LocationTypeGpsPosition; -import eu.teraflow.ztp.context.model.LocationTypeRegion; -import eu.teraflow.ztp.context.model.TopologyId; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.ztp.model.DeviceRole; -import eu.teraflow.ztp.model.DeviceRoleConfig; -import eu.teraflow.ztp.model.DeviceRoleId; -import eu.teraflow.ztp.model.DeviceRoleType; -import eu.teraflow.ztp.model.DeviceState; import io.quarkus.test.junit.QuarkusTest; import java.util.List; import java.util.stream.Collectors; import java.util.stream.Stream; import javax.inject.Inject; import kpi_sample_types.KpiSampleTypes; +import org.etsi.tfs.ztp.acl.AclAction; +import org.etsi.tfs.ztp.acl.AclEntry; +import org.etsi.tfs.ztp.acl.AclForwardActionEnum; +import org.etsi.tfs.ztp.acl.AclLogActionEnum; +import org.etsi.tfs.ztp.acl.AclMatch; +import org.etsi.tfs.ztp.acl.AclRuleSet; +import org.etsi.tfs.ztp.acl.AclRuleTypeEnum; +import org.etsi.tfs.ztp.context.model.ConfigActionEnum; +import org.etsi.tfs.ztp.context.model.ConfigRule; +import org.etsi.tfs.ztp.context.model.ConfigRuleAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleCustom; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.DeviceDriverEnum; +import org.etsi.tfs.ztp.context.model.DeviceEvent; +import org.etsi.tfs.ztp.context.model.DeviceOperationalStatus; +import org.etsi.tfs.ztp.context.model.Empty; +import org.etsi.tfs.ztp.context.model.EndPoint.EndPointBuilder; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.Event; +import org.etsi.tfs.ztp.context.model.EventTypeEnum; +import org.etsi.tfs.ztp.context.model.GpsPosition; +import org.etsi.tfs.ztp.context.model.Location; +import org.etsi.tfs.ztp.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; +import org.etsi.tfs.ztp.context.model.TopologyId; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.ztp.model.DeviceRole; +import org.etsi.tfs.ztp.model.DeviceRoleConfig; +import org.etsi.tfs.ztp.model.DeviceRoleId; +import org.etsi.tfs.ztp.model.DeviceRoleType; +import org.etsi.tfs.ztp.model.DeviceState; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -1030,7 +1030,7 @@ class SerializerTest { final var aclRuleSet = new AclRuleSet( "aclRuleName", - eu.teraflow.ztp.acl.AclRuleTypeEnum.IPV4, + org.etsi.tfs.ztp.acl.AclRuleTypeEnum.IPV4, "AclRuleDescription", "userId", List.of(aclEntry)); @@ -1116,7 +1116,7 @@ class SerializerTest { final var aclRuleSet = new AclRuleSet( "aclRuleName", - eu.teraflow.ztp.acl.AclRuleTypeEnum.IPV4, + org.etsi.tfs.ztp.acl.AclRuleTypeEnum.IPV4, "AclRuleDescription", "userId", List.of(aclEntry)); diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/ZtpFunctionalServiceTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpFunctionalServiceTest.java similarity index 95% rename from src/ztp/src/test/java/eu/teraflow/ztp/ZtpFunctionalServiceTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpFunctionalServiceTest.java index 83b9f6f7f..5f1030e7a 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/ZtpFunctionalServiceTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpFunctionalServiceTest.java @@ -14,27 +14,11 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import context.ContextOuterClass; -import eu.teraflow.ztp.context.ContextGateway; -import eu.teraflow.ztp.context.model.ConfigActionEnum; -import eu.teraflow.ztp.context.model.ConfigRule; -import eu.teraflow.ztp.context.model.ConfigRuleCustom; -import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.DeviceDriverEnum; -import eu.teraflow.ztp.context.model.DeviceOperationalStatus; -import eu.teraflow.ztp.context.model.EndPoint.EndPointBuilder; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.Location; -import eu.teraflow.ztp.context.model.LocationTypeRegion; -import eu.teraflow.ztp.context.model.TopologyId; -import eu.teraflow.ztp.device.DeviceGateway; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; import io.smallrye.mutiny.Uni; @@ -43,6 +27,22 @@ import java.util.List; import java.util.UUID; import javax.inject.Inject; import org.assertj.core.api.Assertions; +import org.etsi.tfs.ztp.context.ContextGateway; +import org.etsi.tfs.ztp.context.model.ConfigActionEnum; +import org.etsi.tfs.ztp.context.model.ConfigRule; +import org.etsi.tfs.ztp.context.model.ConfigRuleCustom; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.DeviceDriverEnum; +import org.etsi.tfs.ztp.context.model.DeviceOperationalStatus; +import org.etsi.tfs.ztp.context.model.EndPoint.EndPointBuilder; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.Location; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; +import org.etsi.tfs.ztp.context.model.TopologyId; +import org.etsi.tfs.ztp.device.DeviceGateway; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/ztp/src/test/java/eu/teraflow/ztp/ZtpServiceTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpServiceTest.java similarity index 93% rename from src/ztp/src/test/java/eu/teraflow/ztp/ZtpServiceTest.java rename to src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpServiceTest.java index f4c38f1fc..32b8ff850 100644 --- a/src/ztp/src/test/java/eu/teraflow/ztp/ZtpServiceTest.java +++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/ZtpServiceTest.java @@ -14,31 +14,11 @@ * limitations under the License. */ -package eu.teraflow.ztp; +package org.etsi.tfs.ztp; import static org.assertj.core.api.Assertions.assertThat; import context.ContextOuterClass; -import eu.teraflow.ztp.context.ContextGateway; -import eu.teraflow.ztp.context.model.ConfigActionEnum; -import eu.teraflow.ztp.context.model.ConfigRule; -import eu.teraflow.ztp.context.model.ConfigRuleCustom; -import eu.teraflow.ztp.context.model.ConfigRuleTypeCustom; -import eu.teraflow.ztp.context.model.Device; -import eu.teraflow.ztp.context.model.DeviceConfig; -import eu.teraflow.ztp.context.model.DeviceDriverEnum; -import eu.teraflow.ztp.context.model.DeviceOperationalStatus; -import eu.teraflow.ztp.context.model.EndPoint.EndPointBuilder; -import eu.teraflow.ztp.context.model.EndPointId; -import eu.teraflow.ztp.context.model.Location; -import eu.teraflow.ztp.context.model.LocationTypeRegion; -import eu.teraflow.ztp.context.model.TopologyId; -import eu.teraflow.ztp.device.DeviceGateway; -import eu.teraflow.ztp.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.ztp.model.DeviceRole; -import eu.teraflow.ztp.model.DeviceRoleConfig; -import eu.teraflow.ztp.model.DeviceRoleId; -import eu.teraflow.ztp.model.DeviceRoleType; import io.quarkus.grpc.GrpcClient; import io.quarkus.test.junit.QuarkusTest; import io.quarkus.test.junit.mockito.InjectMock; @@ -49,6 +29,26 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.inject.Inject; +import org.etsi.tfs.ztp.context.ContextGateway; +import org.etsi.tfs.ztp.context.model.ConfigActionEnum; +import org.etsi.tfs.ztp.context.model.ConfigRule; +import org.etsi.tfs.ztp.context.model.ConfigRuleCustom; +import org.etsi.tfs.ztp.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.ztp.context.model.Device; +import org.etsi.tfs.ztp.context.model.DeviceConfig; +import org.etsi.tfs.ztp.context.model.DeviceDriverEnum; +import org.etsi.tfs.ztp.context.model.DeviceOperationalStatus; +import org.etsi.tfs.ztp.context.model.EndPoint.EndPointBuilder; +import org.etsi.tfs.ztp.context.model.EndPointId; +import org.etsi.tfs.ztp.context.model.Location; +import org.etsi.tfs.ztp.context.model.LocationTypeRegion; +import org.etsi.tfs.ztp.context.model.TopologyId; +import org.etsi.tfs.ztp.device.DeviceGateway; +import org.etsi.tfs.ztp.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.ztp.model.DeviceRole; +import org.etsi.tfs.ztp.model.DeviceRoleConfig; +import org.etsi.tfs.ztp.model.DeviceRoleId; +import org.etsi.tfs.ztp.model.DeviceRoleType; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java index 85bc0d278..a25798b88 100644 --- a/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java +++ b/src/ztp/target/generated-sources/grpc/context/ContextOuterClass.java @@ -24504,6 +24504,568 @@ public final class ContextOuterClass { } + public interface LinkAttributesOrBuilder extends + // @@protoc_insertion_point(interface_extends:context.LinkAttributes) + com.google.protobuf.MessageOrBuilder { + + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + float getTotalCapacityGbps(); + + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + float getUsedCapacityGbps(); + } + /** + * Protobuf type {@code context.LinkAttributes} + */ + public static final class LinkAttributes extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:context.LinkAttributes) + LinkAttributesOrBuilder { + private static final long serialVersionUID = 0L; + // Use LinkAttributes.newBuilder() to construct. + private LinkAttributes(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private LinkAttributes() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new LinkAttributes(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private LinkAttributes( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 13: { + + totalCapacityGbps_ = input.readFloat(); + break; + } + case 21: { + + usedCapacityGbps_ = input.readFloat(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_fieldAccessorTable + .ensureFieldAccessorsInitialized( + context.ContextOuterClass.LinkAttributes.class, context.ContextOuterClass.LinkAttributes.Builder.class); + } + + public static final int TOTAL_CAPACITY_GBPS_FIELD_NUMBER = 1; + private float totalCapacityGbps_; + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + @java.lang.Override + public float getTotalCapacityGbps() { + return totalCapacityGbps_; + } + + public static final int USED_CAPACITY_GBPS_FIELD_NUMBER = 2; + private float usedCapacityGbps_; + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + @java.lang.Override + public float getUsedCapacityGbps() { + return usedCapacityGbps_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (totalCapacityGbps_ != 0F) { + output.writeFloat(1, totalCapacityGbps_); + } + if (usedCapacityGbps_ != 0F) { + output.writeFloat(2, usedCapacityGbps_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (totalCapacityGbps_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(1, totalCapacityGbps_); + } + if (usedCapacityGbps_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, usedCapacityGbps_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof context.ContextOuterClass.LinkAttributes)) { + return super.equals(obj); + } + context.ContextOuterClass.LinkAttributes other = (context.ContextOuterClass.LinkAttributes) obj; + + if (java.lang.Float.floatToIntBits(getTotalCapacityGbps()) + != java.lang.Float.floatToIntBits( + other.getTotalCapacityGbps())) return false; + if (java.lang.Float.floatToIntBits(getUsedCapacityGbps()) + != java.lang.Float.floatToIntBits( + other.getUsedCapacityGbps())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TOTAL_CAPACITY_GBPS_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getTotalCapacityGbps()); + hash = (37 * hash) + USED_CAPACITY_GBPS_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getUsedCapacityGbps()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(context.ContextOuterClass.LinkAttributes prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code context.LinkAttributes} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:context.LinkAttributes) + context.ContextOuterClass.LinkAttributesOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_fieldAccessorTable + .ensureFieldAccessorsInitialized( + context.ContextOuterClass.LinkAttributes.class, context.ContextOuterClass.LinkAttributes.Builder.class); + } + + // Construct using context.ContextOuterClass.LinkAttributes.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + totalCapacityGbps_ = 0F; + + usedCapacityGbps_ = 0F; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getDefaultInstanceForType() { + return context.ContextOuterClass.LinkAttributes.getDefaultInstance(); + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes build() { + context.ContextOuterClass.LinkAttributes result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes buildPartial() { + context.ContextOuterClass.LinkAttributes result = new context.ContextOuterClass.LinkAttributes(this); + result.totalCapacityGbps_ = totalCapacityGbps_; + result.usedCapacityGbps_ = usedCapacityGbps_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof context.ContextOuterClass.LinkAttributes) { + return mergeFrom((context.ContextOuterClass.LinkAttributes)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(context.ContextOuterClass.LinkAttributes other) { + if (other == context.ContextOuterClass.LinkAttributes.getDefaultInstance()) return this; + if (other.getTotalCapacityGbps() != 0F) { + setTotalCapacityGbps(other.getTotalCapacityGbps()); + } + if (other.getUsedCapacityGbps() != 0F) { + setUsedCapacityGbps(other.getUsedCapacityGbps()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + context.ContextOuterClass.LinkAttributes parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (context.ContextOuterClass.LinkAttributes) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private float totalCapacityGbps_ ; + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + @java.lang.Override + public float getTotalCapacityGbps() { + return totalCapacityGbps_; + } + /** + * float total_capacity_gbps = 1; + * @param value The totalCapacityGbps to set. + * @return This builder for chaining. + */ + public Builder setTotalCapacityGbps(float value) { + + totalCapacityGbps_ = value; + onChanged(); + return this; + } + /** + * float total_capacity_gbps = 1; + * @return This builder for chaining. + */ + public Builder clearTotalCapacityGbps() { + + totalCapacityGbps_ = 0F; + onChanged(); + return this; + } + + private float usedCapacityGbps_ ; + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + @java.lang.Override + public float getUsedCapacityGbps() { + return usedCapacityGbps_; + } + /** + * float used_capacity_gbps = 2; + * @param value The usedCapacityGbps to set. + * @return This builder for chaining. + */ + public Builder setUsedCapacityGbps(float value) { + + usedCapacityGbps_ = value; + onChanged(); + return this; + } + /** + * float used_capacity_gbps = 2; + * @return This builder for chaining. + */ + public Builder clearUsedCapacityGbps() { + + usedCapacityGbps_ = 0F; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:context.LinkAttributes) + } + + // @@protoc_insertion_point(class_scope:context.LinkAttributes) + private static final context.ContextOuterClass.LinkAttributes DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new context.ContextOuterClass.LinkAttributes(); + } + + public static context.ContextOuterClass.LinkAttributes getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public LinkAttributes parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new LinkAttributes(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link) com.google.protobuf.MessageOrBuilder { @@ -24558,6 +25120,21 @@ public final class ContextOuterClass { */ context.ContextOuterClass.EndPointIdOrBuilder getLinkEndpointIdsOrBuilder( int index); + + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + boolean hasAttributes(); + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + context.ContextOuterClass.LinkAttributes getAttributes(); + /** + * .context.LinkAttributes attributes = 4; + */ + context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder(); } /** * Protobuf type {@code context.Link} @@ -24635,6 +25212,19 @@ public final class ContextOuterClass { input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry)); break; } + case 34: { + context.ContextOuterClass.LinkAttributes.Builder subBuilder = null; + if (attributes_ != null) { + subBuilder = attributes_.toBuilder(); + } + attributes_ = input.readMessage(context.ContextOuterClass.LinkAttributes.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(attributes_); + attributes_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -24774,6 +25364,32 @@ public final class ContextOuterClass { return linkEndpointIds_.get(index); } + public static final int ATTRIBUTES_FIELD_NUMBER = 4; + private context.ContextOuterClass.LinkAttributes attributes_; + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + @java.lang.Override + public boolean hasAttributes() { + return attributes_ != null; + } + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getAttributes() { + return attributes_ == null ? context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } + /** + * .context.LinkAttributes attributes = 4; + */ + @java.lang.Override + public context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder() { + return getAttributes(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -24797,6 +25413,9 @@ public final class ContextOuterClass { for (int i = 0; i < linkEndpointIds_.size(); i++) { output.writeMessage(3, linkEndpointIds_.get(i)); } + if (attributes_ != null) { + output.writeMessage(4, getAttributes()); + } unknownFields.writeTo(output); } @@ -24817,6 +25436,10 @@ public final class ContextOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, linkEndpointIds_.get(i)); } + if (attributes_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getAttributes()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -24841,6 +25464,11 @@ public final class ContextOuterClass { .equals(other.getName())) return false; if (!getLinkEndpointIdsList() .equals(other.getLinkEndpointIdsList())) return false; + if (hasAttributes() != other.hasAttributes()) return false; + if (hasAttributes()) { + if (!getAttributes() + .equals(other.getAttributes())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -24862,6 +25490,10 @@ public final class ContextOuterClass { hash = (37 * hash) + LINK_ENDPOINT_IDS_FIELD_NUMBER; hash = (53 * hash) + getLinkEndpointIdsList().hashCode(); } + if (hasAttributes()) { + hash = (37 * hash) + ATTRIBUTES_FIELD_NUMBER; + hash = (53 * hash) + getAttributes().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -25010,6 +25642,12 @@ public final class ContextOuterClass { } else { linkEndpointIdsBuilder_.clear(); } + if (attributesBuilder_ == null) { + attributes_ = null; + } else { + attributes_ = null; + attributesBuilder_ = null; + } return this; } @@ -25052,6 +25690,11 @@ public final class ContextOuterClass { } else { result.linkEndpointIds_ = linkEndpointIdsBuilder_.build(); } + if (attributesBuilder_ == null) { + result.attributes_ = attributes_; + } else { + result.attributes_ = attributesBuilder_.build(); + } onBuilt(); return result; } @@ -25133,6 +25776,9 @@ public final class ContextOuterClass { } } } + if (other.hasAttributes()) { + mergeAttributes(other.getAttributes()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -25597,6 +26243,125 @@ public final class ContextOuterClass { } return linkEndpointIdsBuilder_; } + + private context.ContextOuterClass.LinkAttributes attributes_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder> attributesBuilder_; + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + public boolean hasAttributes() { + return attributesBuilder_ != null || attributes_ != null; + } + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + public context.ContextOuterClass.LinkAttributes getAttributes() { + if (attributesBuilder_ == null) { + return attributes_ == null ? context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } else { + return attributesBuilder_.getMessage(); + } + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder setAttributes(context.ContextOuterClass.LinkAttributes value) { + if (attributesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + attributes_ = value; + onChanged(); + } else { + attributesBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder setAttributes( + context.ContextOuterClass.LinkAttributes.Builder builderForValue) { + if (attributesBuilder_ == null) { + attributes_ = builderForValue.build(); + onChanged(); + } else { + attributesBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder mergeAttributes(context.ContextOuterClass.LinkAttributes value) { + if (attributesBuilder_ == null) { + if (attributes_ != null) { + attributes_ = + context.ContextOuterClass.LinkAttributes.newBuilder(attributes_).mergeFrom(value).buildPartial(); + } else { + attributes_ = value; + } + onChanged(); + } else { + attributesBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder clearAttributes() { + if (attributesBuilder_ == null) { + attributes_ = null; + onChanged(); + } else { + attributes_ = null; + attributesBuilder_ = null; + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public context.ContextOuterClass.LinkAttributes.Builder getAttributesBuilder() { + + onChanged(); + return getAttributesFieldBuilder().getBuilder(); + } + /** + * .context.LinkAttributes attributes = 4; + */ + public context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder() { + if (attributesBuilder_ != null) { + return attributesBuilder_.getMessageOrBuilder(); + } else { + return attributes_ == null ? + context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } + } + /** + * .context.LinkAttributes attributes = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder> + getAttributesFieldBuilder() { + if (attributesBuilder_ == null) { + attributesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder>( + getAttributes(), + getParentForChildren(), + isClean()); + attributes_ = null; + } + return attributesBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -74566,6 +75331,11 @@ public final class ContextOuterClass { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_context_LinkId_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_context_LinkAttributes_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_context_LinkAttributes_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_context_Link_descriptor; private static final @@ -74899,268 +75669,271 @@ public final class ContextOuterClass { "nt\030\001 \001(\0132\016.context.Event\022$\n\tdevice_id\030\002 " + "\001(\0132\021.context.DeviceId\022,\n\rdevice_config\030" + "\003 \001(\0132\025.context.DeviceConfig\"*\n\006LinkId\022 " + - "\n\tlink_uuid\030\001 \001(\0132\r.context.Uuid\"f\n\004Link" + - "\022 \n\007link_id\030\001 \001(\0132\017.context.LinkId\022\014\n\004na" + - "me\030\002 \001(\t\022.\n\021link_endpoint_ids\030\003 \003(\0132\023.co" + - "ntext.EndPointId\"/\n\nLinkIdList\022!\n\010link_i" + - "ds\030\001 \003(\0132\017.context.LinkId\"(\n\010LinkList\022\034\n" + - "\005links\030\001 \003(\0132\r.context.Link\"L\n\tLinkEvent" + - "\022\035\n\005event\030\001 \001(\0132\016.context.Event\022 \n\007link_" + - "id\030\002 \001(\0132\017.context.LinkId\"X\n\tServiceId\022&" + - "\n\ncontext_id\030\001 \001(\0132\022.context.ContextId\022#" + - "\n\014service_uuid\030\002 \001(\0132\r.context.Uuid\"\333\002\n\007" + - "Service\022&\n\nservice_id\030\001 \001(\0132\022.context.Se" + - "rviceId\022\014\n\004name\030\002 \001(\t\022.\n\014service_type\030\003 " + - "\001(\0162\030.context.ServiceTypeEnum\0221\n\024service" + - "_endpoint_ids\030\004 \003(\0132\023.context.EndPointId" + - "\0220\n\023service_constraints\030\005 \003(\0132\023.context." + - "Constraint\022.\n\016service_status\030\006 \001(\0132\026.con" + - "text.ServiceStatus\022.\n\016service_config\030\007 \001" + - "(\0132\026.context.ServiceConfig\022%\n\ttimestamp\030" + - "\010 \001(\0132\022.context.Timestamp\"C\n\rServiceStat" + - "us\0222\n\016service_status\030\001 \001(\0162\032.context.Ser" + - "viceStatusEnum\":\n\rServiceConfig\022)\n\014confi" + - "g_rules\030\001 \003(\0132\023.context.ConfigRule\"8\n\rSe" + - "rviceIdList\022\'\n\013service_ids\030\001 \003(\0132\022.conte" + - "xt.ServiceId\"1\n\013ServiceList\022\"\n\010services\030" + - "\001 \003(\0132\020.context.Service\"\225\001\n\rServiceFilte" + - "r\022+\n\013service_ids\030\001 \001(\0132\026.context.Service" + - "IdList\022\034\n\024include_endpoint_ids\030\002 \001(\010\022\033\n\023" + - "include_constraints\030\003 \001(\010\022\034\n\024include_con" + - "fig_rules\030\004 \001(\010\"U\n\014ServiceEvent\022\035\n\005event" + - "\030\001 \001(\0132\016.context.Event\022&\n\nservice_id\030\002 \001" + - "(\0132\022.context.ServiceId\"T\n\007SliceId\022&\n\ncon" + - "text_id\030\001 \001(\0132\022.context.ContextId\022!\n\nsli" + - "ce_uuid\030\002 \001(\0132\r.context.Uuid\"\240\003\n\005Slice\022\"" + - "\n\010slice_id\030\001 \001(\0132\020.context.SliceId\022\014\n\004na" + - "me\030\002 \001(\t\022/\n\022slice_endpoint_ids\030\003 \003(\0132\023.c" + - "ontext.EndPointId\022.\n\021slice_constraints\030\004" + - " \003(\0132\023.context.Constraint\022-\n\021slice_servi" + - "ce_ids\030\005 \003(\0132\022.context.ServiceId\022,\n\022slic" + - "e_subslice_ids\030\006 \003(\0132\020.context.SliceId\022*" + - "\n\014slice_status\030\007 \001(\0132\024.context.SliceStat" + - "us\022*\n\014slice_config\030\010 \001(\0132\024.context.Slice" + - "Config\022(\n\013slice_owner\030\t \001(\0132\023.context.Sl" + - "iceOwner\022%\n\ttimestamp\030\n \001(\0132\022.context.Ti" + - "mestamp\"E\n\nSliceOwner\022!\n\nowner_uuid\030\001 \001(" + - "\0132\r.context.Uuid\022\024\n\014owner_string\030\002 \001(\t\"=" + - "\n\013SliceStatus\022.\n\014slice_status\030\001 \001(\0162\030.co" + - "ntext.SliceStatusEnum\"8\n\013SliceConfig\022)\n\014" + - "config_rules\030\001 \003(\0132\023.context.ConfigRule\"" + - "2\n\013SliceIdList\022#\n\tslice_ids\030\001 \003(\0132\020.cont" + - "ext.SliceId\"+\n\tSliceList\022\036\n\006slices\030\001 \003(\013" + - "2\016.context.Slice\"\312\001\n\013SliceFilter\022\'\n\tslic" + - "e_ids\030\001 \001(\0132\024.context.SliceIdList\022\034\n\024inc" + - "lude_endpoint_ids\030\002 \001(\010\022\033\n\023include_const" + - "raints\030\003 \001(\010\022\033\n\023include_service_ids\030\004 \001(" + - "\010\022\034\n\024include_subslice_ids\030\005 \001(\010\022\034\n\024inclu" + - "de_config_rules\030\006 \001(\010\"O\n\nSliceEvent\022\035\n\005e" + - "vent\030\001 \001(\0132\016.context.Event\022\"\n\010slice_id\030\002" + - " \001(\0132\020.context.SliceId\"6\n\014ConnectionId\022&" + - "\n\017connection_uuid\030\001 \001(\0132\r.context.Uuid\"2" + - "\n\025ConnectionSettings_L0\022\031\n\021lsp_symbolic_" + - "name\030\001 \001(\t\"\236\001\n\025ConnectionSettings_L2\022\027\n\017" + - "src_mac_address\030\001 \001(\t\022\027\n\017dst_mac_address" + - "\030\002 \001(\t\022\022\n\nether_type\030\003 \001(\r\022\017\n\007vlan_id\030\004 " + - "\001(\r\022\022\n\nmpls_label\030\005 \001(\r\022\032\n\022mpls_traffic_" + - "class\030\006 \001(\r\"t\n\025ConnectionSettings_L3\022\026\n\016" + - "src_ip_address\030\001 \001(\t\022\026\n\016dst_ip_address\030\002" + - " \001(\t\022\014\n\004dscp\030\003 \001(\r\022\020\n\010protocol\030\004 \001(\r\022\013\n\003" + - "ttl\030\005 \001(\r\"[\n\025ConnectionSettings_L4\022\020\n\010sr" + - "c_port\030\001 \001(\r\022\020\n\010dst_port\030\002 \001(\r\022\021\n\ttcp_fl" + - "ags\030\003 \001(\r\022\013\n\003ttl\030\004 \001(\r\"\304\001\n\022ConnectionSet" + - "tings\022*\n\002l0\030\001 \001(\0132\036.context.ConnectionSe" + - "ttings_L0\022*\n\002l2\030\002 \001(\0132\036.context.Connecti" + - "onSettings_L2\022*\n\002l3\030\003 \001(\0132\036.context.Conn" + - "ectionSettings_L3\022*\n\002l4\030\004 \001(\0132\036.context." + - "ConnectionSettings_L4\"\363\001\n\nConnection\022,\n\r" + - "connection_id\030\001 \001(\0132\025.context.Connection" + - "Id\022&\n\nservice_id\030\002 \001(\0132\022.context.Service" + - "Id\0223\n\026path_hops_endpoint_ids\030\003 \003(\0132\023.con" + - "text.EndPointId\022+\n\017sub_service_ids\030\004 \003(\013" + - "2\022.context.ServiceId\022-\n\010settings\030\005 \001(\0132\033" + - ".context.ConnectionSettings\"A\n\020Connectio" + - "nIdList\022-\n\016connection_ids\030\001 \003(\0132\025.contex" + - "t.ConnectionId\":\n\016ConnectionList\022(\n\013conn" + - "ections\030\001 \003(\0132\023.context.Connection\"^\n\017Co" + - "nnectionEvent\022\035\n\005event\030\001 \001(\0132\016.context.E" + - "vent\022,\n\rconnection_id\030\002 \001(\0132\025.context.Co" + - "nnectionId\"\202\001\n\nEndPointId\022(\n\013topology_id" + - "\030\001 \001(\0132\023.context.TopologyId\022$\n\tdevice_id" + - "\030\002 \001(\0132\021.context.DeviceId\022$\n\rendpoint_uu" + - "id\030\003 \001(\0132\r.context.Uuid\"\302\001\n\010EndPoint\022(\n\013" + - "endpoint_id\030\001 \001(\0132\023.context.EndPointId\022\014" + - "\n\004name\030\002 \001(\t\022\025\n\rendpoint_type\030\003 \001(\t\0229\n\020k" + - "pi_sample_types\030\004 \003(\0162\037.kpi_sample_types" + - ".KpiSampleType\022,\n\021endpoint_location\030\005 \001(" + - "\0132\021.context.Location\"{\n\014EndPointName\022(\n\013" + - "endpoint_id\030\001 \001(\0132\023.context.EndPointId\022\023" + - "\n\013device_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001" + - "(\t\022\025\n\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdL" + - "ist\022)\n\014endpoint_ids\030\001 \003(\0132\023.context.EndP" + - "ointId\"A\n\020EndPointNameList\022-\n\016endpoint_n" + - "ames\030\001 \003(\0132\025.context.EndPointName\"A\n\021Con" + - "figRule_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016" + - "resource_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022(" + - "\n\013endpoint_id\030\001 \001(\0132\023.context.EndPointId" + - "\022!\n\010rule_set\030\002 \001(\0132\017.acl.AclRuleSet\"\234\001\n\n" + - "ConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Con" + - "figActionEnum\022,\n\006custom\030\002 \001(\0132\032.context." + - "ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.conte" + - "xt.ConfigRule_ACLH\000B\r\n\013config_rule\"F\n\021Co" + - "nstraint_Custom\022\027\n\017constraint_type\030\001 \001(\t" + - "\022\030\n\020constraint_value\030\002 \001(\t\"E\n\023Constraint" + - "_Schedule\022\027\n\017start_timestamp\030\001 \001(\002\022\025\n\rdu" + - "ration_days\030\002 \001(\002\"3\n\014GPS_Position\022\020\n\010lat" + - "itude\030\001 \001(\002\022\021\n\tlongitude\030\002 \001(\002\"W\n\010Locati" + - "on\022\020\n\006region\030\001 \001(\tH\000\022-\n\014gps_position\030\002 \001" + - "(\0132\025.context.GPS_PositionH\000B\n\n\010location\"" + - "l\n\033Constraint_EndPointLocation\022(\n\013endpoi" + - "nt_id\030\001 \001(\0132\023.context.EndPointId\022#\n\010loca" + - "tion\030\002 \001(\0132\021.context.Location\"Y\n\033Constra" + - "int_EndPointPriority\022(\n\013endpoint_id\030\001 \001(" + - "\0132\023.context.EndPointId\022\020\n\010priority\030\002 \001(\r" + - "\"0\n\026Constraint_SLA_Latency\022\026\n\016e2e_latenc" + - "y_ms\030\001 \001(\002\"0\n\027Constraint_SLA_Capacity\022\025\n" + - "\rcapacity_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_A" + - "vailability\022\032\n\022num_disjoint_paths\030\001 \001(\r\022" + - "\022\n\nall_active\030\002 \001(\010\022\024\n\014availability\030\003 \001(" + - "\002\"V\n\036Constraint_SLA_Isolation_level\0224\n\017i" + - "solation_level\030\001 \003(\0162\033.context.Isolation" + - "LevelEnum\"\242\001\n\025Constraint_Exclusions\022\024\n\014i" + - "s_permanent\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021." + - "context.DeviceId\022)\n\014endpoint_ids\030\003 \003(\0132\023" + - ".context.EndPointId\022!\n\010link_ids\030\004 \003(\0132\017." + - "context.LinkId\"\333\004\n\nConstraint\022-\n\006action\030" + - "\001 \001(\0162\035.context.ConstraintActionEnum\022,\n\006" + - "custom\030\002 \001(\0132\032.context.Constraint_Custom" + - "H\000\0220\n\010schedule\030\003 \001(\0132\034.context.Constrain" + - "t_ScheduleH\000\022A\n\021endpoint_location\030\004 \001(\0132" + - "$.context.Constraint_EndPointLocationH\000\022" + - "A\n\021endpoint_priority\030\005 \001(\0132$.context.Con" + - "straint_EndPointPriorityH\000\0228\n\014sla_capaci" + - "ty\030\006 \001(\0132 .context.Constraint_SLA_Capaci" + - "tyH\000\0226\n\013sla_latency\030\007 \001(\0132\037.context.Cons" + - "traint_SLA_LatencyH\000\022@\n\020sla_availability" + - "\030\010 \001(\0132$.context.Constraint_SLA_Availabi" + - "lityH\000\022@\n\rsla_isolation\030\t \001(\0132\'.context." + - "Constraint_SLA_Isolation_levelH\000\0224\n\nexcl" + - "usions\030\n \001(\0132\036.context.Constraint_Exclus" + - "ionsH\000B\014\n\nconstraint\"^\n\022TeraFlowControll" + - "er\022&\n\ncontext_id\030\001 \001(\0132\022.context.Context" + - "Id\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024" + - "AuthenticationResult\022&\n\ncontext_id\030\001 \001(\013" + - "2\022.context.ContextId\022\025\n\rauthenticated\030\002 " + - "\001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEFI" + - "NED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYPE" + - "_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Devi" + - "ceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020\000" + - "\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICED" + - "RIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P4" + - "\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOGY" + - "\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVIC" + - "EDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020" + - "\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n\033" + - "DeviceOperationalStatusEnum\022%\n!DEVICEOPE" + - "RATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPER" + - "ATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERAT" + - "IONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEnu" + - "m\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYP" + - "E_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVIC" + - "ETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SER" + - "VICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027S" + - "ERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTATU" + - "S_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032\n" + - "\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTAT" + - "US_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_SL" + - "A_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLIC" + - "ESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLANN" + - "ED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTATU" + - "S_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030SL" + - "ICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigAction" + - "Enum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CONF" + - "IGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002*" + - "m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTACT" + - "ION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020" + - "\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isola" + - "tionLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSI" + - "CAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025" + - "\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY" + - "_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATI" + - "ON\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033" + - "NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE" + - "_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016ListC" + - "ontextIds\022\016.context.Empty\032\026.context.Cont" + - "extIdList\"\000\0226\n\014ListContexts\022\016.context.Em" + - "pty\032\024.context.ContextList\"\000\0224\n\nGetContex" + - "t\022\022.context.ContextId\032\020.context.Context\"" + - "\000\0224\n\nSetContext\022\020.context.Context\032\022.cont" + - "ext.ContextId\"\000\0225\n\rRemoveContext\022\022.conte" + - "xt.ContextId\032\016.context.Empty\"\000\022=\n\020GetCon" + - "textEvents\022\016.context.Empty\032\025.context.Con" + - "textEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.conte" + - "xt.ContextId\032\027.context.TopologyIdList\"\000\022" + - "=\n\016ListTopologies\022\022.context.ContextId\032\025." + - "context.TopologyList\"\000\0227\n\013GetTopology\022\023." + - "context.TopologyId\032\021.context.Topology\"\000\022" + - "E\n\022GetTopologyDetails\022\023.context.Topology" + - "Id\032\030.context.TopologyDetails\"\000\0227\n\013SetTop" + - "ology\022\021.context.Topology\032\023.context.Topol" + - "ogyId\"\000\0227\n\016RemoveTopology\022\023.context.Topo" + - "logyId\032\016.context.Empty\"\000\022?\n\021GetTopologyE" + - "vents\022\016.context.Empty\032\026.context.Topology" + - "Event\"\0000\001\0228\n\rListDeviceIds\022\016.context.Emp" + - "ty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevic" + - "es\022\016.context.Empty\032\023.context.DeviceList\"" + - "\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.cont" + - "ext.Device\"\000\0221\n\tSetDevice\022\017.context.Devi" + - "ce\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice\022" + - "\021.context.DeviceId\032\016.context.Empty\"\000\022;\n\017" + - "GetDeviceEvents\022\016.context.Empty\032\024.contex" + - "t.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.cont" + - "ext.DeviceFilter\032\023.context.DeviceList\"\000\022" + - "I\n\021ListEndPointNames\022\027.context.EndPointI" + - "dList\032\031.context.EndPointNameList\"\000\0224\n\013Li" + - "stLinkIds\022\016.context.Empty\032\023.context.Link" + - "IdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021." + - "context.LinkList\"\000\022+\n\007GetLink\022\017.context." + - "LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.con" + - "text.Link\032\017.context.LinkId\"\000\022/\n\nRemoveLi" + - "nk\022\017.context.LinkId\032\016.context.Empty\"\000\0227\n" + - "\rGetLinkEvents\022\016.context.Empty\032\022.context" + - ".LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.conte" + - "xt.ContextId\032\026.context.ServiceIdList\"\000\022:" + - "\n\014ListServices\022\022.context.ContextId\032\024.con" + - "text.ServiceList\"\000\0224\n\nGetService\022\022.conte" + - "xt.ServiceId\032\020.context.Service\"\000\0224\n\nSetS" + - "ervice\022\020.context.Service\032\022.context.Servi" + - "ceId\"\000\0226\n\014UnsetService\022\020.context.Service" + - "\032\022.context.ServiceId\"\000\0225\n\rRemoveService\022" + - "\022.context.ServiceId\032\016.context.Empty\"\000\022=\n" + - "\020GetServiceEvents\022\016.context.Empty\032\025.cont" + - "ext.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026." + - "context.ServiceFilter\032\024.context.ServiceL" + - "ist\"\000\022:\n\014ListSliceIds\022\022.context.ContextI" + - "d\032\024.context.SliceIdList\"\000\0226\n\nListSlices\022" + - "\022.context.ContextId\032\022.context.SliceList\"" + - "\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.contex" + - "t.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020." + - "context.SliceId\"\000\0220\n\nUnsetSlice\022\016.contex" + - "t.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSli" + - "ce\022\020.context.SliceId\032\016.context.Empty\"\000\0229" + - "\n\016GetSliceEvents\022\016.context.Empty\032\023.conte" + - "xt.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.conte" + - "xt.SliceFilter\032\022.context.SliceList\"\000\022D\n\021" + - "ListConnectionIds\022\022.context.ServiceId\032\031." + - "context.ConnectionIdList\"\000\022@\n\017ListConnec" + - "tions\022\022.context.ServiceId\032\027.context.Conn" + - "ectionList\"\000\022=\n\rGetConnection\022\025.context." + - "ConnectionId\032\023.context.Connection\"\000\022=\n\rS" + - "etConnection\022\023.context.Connection\032\025.cont" + - "ext.ConnectionId\"\000\022;\n\020RemoveConnection\022\025" + - ".context.ConnectionId\032\016.context.Empty\"\000\022" + - "C\n\023GetConnectionEvents\022\016.context.Empty\032\030" + - ".context.ConnectionEvent\"\0000\001b\006proto3" + "\n\tlink_uuid\030\001 \001(\0132\r.context.Uuid\"I\n\016Link" + + "Attributes\022\033\n\023total_capacity_gbps\030\001 \001(\002\022" + + "\032\n\022used_capacity_gbps\030\002 \001(\002\"\223\001\n\004Link\022 \n\007" + + "link_id\030\001 \001(\0132\017.context.LinkId\022\014\n\004name\030\002" + + " \001(\t\022.\n\021link_endpoint_ids\030\003 \003(\0132\023.contex" + + "t.EndPointId\022+\n\nattributes\030\004 \001(\0132\027.conte" + + "xt.LinkAttributes\"/\n\nLinkIdList\022!\n\010link_" + + "ids\030\001 \003(\0132\017.context.LinkId\"(\n\010LinkList\022\034" + + "\n\005links\030\001 \003(\0132\r.context.Link\"L\n\tLinkEven" + + "t\022\035\n\005event\030\001 \001(\0132\016.context.Event\022 \n\007link" + + "_id\030\002 \001(\0132\017.context.LinkId\"X\n\tServiceId\022" + + "&\n\ncontext_id\030\001 \001(\0132\022.context.ContextId\022" + + "#\n\014service_uuid\030\002 \001(\0132\r.context.Uuid\"\333\002\n" + + "\007Service\022&\n\nservice_id\030\001 \001(\0132\022.context.S" + + "erviceId\022\014\n\004name\030\002 \001(\t\022.\n\014service_type\030\003" + + " \001(\0162\030.context.ServiceTypeEnum\0221\n\024servic" + + "e_endpoint_ids\030\004 \003(\0132\023.context.EndPointI" + + "d\0220\n\023service_constraints\030\005 \003(\0132\023.context" + + ".Constraint\022.\n\016service_status\030\006 \001(\0132\026.co" + + "ntext.ServiceStatus\022.\n\016service_config\030\007 " + + "\001(\0132\026.context.ServiceConfig\022%\n\ttimestamp" + + "\030\010 \001(\0132\022.context.Timestamp\"C\n\rServiceSta" + + "tus\0222\n\016service_status\030\001 \001(\0162\032.context.Se" + + "rviceStatusEnum\":\n\rServiceConfig\022)\n\014conf" + + "ig_rules\030\001 \003(\0132\023.context.ConfigRule\"8\n\rS" + + "erviceIdList\022\'\n\013service_ids\030\001 \003(\0132\022.cont" + + "ext.ServiceId\"1\n\013ServiceList\022\"\n\010services" + + "\030\001 \003(\0132\020.context.Service\"\225\001\n\rServiceFilt" + + "er\022+\n\013service_ids\030\001 \001(\0132\026.context.Servic" + + "eIdList\022\034\n\024include_endpoint_ids\030\002 \001(\010\022\033\n" + + "\023include_constraints\030\003 \001(\010\022\034\n\024include_co" + + "nfig_rules\030\004 \001(\010\"U\n\014ServiceEvent\022\035\n\005even" + + "t\030\001 \001(\0132\016.context.Event\022&\n\nservice_id\030\002 " + + "\001(\0132\022.context.ServiceId\"T\n\007SliceId\022&\n\nco" + + "ntext_id\030\001 \001(\0132\022.context.ContextId\022!\n\nsl" + + "ice_uuid\030\002 \001(\0132\r.context.Uuid\"\240\003\n\005Slice\022" + + "\"\n\010slice_id\030\001 \001(\0132\020.context.SliceId\022\014\n\004n" + + "ame\030\002 \001(\t\022/\n\022slice_endpoint_ids\030\003 \003(\0132\023." + + "context.EndPointId\022.\n\021slice_constraints\030" + + "\004 \003(\0132\023.context.Constraint\022-\n\021slice_serv" + + "ice_ids\030\005 \003(\0132\022.context.ServiceId\022,\n\022sli" + + "ce_subslice_ids\030\006 \003(\0132\020.context.SliceId\022" + + "*\n\014slice_status\030\007 \001(\0132\024.context.SliceSta" + + "tus\022*\n\014slice_config\030\010 \001(\0132\024.context.Slic" + + "eConfig\022(\n\013slice_owner\030\t \001(\0132\023.context.S" + + "liceOwner\022%\n\ttimestamp\030\n \001(\0132\022.context.T" + + "imestamp\"E\n\nSliceOwner\022!\n\nowner_uuid\030\001 \001" + + "(\0132\r.context.Uuid\022\024\n\014owner_string\030\002 \001(\t\"" + + "=\n\013SliceStatus\022.\n\014slice_status\030\001 \001(\0162\030.c" + + "ontext.SliceStatusEnum\"8\n\013SliceConfig\022)\n" + + "\014config_rules\030\001 \003(\0132\023.context.ConfigRule" + + "\"2\n\013SliceIdList\022#\n\tslice_ids\030\001 \003(\0132\020.con" + + "text.SliceId\"+\n\tSliceList\022\036\n\006slices\030\001 \003(" + + "\0132\016.context.Slice\"\312\001\n\013SliceFilter\022\'\n\tsli" + + "ce_ids\030\001 \001(\0132\024.context.SliceIdList\022\034\n\024in" + + "clude_endpoint_ids\030\002 \001(\010\022\033\n\023include_cons" + + "traints\030\003 \001(\010\022\033\n\023include_service_ids\030\004 \001" + + "(\010\022\034\n\024include_subslice_ids\030\005 \001(\010\022\034\n\024incl" + + "ude_config_rules\030\006 \001(\010\"O\n\nSliceEvent\022\035\n\005" + + "event\030\001 \001(\0132\016.context.Event\022\"\n\010slice_id\030" + + "\002 \001(\0132\020.context.SliceId\"6\n\014ConnectionId\022" + + "&\n\017connection_uuid\030\001 \001(\0132\r.context.Uuid\"" + + "2\n\025ConnectionSettings_L0\022\031\n\021lsp_symbolic" + + "_name\030\001 \001(\t\"\236\001\n\025ConnectionSettings_L2\022\027\n" + + "\017src_mac_address\030\001 \001(\t\022\027\n\017dst_mac_addres" + + "s\030\002 \001(\t\022\022\n\nether_type\030\003 \001(\r\022\017\n\007vlan_id\030\004" + + " \001(\r\022\022\n\nmpls_label\030\005 \001(\r\022\032\n\022mpls_traffic" + + "_class\030\006 \001(\r\"t\n\025ConnectionSettings_L3\022\026\n" + + "\016src_ip_address\030\001 \001(\t\022\026\n\016dst_ip_address\030" + + "\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022\020\n\010protocol\030\004 \001(\r\022\013\n" + + "\003ttl\030\005 \001(\r\"[\n\025ConnectionSettings_L4\022\020\n\010s" + + "rc_port\030\001 \001(\r\022\020\n\010dst_port\030\002 \001(\r\022\021\n\ttcp_f" + + "lags\030\003 \001(\r\022\013\n\003ttl\030\004 \001(\r\"\304\001\n\022ConnectionSe" + + "ttings\022*\n\002l0\030\001 \001(\0132\036.context.ConnectionS" + + "ettings_L0\022*\n\002l2\030\002 \001(\0132\036.context.Connect" + + "ionSettings_L2\022*\n\002l3\030\003 \001(\0132\036.context.Con" + + "nectionSettings_L3\022*\n\002l4\030\004 \001(\0132\036.context" + + ".ConnectionSettings_L4\"\363\001\n\nConnection\022,\n" + + "\rconnection_id\030\001 \001(\0132\025.context.Connectio" + + "nId\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + + "eId\0223\n\026path_hops_endpoint_ids\030\003 \003(\0132\023.co" + + "ntext.EndPointId\022+\n\017sub_service_ids\030\004 \003(" + + "\0132\022.context.ServiceId\022-\n\010settings\030\005 \001(\0132" + + "\033.context.ConnectionSettings\"A\n\020Connecti" + + "onIdList\022-\n\016connection_ids\030\001 \003(\0132\025.conte" + + "xt.ConnectionId\":\n\016ConnectionList\022(\n\013con" + + "nections\030\001 \003(\0132\023.context.Connection\"^\n\017C" + + "onnectionEvent\022\035\n\005event\030\001 \001(\0132\016.context." + + "Event\022,\n\rconnection_id\030\002 \001(\0132\025.context.C" + + "onnectionId\"\202\001\n\nEndPointId\022(\n\013topology_i" + + "d\030\001 \001(\0132\023.context.TopologyId\022$\n\tdevice_i" + + "d\030\002 \001(\0132\021.context.DeviceId\022$\n\rendpoint_u" + + "uid\030\003 \001(\0132\r.context.Uuid\"\302\001\n\010EndPoint\022(\n" + + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + + "\014\n\004name\030\002 \001(\t\022\025\n\rendpoint_type\030\003 \001(\t\0229\n\020" + + "kpi_sample_types\030\004 \003(\0162\037.kpi_sample_type" + + "s.KpiSampleType\022,\n\021endpoint_location\030\005 \001" + + "(\0132\021.context.Location\"{\n\014EndPointName\022(\n" + + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + + "\023\n\013device_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 " + + "\001(\t\022\025\n\rendpoint_type\030\004 \001(\t\";\n\016EndPointId" + + "List\022)\n\014endpoint_ids\030\001 \003(\0132\023.context.End" + + "PointId\"A\n\020EndPointNameList\022-\n\016endpoint_" + + "names\030\001 \003(\0132\025.context.EndPointName\"A\n\021Co" + + "nfigRule_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n" + + "\016resource_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022" + + "(\n\013endpoint_id\030\001 \001(\0132\023.context.EndPointI" + + "d\022!\n\010rule_set\030\002 \001(\0132\017.acl.AclRuleSet\"\234\001\n" + + "\nConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Co" + + "nfigActionEnum\022,\n\006custom\030\002 \001(\0132\032.context" + + ".ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.cont" + + "ext.ConfigRule_ACLH\000B\r\n\013config_rule\"F\n\021C" + + "onstraint_Custom\022\027\n\017constraint_type\030\001 \001(" + + "\t\022\030\n\020constraint_value\030\002 \001(\t\"E\n\023Constrain" + + "t_Schedule\022\027\n\017start_timestamp\030\001 \001(\002\022\025\n\rd" + + "uration_days\030\002 \001(\002\"3\n\014GPS_Position\022\020\n\010la" + + "titude\030\001 \001(\002\022\021\n\tlongitude\030\002 \001(\002\"W\n\010Locat" + + "ion\022\020\n\006region\030\001 \001(\tH\000\022-\n\014gps_position\030\002 " + + "\001(\0132\025.context.GPS_PositionH\000B\n\n\010location" + + "\"l\n\033Constraint_EndPointLocation\022(\n\013endpo" + + "int_id\030\001 \001(\0132\023.context.EndPointId\022#\n\010loc" + + "ation\030\002 \001(\0132\021.context.Location\"Y\n\033Constr" + + "aint_EndPointPriority\022(\n\013endpoint_id\030\001 \001" + + "(\0132\023.context.EndPointId\022\020\n\010priority\030\002 \001(" + + "\r\"0\n\026Constraint_SLA_Latency\022\026\n\016e2e_laten" + + "cy_ms\030\001 \001(\002\"0\n\027Constraint_SLA_Capacity\022\025" + + "\n\rcapacity_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_" + + "Availability\022\032\n\022num_disjoint_paths\030\001 \001(\r" + + "\022\022\n\nall_active\030\002 \001(\010\022\024\n\014availability\030\003 \001" + + "(\002\"V\n\036Constraint_SLA_Isolation_level\0224\n\017" + + "isolation_level\030\001 \003(\0162\033.context.Isolatio" + + "nLevelEnum\"\242\001\n\025Constraint_Exclusions\022\024\n\014" + + "is_permanent\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021" + + ".context.DeviceId\022)\n\014endpoint_ids\030\003 \003(\0132" + + "\023.context.EndPointId\022!\n\010link_ids\030\004 \003(\0132\017" + + ".context.LinkId\"\333\004\n\nConstraint\022-\n\006action" + + "\030\001 \001(\0162\035.context.ConstraintActionEnum\022,\n" + + "\006custom\030\002 \001(\0132\032.context.Constraint_Custo" + + "mH\000\0220\n\010schedule\030\003 \001(\0132\034.context.Constrai" + + "nt_ScheduleH\000\022A\n\021endpoint_location\030\004 \001(\013" + + "2$.context.Constraint_EndPointLocationH\000" + + "\022A\n\021endpoint_priority\030\005 \001(\0132$.context.Co" + + "nstraint_EndPointPriorityH\000\0228\n\014sla_capac" + + "ity\030\006 \001(\0132 .context.Constraint_SLA_Capac" + + "ityH\000\0226\n\013sla_latency\030\007 \001(\0132\037.context.Con" + + "straint_SLA_LatencyH\000\022@\n\020sla_availabilit" + + "y\030\010 \001(\0132$.context.Constraint_SLA_Availab" + + "ilityH\000\022@\n\rsla_isolation\030\t \001(\0132\'.context" + + ".Constraint_SLA_Isolation_levelH\000\0224\n\nexc" + + "lusions\030\n \001(\0132\036.context.Constraint_Exclu" + + "sionsH\000B\014\n\nconstraint\"^\n\022TeraFlowControl" + + "ler\022&\n\ncontext_id\030\001 \001(\0132\022.context.Contex" + + "tId\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n" + + "\024AuthenticationResult\022&\n\ncontext_id\030\001 \001(" + + "\0132\022.context.ContextId\022\025\n\rauthenticated\030\002" + + " \001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEF" + + "INED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYP" + + "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Dev" + + "iceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020" + + "\000\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICE" + + "DRIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P" + + "4\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOG" + + "Y\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVI" + + "CEDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN" + + "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n" + + "\033DeviceOperationalStatusEnum\022%\n!DEVICEOP" + + "ERATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPE" + + "RATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERA" + + "TIONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEn" + + "um\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETY" + + "PE_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVI" + + "CETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SE" + + "RVICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027" + + "SERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTAT" + + "US_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032" + + "\n\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTA" + + "TUS_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_S" + + "LA_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLI" + + "CESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLAN" + + "NED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTAT" + + "US_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030S" + + "LICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActio" + + "nEnum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CON" + + "FIGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002" + + "*m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTAC" + + "TION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET" + + "\020\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isol" + + "ationLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYS" + + "ICAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022" + + "\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMOR" + + "Y_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLAT" + + "ION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n" + + "\033NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVIC" + + "E_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016List" + + "ContextIds\022\016.context.Empty\032\026.context.Con" + + "textIdList\"\000\0226\n\014ListContexts\022\016.context.E" + + "mpty\032\024.context.ContextList\"\000\0224\n\nGetConte" + + "xt\022\022.context.ContextId\032\020.context.Context" + + "\"\000\0224\n\nSetContext\022\020.context.Context\032\022.con" + + "text.ContextId\"\000\0225\n\rRemoveContext\022\022.cont" + + "ext.ContextId\032\016.context.Empty\"\000\022=\n\020GetCo" + + "ntextEvents\022\016.context.Empty\032\025.context.Co" + + "ntextEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.cont" + + "ext.ContextId\032\027.context.TopologyIdList\"\000" + + "\022=\n\016ListTopologies\022\022.context.ContextId\032\025" + + ".context.TopologyList\"\000\0227\n\013GetTopology\022\023" + + ".context.TopologyId\032\021.context.Topology\"\000" + + "\022E\n\022GetTopologyDetails\022\023.context.Topolog" + + "yId\032\030.context.TopologyDetails\"\000\0227\n\013SetTo" + + "pology\022\021.context.Topology\032\023.context.Topo" + + "logyId\"\000\0227\n\016RemoveTopology\022\023.context.Top" + + "ologyId\032\016.context.Empty\"\000\022?\n\021GetTopology" + + "Events\022\016.context.Empty\032\026.context.Topolog" + + "yEvent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Em" + + "pty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevi" + + "ces\022\016.context.Empty\032\023.context.DeviceList" + + "\"\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.con" + + "text.Device\"\000\0221\n\tSetDevice\022\017.context.Dev" + + "ice\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice" + + "\022\021.context.DeviceId\032\016.context.Empty\"\000\022;\n" + + "\017GetDeviceEvents\022\016.context.Empty\032\024.conte" + + "xt.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.con" + + "text.DeviceFilter\032\023.context.DeviceList\"\000" + + "\022I\n\021ListEndPointNames\022\027.context.EndPoint" + + "IdList\032\031.context.EndPointNameList\"\000\0224\n\013L" + + "istLinkIds\022\016.context.Empty\032\023.context.Lin" + + "kIdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021" + + ".context.LinkList\"\000\022+\n\007GetLink\022\017.context" + + ".LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.co" + + "ntext.Link\032\017.context.LinkId\"\000\022/\n\nRemoveL" + + "ink\022\017.context.LinkId\032\016.context.Empty\"\000\0227" + + "\n\rGetLinkEvents\022\016.context.Empty\032\022.contex" + + "t.LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.cont" + + "ext.ContextId\032\026.context.ServiceIdList\"\000\022" + + ":\n\014ListServices\022\022.context.ContextId\032\024.co" + + "ntext.ServiceList\"\000\0224\n\nGetService\022\022.cont" + + "ext.ServiceId\032\020.context.Service\"\000\0224\n\nSet" + + "Service\022\020.context.Service\032\022.context.Serv" + + "iceId\"\000\0226\n\014UnsetService\022\020.context.Servic" + + "e\032\022.context.ServiceId\"\000\0225\n\rRemoveService" + + "\022\022.context.ServiceId\032\016.context.Empty\"\000\022=" + + "\n\020GetServiceEvents\022\016.context.Empty\032\025.con" + + "text.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026" + + ".context.ServiceFilter\032\024.context.Service" + + "List\"\000\022:\n\014ListSliceIds\022\022.context.Context" + + "Id\032\024.context.SliceIdList\"\000\0226\n\nListSlices" + + "\022\022.context.ContextId\032\022.context.SliceList" + + "\"\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.conte" + + "xt.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020" + + ".context.SliceId\"\000\0220\n\nUnsetSlice\022\016.conte" + + "xt.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSl" + + "ice\022\020.context.SliceId\032\016.context.Empty\"\000\022" + + "9\n\016GetSliceEvents\022\016.context.Empty\032\023.cont" + + "ext.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.cont" + + "ext.SliceFilter\032\022.context.SliceList\"\000\022D\n" + + "\021ListConnectionIds\022\022.context.ServiceId\032\031" + + ".context.ConnectionIdList\"\000\022@\n\017ListConne" + + "ctions\022\022.context.ServiceId\032\027.context.Con" + + "nectionList\"\000\022=\n\rGetConnection\022\025.context" + + ".ConnectionId\032\023.context.Connection\"\000\022=\n\r" + + "SetConnection\022\023.context.Connection\032\025.con" + + "text.ConnectionId\"\000\022;\n\020RemoveConnection\022" + + "\025.context.ConnectionId\032\016.context.Empty\"\000" + + "\022C\n\023GetConnectionEvents\022\016.context.Empty\032" + + "\030.context.ConnectionEvent\"\0000\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -75318,320 +76091,326 @@ public final class ContextOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkId_descriptor, new java.lang.String[] { "LinkUuid", }); - internal_static_context_Link_descriptor = + internal_static_context_LinkAttributes_descriptor = getDescriptor().getMessageTypes().get(24); + internal_static_context_LinkAttributes_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_context_LinkAttributes_descriptor, + new java.lang.String[] { "TotalCapacityGbps", "UsedCapacityGbps", }); + internal_static_context_Link_descriptor = + getDescriptor().getMessageTypes().get(25); internal_static_context_Link_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Link_descriptor, - new java.lang.String[] { "LinkId", "Name", "LinkEndpointIds", }); + new java.lang.String[] { "LinkId", "Name", "LinkEndpointIds", "Attributes", }); internal_static_context_LinkIdList_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(26); internal_static_context_LinkIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkIdList_descriptor, new java.lang.String[] { "LinkIds", }); internal_static_context_LinkList_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(27); internal_static_context_LinkList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkList_descriptor, new java.lang.String[] { "Links", }); internal_static_context_LinkEvent_descriptor = - getDescriptor().getMessageTypes().get(27); + getDescriptor().getMessageTypes().get(28); internal_static_context_LinkEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkEvent_descriptor, new java.lang.String[] { "Event", "LinkId", }); internal_static_context_ServiceId_descriptor = - getDescriptor().getMessageTypes().get(28); + getDescriptor().getMessageTypes().get(29); internal_static_context_ServiceId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceId_descriptor, new java.lang.String[] { "ContextId", "ServiceUuid", }); internal_static_context_Service_descriptor = - getDescriptor().getMessageTypes().get(29); + getDescriptor().getMessageTypes().get(30); internal_static_context_Service_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Service_descriptor, new java.lang.String[] { "ServiceId", "Name", "ServiceType", "ServiceEndpointIds", "ServiceConstraints", "ServiceStatus", "ServiceConfig", "Timestamp", }); internal_static_context_ServiceStatus_descriptor = - getDescriptor().getMessageTypes().get(30); + getDescriptor().getMessageTypes().get(31); internal_static_context_ServiceStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceStatus_descriptor, new java.lang.String[] { "ServiceStatus", }); internal_static_context_ServiceConfig_descriptor = - getDescriptor().getMessageTypes().get(31); + getDescriptor().getMessageTypes().get(32); internal_static_context_ServiceConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceConfig_descriptor, new java.lang.String[] { "ConfigRules", }); internal_static_context_ServiceIdList_descriptor = - getDescriptor().getMessageTypes().get(32); + getDescriptor().getMessageTypes().get(33); internal_static_context_ServiceIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceIdList_descriptor, new java.lang.String[] { "ServiceIds", }); internal_static_context_ServiceList_descriptor = - getDescriptor().getMessageTypes().get(33); + getDescriptor().getMessageTypes().get(34); internal_static_context_ServiceList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceList_descriptor, new java.lang.String[] { "Services", }); internal_static_context_ServiceFilter_descriptor = - getDescriptor().getMessageTypes().get(34); + getDescriptor().getMessageTypes().get(35); internal_static_context_ServiceFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceFilter_descriptor, new java.lang.String[] { "ServiceIds", "IncludeEndpointIds", "IncludeConstraints", "IncludeConfigRules", }); internal_static_context_ServiceEvent_descriptor = - getDescriptor().getMessageTypes().get(35); + getDescriptor().getMessageTypes().get(36); internal_static_context_ServiceEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceEvent_descriptor, new java.lang.String[] { "Event", "ServiceId", }); internal_static_context_SliceId_descriptor = - getDescriptor().getMessageTypes().get(36); + getDescriptor().getMessageTypes().get(37); internal_static_context_SliceId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceId_descriptor, new java.lang.String[] { "ContextId", "SliceUuid", }); internal_static_context_Slice_descriptor = - getDescriptor().getMessageTypes().get(37); + getDescriptor().getMessageTypes().get(38); internal_static_context_Slice_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Slice_descriptor, new java.lang.String[] { "SliceId", "Name", "SliceEndpointIds", "SliceConstraints", "SliceServiceIds", "SliceSubsliceIds", "SliceStatus", "SliceConfig", "SliceOwner", "Timestamp", }); internal_static_context_SliceOwner_descriptor = - getDescriptor().getMessageTypes().get(38); + getDescriptor().getMessageTypes().get(39); internal_static_context_SliceOwner_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceOwner_descriptor, new java.lang.String[] { "OwnerUuid", "OwnerString", }); internal_static_context_SliceStatus_descriptor = - getDescriptor().getMessageTypes().get(39); + getDescriptor().getMessageTypes().get(40); internal_static_context_SliceStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceStatus_descriptor, new java.lang.String[] { "SliceStatus", }); internal_static_context_SliceConfig_descriptor = - getDescriptor().getMessageTypes().get(40); + getDescriptor().getMessageTypes().get(41); internal_static_context_SliceConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceConfig_descriptor, new java.lang.String[] { "ConfigRules", }); internal_static_context_SliceIdList_descriptor = - getDescriptor().getMessageTypes().get(41); + getDescriptor().getMessageTypes().get(42); internal_static_context_SliceIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceIdList_descriptor, new java.lang.String[] { "SliceIds", }); internal_static_context_SliceList_descriptor = - getDescriptor().getMessageTypes().get(42); + getDescriptor().getMessageTypes().get(43); internal_static_context_SliceList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceList_descriptor, new java.lang.String[] { "Slices", }); internal_static_context_SliceFilter_descriptor = - getDescriptor().getMessageTypes().get(43); + getDescriptor().getMessageTypes().get(44); internal_static_context_SliceFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceFilter_descriptor, new java.lang.String[] { "SliceIds", "IncludeEndpointIds", "IncludeConstraints", "IncludeServiceIds", "IncludeSubsliceIds", "IncludeConfigRules", }); internal_static_context_SliceEvent_descriptor = - getDescriptor().getMessageTypes().get(44); + getDescriptor().getMessageTypes().get(45); internal_static_context_SliceEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceEvent_descriptor, new java.lang.String[] { "Event", "SliceId", }); internal_static_context_ConnectionId_descriptor = - getDescriptor().getMessageTypes().get(45); + getDescriptor().getMessageTypes().get(46); internal_static_context_ConnectionId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionId_descriptor, new java.lang.String[] { "ConnectionUuid", }); internal_static_context_ConnectionSettings_L0_descriptor = - getDescriptor().getMessageTypes().get(46); + getDescriptor().getMessageTypes().get(47); internal_static_context_ConnectionSettings_L0_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L0_descriptor, new java.lang.String[] { "LspSymbolicName", }); internal_static_context_ConnectionSettings_L2_descriptor = - getDescriptor().getMessageTypes().get(47); + getDescriptor().getMessageTypes().get(48); internal_static_context_ConnectionSettings_L2_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L2_descriptor, new java.lang.String[] { "SrcMacAddress", "DstMacAddress", "EtherType", "VlanId", "MplsLabel", "MplsTrafficClass", }); internal_static_context_ConnectionSettings_L3_descriptor = - getDescriptor().getMessageTypes().get(48); + getDescriptor().getMessageTypes().get(49); internal_static_context_ConnectionSettings_L3_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L3_descriptor, new java.lang.String[] { "SrcIpAddress", "DstIpAddress", "Dscp", "Protocol", "Ttl", }); internal_static_context_ConnectionSettings_L4_descriptor = - getDescriptor().getMessageTypes().get(49); + getDescriptor().getMessageTypes().get(50); internal_static_context_ConnectionSettings_L4_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L4_descriptor, new java.lang.String[] { "SrcPort", "DstPort", "TcpFlags", "Ttl", }); internal_static_context_ConnectionSettings_descriptor = - getDescriptor().getMessageTypes().get(50); + getDescriptor().getMessageTypes().get(51); internal_static_context_ConnectionSettings_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_descriptor, new java.lang.String[] { "L0", "L2", "L3", "L4", }); internal_static_context_Connection_descriptor = - getDescriptor().getMessageTypes().get(51); + getDescriptor().getMessageTypes().get(52); internal_static_context_Connection_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Connection_descriptor, new java.lang.String[] { "ConnectionId", "ServiceId", "PathHopsEndpointIds", "SubServiceIds", "Settings", }); internal_static_context_ConnectionIdList_descriptor = - getDescriptor().getMessageTypes().get(52); + getDescriptor().getMessageTypes().get(53); internal_static_context_ConnectionIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionIdList_descriptor, new java.lang.String[] { "ConnectionIds", }); internal_static_context_ConnectionList_descriptor = - getDescriptor().getMessageTypes().get(53); + getDescriptor().getMessageTypes().get(54); internal_static_context_ConnectionList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionList_descriptor, new java.lang.String[] { "Connections", }); internal_static_context_ConnectionEvent_descriptor = - getDescriptor().getMessageTypes().get(54); + getDescriptor().getMessageTypes().get(55); internal_static_context_ConnectionEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionEvent_descriptor, new java.lang.String[] { "Event", "ConnectionId", }); internal_static_context_EndPointId_descriptor = - getDescriptor().getMessageTypes().get(55); + getDescriptor().getMessageTypes().get(56); internal_static_context_EndPointId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointId_descriptor, new java.lang.String[] { "TopologyId", "DeviceId", "EndpointUuid", }); internal_static_context_EndPoint_descriptor = - getDescriptor().getMessageTypes().get(56); + getDescriptor().getMessageTypes().get(57); internal_static_context_EndPoint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPoint_descriptor, new java.lang.String[] { "EndpointId", "Name", "EndpointType", "KpiSampleTypes", "EndpointLocation", }); internal_static_context_EndPointName_descriptor = - getDescriptor().getMessageTypes().get(57); + getDescriptor().getMessageTypes().get(58); internal_static_context_EndPointName_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointName_descriptor, new java.lang.String[] { "EndpointId", "DeviceName", "EndpointName", "EndpointType", }); internal_static_context_EndPointIdList_descriptor = - getDescriptor().getMessageTypes().get(58); + getDescriptor().getMessageTypes().get(59); internal_static_context_EndPointIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointIdList_descriptor, new java.lang.String[] { "EndpointIds", }); internal_static_context_EndPointNameList_descriptor = - getDescriptor().getMessageTypes().get(59); + getDescriptor().getMessageTypes().get(60); internal_static_context_EndPointNameList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointNameList_descriptor, new java.lang.String[] { "EndpointNames", }); internal_static_context_ConfigRule_Custom_descriptor = - getDescriptor().getMessageTypes().get(60); + getDescriptor().getMessageTypes().get(61); internal_static_context_ConfigRule_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_Custom_descriptor, new java.lang.String[] { "ResourceKey", "ResourceValue", }); internal_static_context_ConfigRule_ACL_descriptor = - getDescriptor().getMessageTypes().get(61); + getDescriptor().getMessageTypes().get(62); internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "RuleSet", }); internal_static_context_ConfigRule_descriptor = - getDescriptor().getMessageTypes().get(62); + getDescriptor().getMessageTypes().get(63); internal_static_context_ConfigRule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_descriptor, new java.lang.String[] { "Action", "Custom", "Acl", "ConfigRule", }); internal_static_context_Constraint_Custom_descriptor = - getDescriptor().getMessageTypes().get(63); + getDescriptor().getMessageTypes().get(64); internal_static_context_Constraint_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Custom_descriptor, new java.lang.String[] { "ConstraintType", "ConstraintValue", }); internal_static_context_Constraint_Schedule_descriptor = - getDescriptor().getMessageTypes().get(64); + getDescriptor().getMessageTypes().get(65); internal_static_context_Constraint_Schedule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Schedule_descriptor, new java.lang.String[] { "StartTimestamp", "DurationDays", }); internal_static_context_GPS_Position_descriptor = - getDescriptor().getMessageTypes().get(65); + getDescriptor().getMessageTypes().get(66); internal_static_context_GPS_Position_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_GPS_Position_descriptor, new java.lang.String[] { "Latitude", "Longitude", }); internal_static_context_Location_descriptor = - getDescriptor().getMessageTypes().get(66); + getDescriptor().getMessageTypes().get(67); internal_static_context_Location_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Location_descriptor, new java.lang.String[] { "Region", "GpsPosition", "Location", }); internal_static_context_Constraint_EndPointLocation_descriptor = - getDescriptor().getMessageTypes().get(67); + getDescriptor().getMessageTypes().get(68); internal_static_context_Constraint_EndPointLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_EndPointLocation_descriptor, new java.lang.String[] { "EndpointId", "Location", }); internal_static_context_Constraint_EndPointPriority_descriptor = - getDescriptor().getMessageTypes().get(68); + getDescriptor().getMessageTypes().get(69); internal_static_context_Constraint_EndPointPriority_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_EndPointPriority_descriptor, new java.lang.String[] { "EndpointId", "Priority", }); internal_static_context_Constraint_SLA_Latency_descriptor = - getDescriptor().getMessageTypes().get(69); + getDescriptor().getMessageTypes().get(70); internal_static_context_Constraint_SLA_Latency_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Latency_descriptor, new java.lang.String[] { "E2ELatencyMs", }); internal_static_context_Constraint_SLA_Capacity_descriptor = - getDescriptor().getMessageTypes().get(70); + getDescriptor().getMessageTypes().get(71); internal_static_context_Constraint_SLA_Capacity_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Capacity_descriptor, new java.lang.String[] { "CapacityGbps", }); internal_static_context_Constraint_SLA_Availability_descriptor = - getDescriptor().getMessageTypes().get(71); + getDescriptor().getMessageTypes().get(72); internal_static_context_Constraint_SLA_Availability_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Availability_descriptor, new java.lang.String[] { "NumDisjointPaths", "AllActive", "Availability", }); internal_static_context_Constraint_SLA_Isolation_level_descriptor = - getDescriptor().getMessageTypes().get(72); + getDescriptor().getMessageTypes().get(73); internal_static_context_Constraint_SLA_Isolation_level_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Isolation_level_descriptor, new java.lang.String[] { "IsolationLevel", }); internal_static_context_Constraint_Exclusions_descriptor = - getDescriptor().getMessageTypes().get(73); + getDescriptor().getMessageTypes().get(74); internal_static_context_Constraint_Exclusions_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Exclusions_descriptor, new java.lang.String[] { "IsPermanent", "DeviceIds", "EndpointIds", "LinkIds", }); internal_static_context_Constraint_descriptor = - getDescriptor().getMessageTypes().get(74); + getDescriptor().getMessageTypes().get(75); internal_static_context_Constraint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_descriptor, new java.lang.String[] { "Action", "Custom", "Schedule", "EndpointLocation", "EndpointPriority", "SlaCapacity", "SlaLatency", "SlaAvailability", "SlaIsolation", "Exclusions", "Constraint", }); internal_static_context_TeraFlowController_descriptor = - getDescriptor().getMessageTypes().get(75); + getDescriptor().getMessageTypes().get(76); internal_static_context_TeraFlowController_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_TeraFlowController_descriptor, new java.lang.String[] { "ContextId", "IpAddress", "Port", }); internal_static_context_AuthenticationResult_descriptor = - getDescriptor().getMessageTypes().get(76); + getDescriptor().getMessageTypes().get(77); internal_static_context_AuthenticationResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_AuthenticationResult_descriptor, diff --git a/src/ztp/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java b/src/ztp/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java index 98bdbbd2c..66ce0f8f2 100644 --- a/src/ztp/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java +++ b/src/ztp/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java @@ -283,22 +283,24 @@ public final class KpiSampleTypes { static { java.lang.String[] descriptorData = { "\n\026kpi_sample_types.proto\022\020kpi_sample_typ" + - "es*\327\004\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" + + "es*\260\005\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" + "KNOWN\020\000\022%\n!KPISAMPLETYPE_PACKETS_TRANSMI" + "TTED\020e\022\"\n\036KPISAMPLETYPE_PACKETS_RECEIVED" + "\020f\022!\n\035KPISAMPLETYPE_PACKETS_DROPPED\020g\022$\n" + "\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001\022!\n\034K" + "PISAMPLETYPE_BYTES_RECEIVED\020\312\001\022 \n\033KPISAM" + - "PLETYPE_BYTES_DROPPED\020\313\001\022 \n\033KPISAMPLETYP" + - "E_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLETYPE_OPTI" + - "CAL_SECURITY_STATUS\020\365\003\022)\n$KPISAMPLETYPE_" + - "L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KPISAMPLETY" + - "PE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&\n!KPISAMP" + - "LETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220\n+KPISAMP" + - "LETYPE_L3_UNIQUE_COMPROMISED_CLIENTS\020\334\004\022" + - ",\n\'KPISAMPLETYPE_L3_SECURITY_STATUS_CRYP" + - "TO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_LATENCY_M" + - "S\020\275\005b\006proto3" + "PLETYPE_BYTES_DROPPED\020\313\001\022+\n&KPISAMPLETYP" + + "E_LINK_TOTAL_CAPACITY_GBPS\020\255\002\022*\n%KPISAMP" + + "LETYPE_LINK_USED_CAPACITY_GBPS\020\256\002\022 \n\033KPI" + + "SAMPLETYPE_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLE" + + "TYPE_OPTICAL_SECURITY_STATUS\020\365\003\022)\n$KPISA" + + "MPLETYPE_L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KP" + + "ISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&" + + "\n!KPISAMPLETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220" + + "\n+KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CL" + + "IENTS\020\334\004\022,\n\'KPISAMPLETYPE_L3_SECURITY_ST" + + "ATUS_CRYPTO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_" + + "LATENCY_MS\020\275\005b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java index 38f026eb1..ef9ef6be6 100644 --- a/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java +++ b/src/ztp/target/generated-sources/grpc/monitoring/Monitoring.java @@ -154,6 +154,21 @@ public final class Monitoring { * .context.ConnectionId connection_id = 9; */ context.ContextOuterClass.ConnectionIdOrBuilder getConnectionIdOrBuilder(); + + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + boolean hasLinkId(); + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + context.ContextOuterClass.LinkId getLinkId(); + /** + * .context.LinkId link_id = 10; + */ + context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder(); } /** * Protobuf type {@code monitoring.KpiDescriptor} @@ -303,6 +318,19 @@ public final class Monitoring { break; } + case 82: { + context.ContextOuterClass.LinkId.Builder subBuilder = null; + if (linkId_ != null) { + subBuilder = linkId_.toBuilder(); + } + linkId_ = input.readMessage(context.ContextOuterClass.LinkId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(linkId_); + linkId_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -591,6 +619,32 @@ public final class Monitoring { return getConnectionId(); } + public static final int LINK_ID_FIELD_NUMBER = 10; + private context.ContextOuterClass.LinkId linkId_; + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + @java.lang.Override + public boolean hasLinkId() { + return linkId_ != null; + } + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + @java.lang.Override + public context.ContextOuterClass.LinkId getLinkId() { + return linkId_ == null ? context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } + /** + * .context.LinkId link_id = 10; + */ + @java.lang.Override + public context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder() { + return getLinkId(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -632,6 +686,9 @@ public final class Monitoring { if (connectionId_ != null) { output.writeMessage(9, getConnectionId()); } + if (linkId_ != null) { + output.writeMessage(10, getLinkId()); + } unknownFields.writeTo(output); } @@ -676,6 +733,10 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(9, getConnectionId()); } + if (linkId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, getLinkId()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -726,6 +787,11 @@ public final class Monitoring { if (!getConnectionId() .equals(other.getConnectionId())) return false; } + if (hasLinkId() != other.hasLinkId()) return false; + if (hasLinkId()) { + if (!getLinkId() + .equals(other.getLinkId())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -769,6 +835,10 @@ public final class Monitoring { hash = (37 * hash) + CONNECTION_ID_FIELD_NUMBER; hash = (53 * hash) + getConnectionId().hashCode(); } + if (hasLinkId()) { + hash = (37 * hash) + LINK_ID_FIELD_NUMBER; + hash = (53 * hash) + getLinkId().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -949,6 +1019,12 @@ public final class Monitoring { connectionId_ = null; connectionIdBuilder_ = null; } + if (linkIdBuilder_ == null) { + linkId_ = null; + } else { + linkId_ = null; + linkIdBuilder_ = null; + } return this; } @@ -1017,6 +1093,11 @@ public final class Monitoring { } else { result.connectionId_ = connectionIdBuilder_.build(); } + if (linkIdBuilder_ == null) { + result.linkId_ = linkId_; + } else { + result.linkId_ = linkIdBuilder_.build(); + } onBuilt(); return result; } @@ -1116,6 +1197,9 @@ public final class Monitoring { if (other.hasConnectionId()) { mergeConnectionId(other.getConnectionId()); } + if (other.hasLinkId()) { + mergeLinkId(other.getLinkId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2229,6 +2313,125 @@ public final class Monitoring { } return connectionIdBuilder_; } + + private context.ContextOuterClass.LinkId linkId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder> linkIdBuilder_; + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + public boolean hasLinkId() { + return linkIdBuilder_ != null || linkId_ != null; + } + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + public context.ContextOuterClass.LinkId getLinkId() { + if (linkIdBuilder_ == null) { + return linkId_ == null ? context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } else { + return linkIdBuilder_.getMessage(); + } + } + /** + * .context.LinkId link_id = 10; + */ + public Builder setLinkId(context.ContextOuterClass.LinkId value) { + if (linkIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + linkId_ = value; + onChanged(); + } else { + linkIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder setLinkId( + context.ContextOuterClass.LinkId.Builder builderForValue) { + if (linkIdBuilder_ == null) { + linkId_ = builderForValue.build(); + onChanged(); + } else { + linkIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder mergeLinkId(context.ContextOuterClass.LinkId value) { + if (linkIdBuilder_ == null) { + if (linkId_ != null) { + linkId_ = + context.ContextOuterClass.LinkId.newBuilder(linkId_).mergeFrom(value).buildPartial(); + } else { + linkId_ = value; + } + onChanged(); + } else { + linkIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder clearLinkId() { + if (linkIdBuilder_ == null) { + linkId_ = null; + onChanged(); + } else { + linkId_ = null; + linkIdBuilder_ = null; + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public context.ContextOuterClass.LinkId.Builder getLinkIdBuilder() { + + onChanged(); + return getLinkIdFieldBuilder().getBuilder(); + } + /** + * .context.LinkId link_id = 10; + */ + public context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder() { + if (linkIdBuilder_ != null) { + return linkIdBuilder_.getMessageOrBuilder(); + } else { + return linkId_ == null ? + context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } + } + /** + * .context.LinkId link_id = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder> + getLinkIdFieldBuilder() { + if (linkIdBuilder_ == null) { + linkIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder>( + getLinkId(), + getParentForChildren(), + isClean()); + linkId_ = null; + } + return linkIdBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -21361,7 +21564,7 @@ public final class Monitoring { static { java.lang.String[] descriptorData = { "\n\020monitoring.proto\022\nmonitoring\032\rcontext." + - "proto\032\026kpi_sample_types.proto\"\367\002\n\rKpiDes" + + "proto\032\026kpi_sample_types.proto\"\231\003\n\rKpiDes" + "criptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kpi" + "Id\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi_id_li" + "st\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi_sampl" + @@ -21371,91 +21574,92 @@ public final class Monitoring { "intId\022&\n\nservice_id\030\007 \001(\0132\022.context.Serv" + "iceId\022\"\n\010slice_id\030\010 \001(\0132\020.context.SliceI" + "d\022,\n\rconnection_id\030\t \001(\0132\025.context.Conne" + - "ctionId\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001" + - " \001(\0132\021.monitoring.KpiId\022\033\n\023monitoring_wi" + - "ndow_s\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\273\001" + - "\n\010KpiQuery\022\"\n\007kpi_ids\030\001 \003(\0132\021.monitoring" + - ".KpiId\022\033\n\023monitoring_window_s\030\002 \001(\002\022\026\n\016l" + - "ast_n_samples\030\003 \001(\r\022+\n\017start_timestamp\030\004" + - " \001(\0132\022.context.Timestamp\022)\n\rend_timestam" + - "p\030\005 \001(\0132\022.context.Timestamp\"X\n\006RawKpi\022%\n" + - "\ttimestamp\030\001 \001(\0132\022.context.Timestamp\022\'\n\t" + - "kpi_value\030\002 \001(\0132\024.monitoring.KpiValue\"U\n" + - "\nRawKpiList\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring" + - ".KpiId\022$\n\010raw_kpis\030\002 \003(\0132\022.monitoring.Ra" + - "wKpi\"<\n\013RawKpiTable\022-\n\rraw_kpi_lists\030\001 \003" + - "(\0132\026.monitoring.RawKpiList\"&\n\005KpiId\022\035\n\006k" + - "pi_id\030\001 \001(\0132\r.context.Uuid\"x\n\003Kpi\022!\n\006kpi" + - "_id\030\001 \001(\0132\021.monitoring.KpiId\022%\n\ttimestam" + - "p\030\002 \001(\0132\022.context.Timestamp\022\'\n\tkpi_value" + - "\030\003 \001(\0132\024.monitoring.KpiValue\"\250\001\n\rKpiValu" + - "eRange\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring" + - ".KpiValue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitor" + - "ing.KpiValue\022\017\n\007inRange\030\003 \001(\010\022\027\n\017include" + - "MinValue\030\004 \001(\010\022\027\n\017includeMaxValue\030\005 \001(\010\"" + - "\241\001\n\010KpiValue\022\022\n\010int32Val\030\001 \001(\005H\000\022\023\n\tuint" + - "32Val\030\002 \001(\rH\000\022\022\n\010int64Val\030\003 \001(\003H\000\022\023\n\tuin" + - "t64Val\030\004 \001(\004H\000\022\022\n\010floatVal\030\005 \001(\002H\000\022\023\n\tst" + - "ringVal\030\006 \001(\tH\000\022\021\n\007boolVal\030\007 \001(\010H\000B\007\n\005va" + - "lue\"\'\n\007KpiList\022\034\n\003kpi\030\001 \003(\0132\017.monitoring" + - ".Kpi\"K\n\021KpiDescriptorList\0226\n\023kpi_descrip" + - "tor_list\030\001 \003(\0132\031.monitoring.KpiDescripto" + - "r\"\362\001\n\016SubsDescriptor\022+\n\007subs_id\030\001 \001(\0132\032." + - "monitoring.SubscriptionID\022!\n\006kpi_id\030\002 \001(" + - "\0132\021.monitoring.KpiId\022\033\n\023sampling_duratio" + - "n_s\030\003 \001(\002\022\033\n\023sampling_interval_s\030\004 \001(\002\022+" + - "\n\017start_timestamp\030\005 \001(\0132\022.context.Timest" + - "amp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Tim" + - "estamp\"0\n\016SubscriptionID\022\036\n\007subs_id\030\001 \001(" + - "\0132\r.context.Uuid\"b\n\014SubsResponse\022+\n\007subs" + - "_id\030\001 \001(\0132\032.monitoring.SubscriptionID\022%\n" + - "\010kpi_list\030\002 \001(\0132\023.monitoring.KpiList\"?\n\010" + - "SubsList\0223\n\017subs_descriptor\030\001 \003(\0132\032.moni" + - "toring.SubsDescriptor\"\337\001\n\017AlarmDescripto" + - "r\022%\n\010alarm_id\030\001 \001(\0132\023.monitoring.AlarmID" + - "\022\031\n\021alarm_description\030\002 \001(\t\022\014\n\004name\030\003 \001(" + - "\t\022!\n\006kpi_id\030\004 \001(\0132\021.monitoring.KpiId\0222\n\017" + - "kpi_value_range\030\005 \001(\0132\031.monitoring.KpiVa" + - "lueRange\022%\n\ttimestamp\030\006 \001(\0132\022.context.Ti" + - "mestamp\"*\n\007AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.c" + - "ontext.Uuid\"}\n\021AlarmSubscription\022%\n\010alar" + - "m_id\030\001 \001(\0132\023.monitoring.AlarmID\022\036\n\026subsc" + - "ription_timeout_s\030\002 \001(\002\022!\n\031subscription_" + - "frequency_ms\030\003 \001(\002\"k\n\rAlarmResponse\022%\n\010a" + - "larm_id\030\001 \001(\0132\023.monitoring.AlarmID\022\014\n\004te" + - "xt\030\002 \001(\t\022%\n\010kpi_list\030\003 \001(\0132\023.monitoring." + - "KpiList\"B\n\tAlarmList\0225\n\020alarm_descriptor" + - "\030\001 \003(\0132\033.monitoring.AlarmDescriptor2\234\t\n\021" + - "MonitoringService\0228\n\006SetKpi\022\031.monitoring" + - ".KpiDescriptor\032\021.monitoring.KpiId\"\000\0220\n\tD" + - "eleteKpi\022\021.monitoring.KpiId\032\016.context.Em" + - "pty\"\000\022B\n\020GetKpiDescriptor\022\021.monitoring.K" + - "piId\032\031.monitoring.KpiDescriptor\"\000\022G\n\024Get" + - "KpiDescriptorList\022\016.context.Empty\032\035.moni" + - "toring.KpiDescriptorList\"\000\022/\n\nIncludeKpi" + - "\022\017.monitoring.Kpi\032\016.context.Empty\"\000\022=\n\nM" + - "onitorKpi\022\035.monitoring.MonitorKpiRequest" + - "\032\016.context.Empty\"\000\022?\n\014QueryKpiData\022\024.mon" + - "itoring.KpiQuery\032\027.monitoring.RawKpiTabl" + - "e\"\000\022N\n\022SetKpiSubscription\022\032.monitoring.S" + - "ubsDescriptor\032\030.monitoring.SubsResponse\"" + - "\0000\001\022M\n\021GetSubsDescriptor\022\032.monitoring.Su" + - "bscriptionID\032\032.monitoring.SubsDescriptor" + - "\"\000\022:\n\020GetSubscriptions\022\016.context.Empty\032\024" + - ".monitoring.SubsList\"\000\022B\n\022DeleteSubscrip" + - "tion\022\032.monitoring.SubscriptionID\032\016.conte" + - "xt.Empty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring.A" + - "larmDescriptor\032\023.monitoring.AlarmID\"\000\0224\n" + - "\tGetAlarms\022\016.context.Empty\032\025.monitoring." + - "AlarmList\"\000\022H\n\022GetAlarmDescriptor\022\023.moni" + - "toring.AlarmID\032\033.monitoring.AlarmDescrip" + - "tor\"\000\022V\n\026GetAlarmResponseStream\022\035.monito" + - "ring.AlarmSubscription\032\031.monitoring.Alar" + - "mResponse\"\0000\001\0224\n\013DeleteAlarm\022\023.monitorin" + - "g.AlarmID\032\016.context.Empty\"\000\0226\n\014GetStream" + - "Kpi\022\021.monitoring.KpiId\032\017.monitoring.Kpi\"" + - "\0000\001\0225\n\rGetInstantKpi\022\021.monitoring.KpiId\032" + - "\017.monitoring.Kpi\"\000b\006proto3" + "ctionId\022 \n\007link_id\030\n \001(\0132\017.context.LinkI" + + "d\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001 \001(\0132\021" + + ".monitoring.KpiId\022\033\n\023monitoring_window_s" + + "\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\273\001\n\010KpiQ" + + "uery\022\"\n\007kpi_ids\030\001 \003(\0132\021.monitoring.KpiId" + + "\022\033\n\023monitoring_window_s\030\002 \001(\002\022\026\n\016last_n_" + + "samples\030\003 \001(\r\022+\n\017start_timestamp\030\004 \001(\0132\022" + + ".context.Timestamp\022)\n\rend_timestamp\030\005 \001(" + + "\0132\022.context.Timestamp\"X\n\006RawKpi\022%\n\ttimes" + + "tamp\030\001 \001(\0132\022.context.Timestamp\022\'\n\tkpi_va" + + "lue\030\002 \001(\0132\024.monitoring.KpiValue\"U\n\nRawKp" + + "iList\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.KpiId" + + "\022$\n\010raw_kpis\030\002 \003(\0132\022.monitoring.RawKpi\"<" + + "\n\013RawKpiTable\022-\n\rraw_kpi_lists\030\001 \003(\0132\026.m" + + "onitoring.RawKpiList\"&\n\005KpiId\022\035\n\006kpi_id\030" + + "\001 \001(\0132\r.context.Uuid\"x\n\003Kpi\022!\n\006kpi_id\030\001 " + + "\001(\0132\021.monitoring.KpiId\022%\n\ttimestamp\030\002 \001(" + + "\0132\022.context.Timestamp\022\'\n\tkpi_value\030\003 \001(\013" + + "2\024.monitoring.KpiValue\"\250\001\n\rKpiValueRange" + + "\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring.KpiVa" + + "lue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitoring.Kp" + + "iValue\022\017\n\007inRange\030\003 \001(\010\022\027\n\017includeMinVal" + + "ue\030\004 \001(\010\022\027\n\017includeMaxValue\030\005 \001(\010\"\241\001\n\010Kp" + + "iValue\022\022\n\010int32Val\030\001 \001(\005H\000\022\023\n\tuint32Val\030" + + "\002 \001(\rH\000\022\022\n\010int64Val\030\003 \001(\003H\000\022\023\n\tuint64Val" + + "\030\004 \001(\004H\000\022\022\n\010floatVal\030\005 \001(\002H\000\022\023\n\tstringVa" + + "l\030\006 \001(\tH\000\022\021\n\007boolVal\030\007 \001(\010H\000B\007\n\005value\"\'\n" + + "\007KpiList\022\034\n\003kpi\030\001 \003(\0132\017.monitoring.Kpi\"K" + + "\n\021KpiDescriptorList\0226\n\023kpi_descriptor_li" + + "st\030\001 \003(\0132\031.monitoring.KpiDescriptor\"\362\001\n\016" + + "SubsDescriptor\022+\n\007subs_id\030\001 \001(\0132\032.monito" + + "ring.SubscriptionID\022!\n\006kpi_id\030\002 \001(\0132\021.mo" + + "nitoring.KpiId\022\033\n\023sampling_duration_s\030\003 " + + "\001(\002\022\033\n\023sampling_interval_s\030\004 \001(\002\022+\n\017star" + + "t_timestamp\030\005 \001(\0132\022.context.Timestamp\022)\n" + + "\rend_timestamp\030\006 \001(\0132\022.context.Timestamp" + + "\"0\n\016SubscriptionID\022\036\n\007subs_id\030\001 \001(\0132\r.co" + + "ntext.Uuid\"b\n\014SubsResponse\022+\n\007subs_id\030\001 " + + "\001(\0132\032.monitoring.SubscriptionID\022%\n\010kpi_l" + + "ist\030\002 \001(\0132\023.monitoring.KpiList\"?\n\010SubsLi" + + "st\0223\n\017subs_descriptor\030\001 \003(\0132\032.monitoring" + + ".SubsDescriptor\"\337\001\n\017AlarmDescriptor\022%\n\010a" + + "larm_id\030\001 \001(\0132\023.monitoring.AlarmID\022\031\n\021al" + + "arm_description\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022!\n\006k" + + "pi_id\030\004 \001(\0132\021.monitoring.KpiId\0222\n\017kpi_va" + + "lue_range\030\005 \001(\0132\031.monitoring.KpiValueRan" + + "ge\022%\n\ttimestamp\030\006 \001(\0132\022.context.Timestam" + + "p\"*\n\007AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.context" + + ".Uuid\"}\n\021AlarmSubscription\022%\n\010alarm_id\030\001" + + " \001(\0132\023.monitoring.AlarmID\022\036\n\026subscriptio" + + "n_timeout_s\030\002 \001(\002\022!\n\031subscription_freque" + + "ncy_ms\030\003 \001(\002\"k\n\rAlarmResponse\022%\n\010alarm_i" + + "d\030\001 \001(\0132\023.monitoring.AlarmID\022\014\n\004text\030\002 \001" + + "(\t\022%\n\010kpi_list\030\003 \001(\0132\023.monitoring.KpiLis" + + "t\"B\n\tAlarmList\0225\n\020alarm_descriptor\030\001 \003(\013" + + "2\033.monitoring.AlarmDescriptor2\234\t\n\021Monito" + + "ringService\0228\n\006SetKpi\022\031.monitoring.KpiDe" + + "scriptor\032\021.monitoring.KpiId\"\000\0220\n\tDeleteK" + + "pi\022\021.monitoring.KpiId\032\016.context.Empty\"\000\022" + + "B\n\020GetKpiDescriptor\022\021.monitoring.KpiId\032\031" + + ".monitoring.KpiDescriptor\"\000\022G\n\024GetKpiDes" + + "criptorList\022\016.context.Empty\032\035.monitoring" + + ".KpiDescriptorList\"\000\022/\n\nIncludeKpi\022\017.mon" + + "itoring.Kpi\032\016.context.Empty\"\000\022=\n\nMonitor" + + "Kpi\022\035.monitoring.MonitorKpiRequest\032\016.con" + + "text.Empty\"\000\022?\n\014QueryKpiData\022\024.monitorin" + + "g.KpiQuery\032\027.monitoring.RawKpiTable\"\000\022N\n" + + "\022SetKpiSubscription\022\032.monitoring.SubsDes" + + "criptor\032\030.monitoring.SubsResponse\"\0000\001\022M\n" + + "\021GetSubsDescriptor\022\032.monitoring.Subscrip" + + "tionID\032\032.monitoring.SubsDescriptor\"\000\022:\n\020" + + "GetSubscriptions\022\016.context.Empty\032\024.monit" + + "oring.SubsList\"\000\022B\n\022DeleteSubscription\022\032" + + ".monitoring.SubscriptionID\032\016.context.Emp" + + "ty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring.AlarmDe" + + "scriptor\032\023.monitoring.AlarmID\"\000\0224\n\tGetAl" + + "arms\022\016.context.Empty\032\025.monitoring.AlarmL" + + "ist\"\000\022H\n\022GetAlarmDescriptor\022\023.monitoring" + + ".AlarmID\032\033.monitoring.AlarmDescriptor\"\000\022" + + "V\n\026GetAlarmResponseStream\022\035.monitoring.A" + + "larmSubscription\032\031.monitoring.AlarmRespo" + + "nse\"\0000\001\0224\n\013DeleteAlarm\022\023.monitoring.Alar" + + "mID\032\016.context.Empty\"\000\0226\n\014GetStreamKpi\022\021." + + "monitoring.KpiId\032\017.monitoring.Kpi\"\0000\001\0225\n" + + "\rGetInstantKpi\022\021.monitoring.KpiId\032\017.moni" + + "toring.Kpi\"\000b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -21468,7 +21672,7 @@ public final class Monitoring { internal_static_monitoring_KpiDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptor_descriptor, - new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", "ConnectionId", }); + new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", "ConnectionId", "LinkId", }); internal_static_monitoring_MonitorKpiRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable = new diff --git a/src/ztp/target/kubernetes/kubernetes.yml b/src/ztp/target/kubernetes/kubernetes.yml index e3f363365..741c4d5cd 100644 --- a/src/ztp/target/kubernetes/kubernetes.yml +++ b/src/ztp/target/kubernetes/kubernetes.yml @@ -3,8 +3,8 @@ apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: 9d36a29ba5ef1fb46f7b51a5c477bdc4410ba548 - app.quarkus.io/build-timestamp: 2023-11-08 - 11:15:43 +0000 + app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -15,12 +15,12 @@ metadata: name: ztpservice spec: ports: - - name: grpc-server - port: 5050 - targetPort: 5050 - name: http port: 9192 targetPort: 8080 + - name: grpc-server + port: 5050 + targetPort: 5050 selector: app.kubernetes.io/name: ztpservice type: ClusterIP @@ -29,8 +29,8 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: 9d36a29ba5ef1fb46f7b51a5c477bdc4410ba548 - app.quarkus.io/build-timestamp: 2023-11-08 - 11:15:43 +0000 + app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -47,8 +47,8 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: 9d36a29ba5ef1fb46f7b51a5c477bdc4410ba548 - app.quarkus.io/build-timestamp: 2023-11-08 - 11:15:43 +0000 + app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -63,10 +63,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: CONTEXT_SERVICE_HOST - value: contextservice - name: DEVICE_SERVICE_HOST value: deviceservice + - name: CONTEXT_SERVICE_HOST + value: contextservice image: labs.etsi.org:5050/tfs/controller/ztp:0.2.0 imagePullPolicy: Always livenessProbe: @@ -81,12 +81,12 @@ spec: timeoutSeconds: 10 name: ztpservice ports: - - containerPort: 5050 - name: grpc-server - protocol: TCP - containerPort: 8080 name: http protocol: TCP + - containerPort: 5050 + name: grpc-server + protocol: TCP readinessProbe: failureThreshold: 3 httpGet: -- GitLab From 46486023929121fc955e9550fc8fd625ded433d2 Mon Sep 17 00:00:00 2001 From: pfamelis Date: Fri, 8 Dec 2023 16:20:50 +0200 Subject: [PATCH 2/3] refactor: moved eu.teraflow to org.etsi.tfs for ztp component --- src/policy/pom.xml | 2 +- .../etsi/tfs}/policy/PolicyGateway.java | 2 +- .../etsi/tfs}/policy/PolicyGatewayImpl.java | 2 +- .../PolicyRuleConditionFieldsGetter.java | 8 +- .../policy/PolicyRuleConditionValidator.java | 16 +- .../etsi/tfs}/policy/PolicyService.java | 8 +- .../etsi/tfs}/policy/PolicyServiceImpl.java | 62 +- .../etsi/tfs}/policy/Serializer.java | 136 +- .../etsi/tfs}/policy/SimpleLivenessCheck.java | 2 +- .../tfs}/policy/SimpleReadinessCheck.java | 2 +- .../etsi/tfs}/policy/acl/AclAction.java | 2 +- .../etsi/tfs}/policy/acl/AclEntry.java | 2 +- .../tfs}/policy/acl/AclForwardActionEnum.java | 2 +- .../tfs}/policy/acl/AclLogActionEnum.java | 2 +- .../etsi/tfs}/policy/acl/AclMatch.java | 2 +- .../etsi/tfs}/policy/acl/AclRuleSet.java | 4 +- .../etsi/tfs}/policy/acl/AclRuleTypeEnum.java | 2 +- .../etsi/tfs}/policy/common/Util.java | 2 +- .../tfs}/policy/context/ContextGateway.java | 12 +- .../policy/context/ContextGatewayImpl.java | 14 +- .../tfs}/policy/context/ContextService.java | 12 +- .../policy/context/ContextServiceImpl.java | 12 +- .../context/model/ConfigActionEnum.java | 2 +- .../tfs}/policy/context/model/ConfigRule.java | 2 +- .../policy/context/model/ConfigRuleAcl.java | 4 +- .../context/model/ConfigRuleCustom.java | 2 +- .../policy/context/model/ConfigRuleType.java | 2 +- .../context/model/ConfigRuleTypeAcl.java | 2 +- .../context/model/ConfigRuleTypeCustom.java | 2 +- .../tfs}/policy/context/model/Constraint.java | 2 +- .../context/model/ConstraintCustom.java | 2 +- .../model/ConstraintEndPointLocation.java | 2 +- .../context/model/ConstraintSchedule.java | 2 +- .../model/ConstraintSlaAvailability.java | 2 +- .../context/model/ConstraintSlaCapacity.java | 2 +- .../model/ConstraintSlaIsolationLevel.java | 4 +- .../context/model/ConstraintSlaLatency.java | 2 +- .../policy/context/model/ConstraintType.java | 2 +- .../context/model/ConstraintTypeCustom.java | 2 +- .../model/ConstraintTypeEndPointLocation.java | 2 +- .../context/model/ConstraintTypeSchedule.java | 2 +- .../model/ConstraintTypeSlaAvailability.java | 2 +- .../model/ConstraintTypeSlaCapacity.java | 2 +- .../ConstraintTypeSlaIsolationLevel.java | 2 +- .../model/ConstraintTypeSlaLatency.java | 2 +- .../tfs}/policy/context/model/Device.java | 4 +- .../policy/context/model/DeviceConfig.java | 4 +- .../context/model/DeviceDriverEnum.java | 2 +- .../model/DeviceOperationalStatus.java | 2 +- .../etsi/tfs}/policy/context/model/Empty.java | 2 +- .../tfs}/policy/context/model/EndPoint.java | 6 +- .../tfs}/policy/context/model/EndPointId.java | 2 +- .../etsi/tfs}/policy/context/model/Event.java | 2 +- .../policy/context/model/EventTypeEnum.java | 2 +- .../policy/context/model/GpsPosition.java | 2 +- .../context/model/IsolationLevelEnum.java | 2 +- .../tfs}/policy/context/model/Location.java | 2 +- .../policy/context/model/LocationType.java | 2 +- .../model/LocationTypeGpsPosition.java | 2 +- .../context/model/LocationTypeRegion.java | 2 +- .../tfs}/policy/context/model/Service.java | 4 +- .../policy/context/model/ServiceConfig.java | 4 +- .../tfs}/policy/context/model/ServiceId.java | 2 +- .../policy/context/model/ServiceStatus.java | 2 +- .../context/model/ServiceStatusEnum.java | 2 +- .../policy/context/model/ServiceTypeEnum.java | 2 +- .../tfs}/policy/context/model/SliceId.java | 2 +- .../tfs}/policy/context/model/TopologyId.java | 2 +- .../tfs}/policy/device/DeviceGateway.java | 8 +- .../tfs}/policy/device/DeviceGatewayImpl.java | 10 +- .../tfs}/policy/device/DeviceService.java | 8 +- .../tfs}/policy/device/DeviceServiceImpl.java | 8 +- .../kpi_sample_types/model/KpiSampleType.java | 2 +- .../tfs}/policy/model/BooleanOperator.java | 2 +- .../tfs}/policy/model/NumericalOperator.java | 2 +- .../etsi/tfs}/policy/model/PolicyRule.java | 2 +- .../tfs}/policy/model/PolicyRuleAction.java | 2 +- .../policy/model/PolicyRuleActionConfig.java | 2 +- .../policy/model/PolicyRuleActionEnum.java | 2 +- .../tfs}/policy/model/PolicyRuleBasic.java | 4 +- .../policy/model/PolicyRuleCondition.java | 4 +- .../tfs}/policy/model/PolicyRuleDevice.java | 4 +- .../tfs}/policy/model/PolicyRuleService.java | 6 +- .../tfs}/policy/model/PolicyRuleState.java | 2 +- .../policy/model/PolicyRuleStateEnum.java | 2 +- .../tfs}/policy/model/PolicyRuleType.java | 2 +- .../policy/model/PolicyRuleTypeDevice.java | 2 +- .../policy/model/PolicyRuleTypeService.java | 2 +- .../policy/monitoring/MonitoringGateway.java | 20 +- .../monitoring/MonitoringGatewayImpl.java | 22 +- .../policy/monitoring/MonitoringService.java | 20 +- .../monitoring/MonitoringServiceImpl.java | 18 +- .../monitoring/model/AlarmDescriptor.java | 2 +- .../monitoring/model/AlarmResponse.java | 4 +- .../monitoring/model/AlarmSubscription.java | 2 +- .../monitoring/model/BooleanKpiValue.java | 2 +- .../monitoring/model/FloatKpiValue.java | 2 +- .../monitoring/model/IntegerKpiValue.java | 2 +- .../tfs}/policy/monitoring/model/Kpi.java | 2 +- .../monitoring/model/KpiDescriptor.java | 10 +- .../policy/monitoring/model/KpiValue.java | 2 +- .../monitoring/model/KpiValueRange.java | 2 +- .../policy/monitoring/model/LongKpiValue.java | 2 +- .../monitoring/model/MonitorKpiRequest.java | 2 +- .../monitoring/model/StringKpiValue.java | 2 +- .../monitoring/model/SubsDescriptor.java | 2 +- .../policy/monitoring/model/SubsResponse.java | 4 +- .../tfs}/policy/service/ServiceGateway.java | 8 +- .../policy/service/ServiceGatewayImpl.java | 10 +- .../tfs}/policy/service/ServiceService.java | 8 +- .../policy/service/ServiceServiceImpl.java | 8 +- .../etsi/tfs}/policy/ConfigRuleTypeTest.java | 28 +- .../etsi/tfs}/policy/ConstraintTypeTest.java | 40 +- .../tfs}/policy/EndPointCreationTest.java | 14 +- .../etsi/tfs}/policy/LocationTypeTest.java | 8 +- .../policy/PolicyRuleBasicValidationTest.java | 24 +- .../PolicyRuleConditionValidationTest.java | 16 +- .../PolicyRuleDeviceValidationTest.java | 26 +- .../PolicyRuleServiceValidationTest.java | 58 +- .../etsi/tfs}/policy/PolicyServiceTest.java | 14 +- .../etsi/tfs}/policy/SerializerTest.java | 150 +- .../grpc/context/ContextOuterClass.java | 1411 +++++++++++++---- .../grpc/kpi_sample_types/KpiSampleTypes.java | 24 +- .../grpc/monitoring/Monitoring.java | 378 ++++- src/policy/target/kubernetes/kubernetes.yml | 86 +- 125 files changed, 1943 insertions(+), 982 deletions(-) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyGateway.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyGatewayImpl.java (99%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleConditionFieldsGetter.java (89%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleConditionValidator.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyService.java (85%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyServiceImpl.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/Serializer.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/SimpleLivenessCheck.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/SimpleReadinessCheck.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclAction.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclEntry.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclForwardActionEnum.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclLogActionEnum.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclMatch.java (98%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclRuleSet.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/acl/AclRuleTypeEnum.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/common/Util.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/ContextGateway.java (79%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/ContextGatewayImpl.java (91%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/ContextService.java (78%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/ContextServiceImpl.java (86%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigActionEnum.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRule.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRuleAcl.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRuleCustom.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRuleType.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRuleTypeAcl.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConfigRuleTypeCustom.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Constraint.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintCustom.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintEndPointLocation.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintSchedule.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintSlaAvailability.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintSlaCapacity.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintSlaIsolationLevel.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintSlaLatency.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintType.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeCustom.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeEndPointLocation.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeSchedule.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeSlaAvailability.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeSlaCapacity.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeSlaIsolationLevel.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ConstraintTypeSlaLatency.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Device.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/DeviceConfig.java (92%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/DeviceDriverEnum.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/DeviceOperationalStatus.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Empty.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/EndPoint.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/EndPointId.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Event.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/EventTypeEnum.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/GpsPosition.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/IsolationLevelEnum.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Location.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/LocationType.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/LocationTypeGpsPosition.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/LocationTypeRegion.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/Service.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ServiceConfig.java (92%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ServiceId.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ServiceStatus.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ServiceStatusEnum.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/ServiceTypeEnum.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/SliceId.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/context/model/TopologyId.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/device/DeviceGateway.java (81%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/device/DeviceGatewayImpl.java (90%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/device/DeviceService.java (81%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/device/DeviceServiceImpl.java (88%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/kpi_sample_types/model/KpiSampleType.java (94%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/BooleanOperator.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/NumericalOperator.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRule.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleAction.java (98%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleActionConfig.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleActionEnum.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleBasic.java (98%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleCondition.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleDevice.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleService.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleState.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleStateEnum.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleType.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleTypeDevice.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/model/PolicyRuleTypeService.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/MonitoringGateway.java (72%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/MonitoringGatewayImpl.java (89%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/MonitoringService.java (72%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/MonitoringServiceImpl.java (83%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/AlarmDescriptor.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/AlarmResponse.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/AlarmSubscription.java (97%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/BooleanKpiValue.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/FloatKpiValue.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/IntegerKpiValue.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/Kpi.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/KpiDescriptor.java (89%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/KpiValue.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/KpiValueRange.java (98%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/LongKpiValue.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/MonitorKpiRequest.java (96%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/StringKpiValue.java (95%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/SubsDescriptor.java (98%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/monitoring/model/SubsResponse.java (93%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/service/ServiceGateway.java (81%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/service/ServiceGatewayImpl.java (91%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/service/ServiceService.java (81%) rename src/policy/src/main/java/{eu/teraflow => org/etsi/tfs}/policy/service/ServiceServiceImpl.java (87%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/ConfigRuleTypeTest.java (80%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/ConstraintTypeTest.java (79%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/EndPointCreationTest.java (93%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/LocationTypeTest.java (88%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleBasicValidationTest.java (96%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleConditionValidationTest.java (92%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleDeviceValidationTest.java (91%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyRuleServiceValidationTest.java (88%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/PolicyServiceTest.java (96%) rename src/policy/src/test/java/{eu/teraflow => org/etsi/tfs}/policy/SerializerTest.java (97%) diff --git a/src/policy/pom.xml b/src/policy/pom.xml index 267006311..ce873a2d8 100644 --- a/src/policy/pom.xml +++ b/src/policy/pom.xml @@ -19,7 +19,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - eu.teraflow + org.etsi.tfs policy 0.1.0 TeraFlow Policy Component diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyGateway.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyGateway.java index c5570af74..2dd059ac8 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyGateway.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import policy.PolicyService; diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyGatewayImpl.java similarity index 99% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyGatewayImpl.java index 30e888d9f..c7bb58e52 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyGatewayImpl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import context.ContextOuterClass.ServiceId; import io.quarkus.grpc.GrpcService; diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionFieldsGetter.java similarity index 89% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionFieldsGetter.java index 89330354e..8a863abaa 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionFieldsGetter.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.monitoring.model.KpiValue; import java.util.List; import java.util.stream.Collectors; import javax.inject.Singleton; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.monitoring.model.KpiValue; @Singleton public class PolicyRuleConditionFieldsGetter { diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionValidator.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionValidator.java index a1556ffbd..3e40cdb6c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionValidator.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package eu.teraflow.policy; - -import eu.teraflow.policy.context.ContextService; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.model.PolicyRuleService; +package org.etsi.tfs.policy; + import io.smallrye.mutiny.Uni; import java.util.ArrayList; import java.util.List; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.ContextService; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.model.PolicyRuleService; import org.jboss.logging.Logger; @ApplicationScoped diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyService.java similarity index 85% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyService.java index 556e35032..c0521c192 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; -import eu.teraflow.policy.model.PolicyRuleDevice; -import eu.teraflow.policy.model.PolicyRuleService; -import eu.teraflow.policy.model.PolicyRuleState; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.model.PolicyRuleDevice; +import org.etsi.tfs.policy.model.PolicyRuleService; +import org.etsi.tfs.policy.model.PolicyRuleState; public interface PolicyService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyServiceImpl.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/PolicyServiceImpl.java index 48ca52dd6..b5f1d85eb 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/PolicyServiceImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/PolicyServiceImpl.java @@ -14,37 +14,8 @@ * limitations under the License. */ -package eu.teraflow.policy; - -import eu.teraflow.policy.context.ContextService; -import eu.teraflow.policy.context.model.ConfigActionEnum; -import eu.teraflow.policy.context.model.ConfigRule; -import eu.teraflow.policy.context.model.ConfigRuleCustom; -import eu.teraflow.policy.context.model.ConfigRuleTypeCustom; -import eu.teraflow.policy.context.model.Constraint; -import eu.teraflow.policy.context.model.ConstraintCustom; -import eu.teraflow.policy.context.model.ConstraintTypeCustom; -import eu.teraflow.policy.context.model.ServiceConfig; -import eu.teraflow.policy.device.DeviceService; -import eu.teraflow.policy.model.BooleanOperator; -import eu.teraflow.policy.model.PolicyRule; -import eu.teraflow.policy.model.PolicyRuleAction; -import eu.teraflow.policy.model.PolicyRuleActionConfig; -import eu.teraflow.policy.model.PolicyRuleActionEnum; -import eu.teraflow.policy.model.PolicyRuleBasic; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.model.PolicyRuleDevice; -import eu.teraflow.policy.model.PolicyRuleService; -import eu.teraflow.policy.model.PolicyRuleState; -import eu.teraflow.policy.model.PolicyRuleStateEnum; -import eu.teraflow.policy.model.PolicyRuleTypeDevice; -import eu.teraflow.policy.model.PolicyRuleTypeService; -import eu.teraflow.policy.monitoring.MonitoringService; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.KpiValueRange; -import eu.teraflow.policy.service.ServiceService; +package org.etsi.tfs.policy; + import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import io.smallrye.mutiny.groups.UniJoin; @@ -58,6 +29,35 @@ import java.util.Random; import java.util.concurrent.ConcurrentHashMap; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.ContextService; +import org.etsi.tfs.policy.context.model.ConfigActionEnum; +import org.etsi.tfs.policy.context.model.ConfigRule; +import org.etsi.tfs.policy.context.model.ConfigRuleCustom; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.policy.context.model.Constraint; +import org.etsi.tfs.policy.context.model.ConstraintCustom; +import org.etsi.tfs.policy.context.model.ConstraintTypeCustom; +import org.etsi.tfs.policy.context.model.ServiceConfig; +import org.etsi.tfs.policy.device.DeviceService; +import org.etsi.tfs.policy.model.BooleanOperator; +import org.etsi.tfs.policy.model.PolicyRule; +import org.etsi.tfs.policy.model.PolicyRuleAction; +import org.etsi.tfs.policy.model.PolicyRuleActionConfig; +import org.etsi.tfs.policy.model.PolicyRuleActionEnum; +import org.etsi.tfs.policy.model.PolicyRuleBasic; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.model.PolicyRuleDevice; +import org.etsi.tfs.policy.model.PolicyRuleService; +import org.etsi.tfs.policy.model.PolicyRuleState; +import org.etsi.tfs.policy.model.PolicyRuleStateEnum; +import org.etsi.tfs.policy.model.PolicyRuleTypeDevice; +import org.etsi.tfs.policy.model.PolicyRuleTypeService; +import org.etsi.tfs.policy.monitoring.MonitoringService; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.KpiValueRange; +import org.etsi.tfs.policy.service.ServiceService; import org.jboss.logging.Logger; @ApplicationScoped diff --git a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java b/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/Serializer.java rename to src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java index 4f0c60092..b7de8ff99 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import acl.Acl; import context.ContextOuterClass; @@ -25,73 +25,6 @@ import context.ContextOuterClass.DeviceId; import context.ContextOuterClass.DeviceOperationalStatusEnum; import context.ContextOuterClass.Location.LocationCase; import context.ContextOuterClass.Uuid; -import eu.teraflow.policy.acl.AclAction; -import eu.teraflow.policy.acl.AclEntry; -import eu.teraflow.policy.acl.AclForwardActionEnum; -import eu.teraflow.policy.acl.AclLogActionEnum; -import eu.teraflow.policy.acl.AclMatch; -import eu.teraflow.policy.acl.AclRuleSet; -import eu.teraflow.policy.acl.AclRuleTypeEnum; -import eu.teraflow.policy.context.model.ConfigActionEnum; -import eu.teraflow.policy.context.model.ConfigRule; -import eu.teraflow.policy.context.model.ConfigRuleAcl; -import eu.teraflow.policy.context.model.ConfigRuleCustom; -import eu.teraflow.policy.context.model.ConfigRuleTypeAcl; -import eu.teraflow.policy.context.model.ConfigRuleTypeCustom; -import eu.teraflow.policy.context.model.Constraint; -import eu.teraflow.policy.context.model.ConstraintCustom; -import eu.teraflow.policy.context.model.ConstraintEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintSchedule; -import eu.teraflow.policy.context.model.ConstraintSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintSlaLatency; -import eu.teraflow.policy.context.model.ConstraintTypeCustom; -import eu.teraflow.policy.context.model.ConstraintTypeEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintTypeSchedule; -import eu.teraflow.policy.context.model.ConstraintTypeSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintTypeSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintTypeSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintTypeSlaLatency; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.DeviceDriverEnum; -import eu.teraflow.policy.context.model.DeviceOperationalStatus; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.EndPoint; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.Event; -import eu.teraflow.policy.context.model.EventTypeEnum; -import eu.teraflow.policy.context.model.GpsPosition; -import eu.teraflow.policy.context.model.IsolationLevelEnum; -import eu.teraflow.policy.context.model.Location; -import eu.teraflow.policy.context.model.LocationTypeGpsPosition; -import eu.teraflow.policy.context.model.LocationTypeRegion; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceConfig; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.context.model.ServiceStatus; -import eu.teraflow.policy.context.model.ServiceStatusEnum; -import eu.teraflow.policy.context.model.ServiceTypeEnum; -import eu.teraflow.policy.context.model.SliceId; -import eu.teraflow.policy.context.model.TopologyId; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.policy.model.*; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.BooleanKpiValue; -import eu.teraflow.policy.monitoring.model.FloatKpiValue; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.Kpi; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.KpiValue; -import eu.teraflow.policy.monitoring.model.KpiValueRange; -import eu.teraflow.policy.monitoring.model.LongKpiValue; -import eu.teraflow.policy.monitoring.model.MonitorKpiRequest; -import eu.teraflow.policy.monitoring.model.StringKpiValue; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; -import eu.teraflow.policy.monitoring.model.SubsResponse; import java.util.ArrayList; import java.util.List; import java.util.stream.Collectors; @@ -101,6 +34,73 @@ import monitoring.Monitoring; import monitoring.Monitoring.AlarmID; import monitoring.Monitoring.KpiId; import monitoring.Monitoring.SubscriptionID; +import org.etsi.tfs.policy.acl.AclAction; +import org.etsi.tfs.policy.acl.AclEntry; +import org.etsi.tfs.policy.acl.AclForwardActionEnum; +import org.etsi.tfs.policy.acl.AclLogActionEnum; +import org.etsi.tfs.policy.acl.AclMatch; +import org.etsi.tfs.policy.acl.AclRuleSet; +import org.etsi.tfs.policy.acl.AclRuleTypeEnum; +import org.etsi.tfs.policy.context.model.ConfigActionEnum; +import org.etsi.tfs.policy.context.model.ConfigRule; +import org.etsi.tfs.policy.context.model.ConfigRuleAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleCustom; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.policy.context.model.Constraint; +import org.etsi.tfs.policy.context.model.ConstraintCustom; +import org.etsi.tfs.policy.context.model.ConstraintEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintSchedule; +import org.etsi.tfs.policy.context.model.ConstraintSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintSlaLatency; +import org.etsi.tfs.policy.context.model.ConstraintTypeCustom; +import org.etsi.tfs.policy.context.model.ConstraintTypeEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintTypeSchedule; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaLatency; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.DeviceDriverEnum; +import org.etsi.tfs.policy.context.model.DeviceOperationalStatus; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.EndPoint; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.Event; +import org.etsi.tfs.policy.context.model.EventTypeEnum; +import org.etsi.tfs.policy.context.model.GpsPosition; +import org.etsi.tfs.policy.context.model.IsolationLevelEnum; +import org.etsi.tfs.policy.context.model.Location; +import org.etsi.tfs.policy.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceConfig; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.context.model.ServiceStatus; +import org.etsi.tfs.policy.context.model.ServiceStatusEnum; +import org.etsi.tfs.policy.context.model.ServiceTypeEnum; +import org.etsi.tfs.policy.context.model.SliceId; +import org.etsi.tfs.policy.context.model.TopologyId; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.policy.model.*; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.BooleanKpiValue; +import org.etsi.tfs.policy.monitoring.model.FloatKpiValue; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.Kpi; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.KpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValueRange; +import org.etsi.tfs.policy.monitoring.model.LongKpiValue; +import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; +import org.etsi.tfs.policy.monitoring.model.StringKpiValue; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; +import org.etsi.tfs.policy.monitoring.model.SubsResponse; import policy.Policy; import policy.Policy.PolicyRuleId; import policy.PolicyAction; diff --git a/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java b/src/policy/src/main/java/org/etsi/tfs/policy/SimpleLivenessCheck.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java rename to src/policy/src/main/java/org/etsi/tfs/policy/SimpleLivenessCheck.java index ec0859cb7..b03d92076 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/SimpleLivenessCheck.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/SimpleLivenessCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; diff --git a/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java b/src/policy/src/main/java/org/etsi/tfs/policy/SimpleReadinessCheck.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java rename to src/policy/src/main/java/org/etsi/tfs/policy/SimpleReadinessCheck.java index 7bbfd38c3..93728b48c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/SimpleReadinessCheck.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/SimpleReadinessCheck.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import javax.enterprise.context.ApplicationScoped; import org.eclipse.microprofile.health.HealthCheck; diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclAction.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclAction.java index eb2fdc33b..e2328b184 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclAction.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public class AclAction { diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclEntry.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclEntry.java index 08ff7b0ad..69d44e858 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclEntry.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclEntry.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public class AclEntry { diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclForwardActionEnum.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclForwardActionEnum.java index b42fe12e6..667982d7b 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclForwardActionEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclForwardActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public enum AclForwardActionEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclLogActionEnum.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclLogActionEnum.java index df814f35d..cd10e9421 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclLogActionEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclLogActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public enum AclLogActionEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclMatch.java similarity index 98% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclMatch.java index b6ec8ff76..e9464fce7 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclMatch.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclMatch.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public class AclMatch { diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleSet.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleSet.java index 584ae6097..aa645725c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleSet.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleSet.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class AclRuleSet { diff --git a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleTypeEnum.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleTypeEnum.java index 70788feda..a0dba786e 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/acl/AclRuleTypeEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/acl/AclRuleTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.acl; +package org.etsi.tfs.policy.acl; public enum AclRuleTypeEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java b/src/policy/src/main/java/org/etsi/tfs/policy/common/Util.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/common/Util.java rename to src/policy/src/main/java/org/etsi/tfs/policy/common/Util.java index 889f44fee..f15f7dddc 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/common/Util.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/common/Util.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.common; +package org.etsi.tfs.policy.common; import java.util.List; import java.util.stream.Collectors; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGateway.java similarity index 79% rename from src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGateway.java index de2d32772..42c82baa4 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGateway.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGateway.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy.context; +package org.etsi.tfs.policy.context; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.model.PolicyRule; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.model.PolicyRule; public interface ContextGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGatewayImpl.java similarity index 91% rename from src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGatewayImpl.java index 3b4754c8a..7a5c63455 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextGatewayImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextGatewayImpl.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package eu.teraflow.policy.context; +package org.etsi.tfs.policy.context; import context.MutinyContextServiceGrpc.MutinyContextServiceStub; import context_policy.MutinyContextPolicyServiceGrpc.MutinyContextPolicyServiceStub; -import eu.teraflow.policy.Serializer; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.model.PolicyRule; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.Serializer; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.model.PolicyRule; @ApplicationScoped public class ContextGatewayImpl implements ContextGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextService.java similarity index 78% rename from src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/ContextService.java index 20574e8af..a8a81ed31 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy.context; +package org.etsi.tfs.policy.context; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.model.PolicyRule; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.model.PolicyRule; public interface ContextService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextServiceImpl.java similarity index 86% rename from src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/ContextServiceImpl.java index 7e52ade3c..662ded654 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/ContextServiceImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/ContextServiceImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package eu.teraflow.policy.context; +package org.etsi.tfs.policy.context; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.model.PolicyRule; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.model.PolicyRule; @ApplicationScoped public class ContextServiceImpl implements ContextService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigActionEnum.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigActionEnum.java index c2de24402..d726ccfad 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigActionEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum ConfigActionEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRule.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRule.java index 60ffba562..72069456d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRule.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConfigRule { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleAcl.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleAcl.java index 9a022a9c6..041278364 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleAcl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleAcl.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.acl.AclRuleSet; +import org.etsi.tfs.policy.acl.AclRuleSet; public class ConfigRuleAcl { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleCustom.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleCustom.java index c8e64f192..de726e9a2 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleCustom.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConfigRuleCustom { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleType.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleType.java index 2cd3528bf..4106c8e16 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleType.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public interface ConfigRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeAcl.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeAcl.java index 35c63468d..3f2ec9cfb 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeAcl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeAcl.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConfigRuleTypeAcl implements ConfigRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeCustom.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeCustom.java index 5d6ac1246..021562e70 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConfigRuleTypeCustom.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConfigRuleTypeCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConfigRuleTypeCustom implements ConfigRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Constraint.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Constraint.java index 7403a94f4..359c8f471 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Constraint.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Constraint.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class Constraint { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintCustom.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintCustom.java index d5b196d3d..43c907ddf 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintCustom.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintCustom { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintEndPointLocation.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintEndPointLocation.java index 0852f2fe2..79bbad2e0 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintEndPointLocation.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintEndPointLocation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintEndPointLocation { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSchedule.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSchedule.java index a450d2244..be31d0c23 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSchedule.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSchedule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintSchedule { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaAvailability.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaAvailability.java index 9daf6e31a..af694eafa 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaAvailability.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaAvailability.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintSlaAvailability { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaCapacity.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaCapacity.java index db3bc1cdd..50f7225a0 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaCapacity.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaCapacity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintSlaCapacity { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaIsolationLevel.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaIsolationLevel.java index 7d8736942..da85e2db8 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaIsolationLevel.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaIsolationLevel.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class ConstraintSlaIsolationLevel { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaLatency.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaLatency.java index ef28227bd..b99ead6d0 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintSlaLatency.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintSlaLatency.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintSlaLatency { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintType.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintType.java index 0202399ad..51845ed8d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintType.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public interface ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeCustom.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeCustom.java index 447a3edd3..1e85f4675 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeCustom.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeCustom.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeCustom implements ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeEndPointLocation.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeEndPointLocation.java index b35832b7d..76375f4af 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeEndPointLocation.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeEndPointLocation.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeEndPointLocation implements ConstraintType { private final ConstraintEndPointLocation constraintEndPointLocation; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSchedule.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSchedule.java index 3120d376c..9bd355590 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSchedule.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSchedule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeSchedule implements ConstraintType { private final ConstraintSchedule constraintSchedule; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaAvailability.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaAvailability.java index 1486c83be..00be6537d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaAvailability.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaAvailability.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeSlaAvailability implements ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaCapacity.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaCapacity.java index dd3fd7037..5965dafa8 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaCapacity.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaCapacity.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeSlaCapacity implements ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaIsolationLevel.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaIsolationLevel.java index 7cf05a416..bac00a37c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaIsolationLevel.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaIsolationLevel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeSlaIsolationLevel implements ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaLatency.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaLatency.java index 20a285902..0e970167b 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ConstraintTypeSlaLatency.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ConstraintTypeSlaLatency.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ConstraintTypeSlaLatency implements ConstraintType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Device.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Device.java index 06c6d4c5c..3cff3decd 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Device.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Device.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class Device { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceConfig.java similarity index 92% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceConfig.java index 815589b55..a6645cd93 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceConfig.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class DeviceConfig { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java index e4198b9d0..63e96a4c6 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum DeviceDriverEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceOperationalStatus.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceOperationalStatus.java index 4a7dc438c..d5d960646 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceOperationalStatus.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceOperationalStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum DeviceOperationalStatus { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Empty.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Empty.java index a81bed099..b334a0af6 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Empty.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Empty.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class Empty { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPoint.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPoint.java index 6e1056408..ad1e847f9 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPoint.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPoint.java @@ -14,11 +14,11 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; import java.util.List; +import org.etsi.tfs.policy.common.Util; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; public class EndPoint { private final EndPointId endPointId; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPointId.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPointId.java index 834081e59..6e626014c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EndPointId.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EndPointId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class EndPointId { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Event.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Event.java index 05ba64513..49fcf3822 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Event.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Event.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class Event { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EventTypeEnum.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/EventTypeEnum.java index cde7e1885..e2e331f66 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/EventTypeEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/EventTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum EventTypeEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/GpsPosition.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/GpsPosition.java index 14bd2cb99..ef214f754 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/GpsPosition.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/GpsPosition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class GpsPosition { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/IsolationLevelEnum.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/IsolationLevelEnum.java index 4b6e129d1..d5f5884d9 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/IsolationLevelEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/IsolationLevelEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum IsolationLevelEnum { NO_ISOLATION, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Location.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Location.java index c6a00a6a7..01cdb7ac6 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Location.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Location.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class Location { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationType.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationType.java index f88d30db7..35c1c1110 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationType.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public interface LocationType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeGpsPosition.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeGpsPosition.java index f01002413..6995b8556 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeGpsPosition.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeGpsPosition.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class LocationTypeGpsPosition implements LocationType { private final GpsPosition gpsPosition; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeRegion.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeRegion.java index 94b88ca7a..cd1ec621d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/LocationTypeRegion.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/LocationTypeRegion.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class LocationTypeRegion implements LocationType { private final String region; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Service.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/Service.java index e3456b326..5d8a3897e 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/Service.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/Service.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class Service { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceConfig.java similarity index 92% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceConfig.java index a99c949d1..9fff5f0e2 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceConfig.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceConfig.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class ServiceConfig { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceId.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceId.java index 81763a9de..324cb8f14 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceId.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ServiceId { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatus.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatus.java index 5fd6dfa26..81c12e790 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatus.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatus.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class ServiceStatus { diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatusEnum.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatusEnum.java index 353b78eba..a9c4ea054 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceStatusEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceStatusEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum ServiceStatusEnum { UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceTypeEnum.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceTypeEnum.java index 45215ca00..84730d25a 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/ServiceTypeEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/ServiceTypeEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public enum ServiceTypeEnum { UNKNOWN, diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/SliceId.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/SliceId.java index ee1dc7d2f..ddd453bc3 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/SliceId.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/SliceId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class SliceId { private final String contextId; diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/TopologyId.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java rename to src/policy/src/main/java/org/etsi/tfs/policy/context/model/TopologyId.java index 5997291d1..172286d33 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/context/model/TopologyId.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/TopologyId.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.context.model; +package org.etsi.tfs.policy.context.model; public class TopologyId { diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGateway.java similarity index 81% rename from src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java rename to src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGateway.java index bd2487fe5..35e51e8d7 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGateway.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGateway.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.device; +package org.etsi.tfs.policy.device; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.Empty; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.Empty; public interface DeviceGateway { Uni getInitialConfiguration(String deviceId); diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGatewayImpl.java similarity index 90% rename from src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGatewayImpl.java index 3cb88fe08..7233e8c02 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceGatewayImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceGatewayImpl.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package eu.teraflow.policy.device; +package org.etsi.tfs.policy.device; import device.DeviceService; -import eu.teraflow.policy.Serializer; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.Empty; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.Serializer; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.Empty; @ApplicationScoped public class DeviceGatewayImpl implements DeviceGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceService.java similarity index 81% rename from src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceService.java index 4e7419a6a..e6c898945 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.device; +package org.etsi.tfs.policy.device; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.Empty; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.Empty; public interface DeviceService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceServiceImpl.java similarity index 88% rename from src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceServiceImpl.java index c7bae1214..ce6f82237 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/device/DeviceServiceImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/device/DeviceServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy.device; +package org.etsi.tfs.policy.device; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.Empty; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.Empty; @ApplicationScoped public class DeviceServiceImpl implements DeviceService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java b/src/policy/src/main/java/org/etsi/tfs/policy/kpi_sample_types/model/KpiSampleType.java similarity index 94% rename from src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java rename to src/policy/src/main/java/org/etsi/tfs/policy/kpi_sample_types/model/KpiSampleType.java index 12551339d..384d7e10f 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/kpi_sample_types/model/KpiSampleType.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/kpi_sample_types/model/KpiSampleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.kpi_sample_types.model; +package org.etsi.tfs.policy.kpi_sample_types.model; public enum KpiSampleType { UNKNOWN, diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/BooleanOperator.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/BooleanOperator.java index 1c8208ebd..85133fc53 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/BooleanOperator.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/BooleanOperator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public enum BooleanOperator { POLICYRULE_CONDITION_BOOLEAN_UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/NumericalOperator.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/NumericalOperator.java index 3d59ac0a7..bc66490dd 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/NumericalOperator.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/NumericalOperator.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public enum NumericalOperator { POLICY_RULE_CONDITION_NUMERICAL_UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRule.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRule.java index 177bf85f6..b879dbd7b 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRule.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public class PolicyRule { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleAction.java similarity index 98% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleAction.java index 2c9bcae09..f6b6d2e2f 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleAction.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleAction.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; import java.util.List; import java.util.stream.Collectors; diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionConfig.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionConfig.java index 871fd933a..d815a3e9e 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionConfig.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionConfig.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public class PolicyRuleActionConfig { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionEnum.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionEnum.java index 971dfbaf2..a29f46133 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleActionEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleActionEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public enum PolicyRuleActionEnum { POLICY_RULE_ACTION_NO_ACTION, diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleBasic.java similarity index 98% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleBasic.java index 9b6c32828..ea00ea3fc 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleBasic.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleBasic.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; import static com.google.common.base.Preconditions.checkArgument; -import eu.teraflow.policy.common.Util; import java.util.ArrayList; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class PolicyRuleBasic { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleCondition.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleCondition.java index 9b7de240d..a293395af 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleCondition.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleCondition.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkNotNull; -import eu.teraflow.policy.monitoring.model.KpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValue; public class PolicyRuleCondition { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleDevice.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleDevice.java index 516cc9690..9c23692a1 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleDevice.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleDevice.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; import static com.google.common.base.Preconditions.checkArgument; -import eu.teraflow.policy.common.Util; import java.util.ArrayList; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class PolicyRuleDevice { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleService.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleService.java index 9d362919a..1f507ebc9 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleService.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; import static com.google.common.base.Preconditions.checkArgument; -import eu.teraflow.policy.common.Util; -import eu.teraflow.policy.context.model.ServiceId; import java.util.ArrayList; import java.util.List; +import org.etsi.tfs.policy.common.Util; +import org.etsi.tfs.policy.context.model.ServiceId; public class PolicyRuleService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleState.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleState.java index 1102e4778..3a2c5ba42 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleState.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleState.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public class PolicyRuleState { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleStateEnum.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleStateEnum.java index 749ca389e..4e5349149 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleStateEnum.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleStateEnum.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public enum PolicyRuleStateEnum { POLICY_UNDEFINED, diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleType.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleType.java index b3389f6a9..b013e48ef 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleType.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleType.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public interface PolicyRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeDevice.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeDevice.java index d262f254b..34c4dc3f0 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeDevice.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeDevice.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public class PolicyRuleTypeDevice implements PolicyRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeService.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeService.java index 54978476f..88f83aa83 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/model/PolicyRuleTypeService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/model/PolicyRuleTypeService.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.model; +package org.etsi.tfs.policy.model; public class PolicyRuleTypeService implements PolicyRuleType { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGateway.java similarity index 72% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGateway.java index 89e9152c6..63174b880 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGateway.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGateway.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring; - -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.MonitorKpiRequest; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; -import eu.teraflow.policy.monitoring.model.SubsResponse; +package org.etsi.tfs.policy.monitoring; + import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; +import org.etsi.tfs.policy.monitoring.model.SubsResponse; public interface MonitoringGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGatewayImpl.java similarity index 89% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGatewayImpl.java index cc6c97f32..3c16dff7e 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringGatewayImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringGatewayImpl.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring; - -import eu.teraflow.policy.Serializer; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.MonitorKpiRequest; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; -import eu.teraflow.policy.monitoring.model.SubsResponse; +package org.etsi.tfs.policy.monitoring; + import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; import monitoring.MutinyMonitoringServiceGrpc.MutinyMonitoringServiceStub; +import org.etsi.tfs.policy.Serializer; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; +import org.etsi.tfs.policy.monitoring.model.SubsResponse; @ApplicationScoped public class MonitoringGatewayImpl implements MonitoringGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringService.java similarity index 72% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringService.java index 6010ec04a..5d8e28944 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringService.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring; - -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.MonitorKpiRequest; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; -import eu.teraflow.policy.monitoring.model.SubsResponse; +package org.etsi.tfs.policy.monitoring; + import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; +import org.etsi.tfs.policy.monitoring.model.SubsResponse; public interface MonitoringService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringServiceImpl.java similarity index 83% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringServiceImpl.java index a3f9f223b..4da193b1d 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/MonitoringServiceImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/MonitoringServiceImpl.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring; +package org.etsi.tfs.policy.monitoring; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.AlarmSubscription; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.MonitorKpiRequest; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; -import eu.teraflow.policy.monitoring.model.SubsResponse; import io.smallrye.mutiny.Multi; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.AlarmSubscription; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.MonitorKpiRequest; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; +import org.etsi.tfs.policy.monitoring.model.SubsResponse; @ApplicationScoped public class MonitoringServiceImpl implements MonitoringService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmDescriptor.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmDescriptor.java index 090237f94..31e5eb721 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmDescriptor.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class AlarmDescriptor { private final String alarmId; diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmResponse.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmResponse.java index a92ae4dec..fb23ac53c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmResponse.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmResponse.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class AlarmResponse { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmSubscription.java similarity index 97% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmSubscription.java index 7b99c2045..c2d42c13c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/AlarmSubscription.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/AlarmSubscription.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class AlarmSubscription { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/BooleanKpiValue.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/BooleanKpiValue.java index c93aeb520..b24901e64 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/BooleanKpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/BooleanKpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class BooleanKpiValue implements KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/FloatKpiValue.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/FloatKpiValue.java index 2e19b2b2b..7f723c395 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/FloatKpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/FloatKpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class FloatKpiValue implements KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/IntegerKpiValue.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/IntegerKpiValue.java index cc3f92111..5c4a2b4d4 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/IntegerKpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/IntegerKpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class IntegerKpiValue implements KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/Kpi.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/Kpi.java index 92439d01f..d7b54a959 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/Kpi.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/Kpi.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class Kpi { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiDescriptor.java similarity index 89% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiDescriptor.java index 0f7aeca64..6bd16922c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiDescriptor.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiDescriptor.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.context.model.SliceId; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.context.model.SliceId; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; public class KpiDescriptor { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValue.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValue.java index 0a4418d65..23e68416a 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public interface KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValueRange.java similarity index 98% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValueRange.java index 6a0bba6c6..8db7f05a5 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/KpiValueRange.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/KpiValueRange.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class KpiValueRange { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/LongKpiValue.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/LongKpiValue.java index c57e605ff..e20d1d5d0 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/LongKpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/LongKpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class LongKpiValue implements KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/MonitorKpiRequest.java similarity index 96% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/MonitorKpiRequest.java index 30aaad2e8..253c0e3ef 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/MonitorKpiRequest.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/MonitorKpiRequest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class MonitorKpiRequest { private final String kpiId; diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/StringKpiValue.java similarity index 95% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/StringKpiValue.java index 649d06cee..615cfb2e8 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/StringKpiValue.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/StringKpiValue.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class StringKpiValue implements KpiValue { diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsDescriptor.java similarity index 98% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsDescriptor.java index 96569bbc7..566f7d33b 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsDescriptor.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsDescriptor.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; public class SubsDescriptor { private final String subscriptionId; diff --git a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsResponse.java similarity index 93% rename from src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java rename to src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsResponse.java index b4a2b16a6..bf51f5743 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/monitoring/model/SubsResponse.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/monitoring/model/SubsResponse.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package eu.teraflow.policy.monitoring.model; +package org.etsi.tfs.policy.monitoring.model; -import eu.teraflow.policy.common.Util; import java.util.List; +import org.etsi.tfs.policy.common.Util; public class SubsResponse { diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGateway.java similarity index 81% rename from src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java rename to src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGateway.java index b8764efe3..15dbaf94c 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGateway.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGateway.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.service; +package org.etsi.tfs.policy.service; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; public interface ServiceGateway { diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGatewayImpl.java similarity index 91% rename from src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGatewayImpl.java index f8f38f752..7eccec787 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceGatewayImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceGatewayImpl.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package eu.teraflow.policy.service; +package org.etsi.tfs.policy.service; -import eu.teraflow.policy.Serializer; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; import io.quarkus.grpc.GrpcClient; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.Serializer; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; import org.jboss.logging.Logger; import service.MutinyServiceServiceGrpc.MutinyServiceServiceStub; diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceService.java similarity index 81% rename from src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java rename to src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceService.java index aa4411ee9..eadf77112 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceService.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceService.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy.service; +package org.etsi.tfs.policy.service; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; import io.smallrye.mutiny.Uni; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; public interface ServiceService { diff --git a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceServiceImpl.java similarity index 87% rename from src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java rename to src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceServiceImpl.java index 109bcba26..21935f4a3 100644 --- a/src/policy/src/main/java/eu/teraflow/policy/service/ServiceServiceImpl.java +++ b/src/policy/src/main/java/org/etsi/tfs/policy/service/ServiceServiceImpl.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy.service; +package org.etsi.tfs.policy.service; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceId; import io.smallrye.mutiny.Uni; import javax.enterprise.context.ApplicationScoped; import javax.inject.Inject; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceId; @ApplicationScoped public class ServiceServiceImpl implements ServiceService { diff --git a/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/ConfigRuleTypeTest.java similarity index 80% rename from src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/ConfigRuleTypeTest.java index 2a32fc076..5f36d6ac5 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/ConfigRuleTypeTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/ConfigRuleTypeTest.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.policy.acl.AclAction; -import eu.teraflow.policy.acl.AclEntry; -import eu.teraflow.policy.acl.AclForwardActionEnum; -import eu.teraflow.policy.acl.AclLogActionEnum; -import eu.teraflow.policy.acl.AclMatch; -import eu.teraflow.policy.acl.AclRuleSet; -import eu.teraflow.policy.acl.AclRuleTypeEnum; -import eu.teraflow.policy.context.model.ConfigRuleAcl; -import eu.teraflow.policy.context.model.ConfigRuleCustom; -import eu.teraflow.policy.context.model.ConfigRuleTypeAcl; -import eu.teraflow.policy.context.model.ConfigRuleTypeCustom; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.TopologyId; import io.quarkus.test.junit.QuarkusTest; import java.util.List; +import org.etsi.tfs.policy.acl.AclAction; +import org.etsi.tfs.policy.acl.AclEntry; +import org.etsi.tfs.policy.acl.AclForwardActionEnum; +import org.etsi.tfs.policy.acl.AclLogActionEnum; +import org.etsi.tfs.policy.acl.AclMatch; +import org.etsi.tfs.policy.acl.AclRuleSet; +import org.etsi.tfs.policy.acl.AclRuleTypeEnum; +import org.etsi.tfs.policy.context.model.ConfigRuleAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleCustom; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.TopologyId; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/ConstraintTypeTest.java similarity index 79% rename from src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/ConstraintTypeTest.java index 9dc97b4a1..7517e4e2f 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/ConstraintTypeTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/ConstraintTypeTest.java @@ -14,31 +14,31 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.policy.context.model.ConstraintCustom; -import eu.teraflow.policy.context.model.ConstraintEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintSchedule; -import eu.teraflow.policy.context.model.ConstraintSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintSlaLatency; -import eu.teraflow.policy.context.model.ConstraintTypeCustom; -import eu.teraflow.policy.context.model.ConstraintTypeEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintTypeSchedule; -import eu.teraflow.policy.context.model.ConstraintTypeSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintTypeSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintTypeSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintTypeSlaLatency; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.IsolationLevelEnum; -import eu.teraflow.policy.context.model.Location; -import eu.teraflow.policy.context.model.LocationTypeRegion; -import eu.teraflow.policy.context.model.TopologyId; import io.quarkus.test.junit.QuarkusTest; import java.util.List; +import org.etsi.tfs.policy.context.model.ConstraintCustom; +import org.etsi.tfs.policy.context.model.ConstraintEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintSchedule; +import org.etsi.tfs.policy.context.model.ConstraintSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintSlaLatency; +import org.etsi.tfs.policy.context.model.ConstraintTypeCustom; +import org.etsi.tfs.policy.context.model.ConstraintTypeEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintTypeSchedule; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaLatency; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.IsolationLevelEnum; +import org.etsi.tfs.policy.context.model.Location; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; +import org.etsi.tfs.policy.context.model.TopologyId; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/EndPointCreationTest.java similarity index 93% rename from src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/EndPointCreationTest.java index 72501b3c6..ad6061264 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/EndPointCreationTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/EndPointCreationTest.java @@ -14,19 +14,19 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import eu.teraflow.policy.context.model.EndPoint; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.Location; -import eu.teraflow.policy.context.model.LocationTypeRegion; -import eu.teraflow.policy.context.model.TopologyId; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; import io.quarkus.test.junit.QuarkusTest; import java.util.List; +import org.etsi.tfs.policy.context.model.EndPoint; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.Location; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; +import org.etsi.tfs.policy.context.model.TopologyId; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/LocationTypeTest.java similarity index 88% rename from src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/LocationTypeTest.java index cc4813c76..f42933115 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/LocationTypeTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/LocationTypeTest.java @@ -14,14 +14,14 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.policy.context.model.GpsPosition; -import eu.teraflow.policy.context.model.LocationTypeGpsPosition; -import eu.teraflow.policy.context.model.LocationTypeRegion; import io.quarkus.test.junit.QuarkusTest; +import org.etsi.tfs.policy.context.model.GpsPosition; +import org.etsi.tfs.policy.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleBasicValidationTest.java similarity index 96% rename from src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleBasicValidationTest.java index 6e0f22053..7f9693293 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleBasicValidationTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleBasicValidationTest.java @@ -14,26 +14,26 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import eu.teraflow.policy.model.BooleanOperator; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleAction; -import eu.teraflow.policy.model.PolicyRuleActionConfig; -import eu.teraflow.policy.model.PolicyRuleActionEnum; -import eu.teraflow.policy.model.PolicyRuleBasic; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.model.PolicyRuleState; -import eu.teraflow.policy.model.PolicyRuleStateEnum; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.KpiValue; import io.quarkus.test.junit.QuarkusTest; import java.util.Collections; import java.util.List; import java.util.UUID; +import org.etsi.tfs.policy.model.BooleanOperator; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleAction; +import org.etsi.tfs.policy.model.PolicyRuleActionConfig; +import org.etsi.tfs.policy.model.PolicyRuleActionEnum; +import org.etsi.tfs.policy.model.PolicyRuleBasic; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.model.PolicyRuleState; +import org.etsi.tfs.policy.model.PolicyRuleStateEnum; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValue; import org.junit.jupiter.api.Test; // TODO: Revisit PolicyRuleBasicValidationTest cases after handling exceptions in PolicyRuleBasic diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleConditionValidationTest.java similarity index 92% rename from src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleConditionValidationTest.java index fb7cb38ab..d81149725 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleConditionValidationTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleConditionValidationTest.java @@ -14,20 +14,20 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.monitoring.model.BooleanKpiValue; -import eu.teraflow.policy.monitoring.model.FloatKpiValue; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.KpiValue; -import eu.teraflow.policy.monitoring.model.StringKpiValue; import io.quarkus.test.junit.QuarkusTest; import java.util.stream.Stream; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.monitoring.model.BooleanKpiValue; +import org.etsi.tfs.policy.monitoring.model.FloatKpiValue; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValue; +import org.etsi.tfs.policy.monitoring.model.StringKpiValue; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleDeviceValidationTest.java similarity index 91% rename from src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleDeviceValidationTest.java index aaaea41f8..e0e23c8a8 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleDeviceValidationTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleDeviceValidationTest.java @@ -14,25 +14,25 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; -import eu.teraflow.policy.model.BooleanOperator; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleAction; -import eu.teraflow.policy.model.PolicyRuleActionConfig; -import eu.teraflow.policy.model.PolicyRuleActionEnum; -import eu.teraflow.policy.model.PolicyRuleBasic; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.model.PolicyRuleDevice; -import eu.teraflow.policy.model.PolicyRuleState; -import eu.teraflow.policy.model.PolicyRuleStateEnum; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.KpiValue; import io.quarkus.test.junit.QuarkusTest; import java.util.List; import java.util.UUID; +import org.etsi.tfs.policy.model.BooleanOperator; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleAction; +import org.etsi.tfs.policy.model.PolicyRuleActionConfig; +import org.etsi.tfs.policy.model.PolicyRuleActionEnum; +import org.etsi.tfs.policy.model.PolicyRuleBasic; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.model.PolicyRuleDevice; +import org.etsi.tfs.policy.model.PolicyRuleState; +import org.etsi.tfs.policy.model.PolicyRuleStateEnum; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValue; import org.junit.jupiter.api.Test; @QuarkusTest diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleServiceValidationTest.java similarity index 88% rename from src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleServiceValidationTest.java index 95819965e..40094436c 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/PolicyRuleServiceValidationTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyRuleServiceValidationTest.java @@ -14,46 +14,46 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.when; -import eu.teraflow.policy.context.ContextService; -import eu.teraflow.policy.context.model.ConfigActionEnum; -import eu.teraflow.policy.context.model.ConfigRule; -import eu.teraflow.policy.context.model.ConfigRuleCustom; -import eu.teraflow.policy.context.model.ConfigRuleTypeCustom; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.DeviceDriverEnum; -import eu.teraflow.policy.context.model.DeviceOperationalStatus; -import eu.teraflow.policy.context.model.EndPoint.EndPointBuilder; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.Location; -import eu.teraflow.policy.context.model.LocationTypeRegion; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.context.model.TopologyId; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.policy.model.BooleanOperator; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleAction; -import eu.teraflow.policy.model.PolicyRuleActionConfig; -import eu.teraflow.policy.model.PolicyRuleActionEnum; -import eu.teraflow.policy.model.PolicyRuleBasic; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.model.PolicyRuleService; -import eu.teraflow.policy.model.PolicyRuleState; -import eu.teraflow.policy.model.PolicyRuleStateEnum; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.KpiValue; import io.quarkus.test.junit.QuarkusTest; import io.smallrye.mutiny.Uni; import java.util.Collections; import java.util.List; import java.util.UUID; import javax.inject.Inject; +import org.etsi.tfs.policy.context.ContextService; +import org.etsi.tfs.policy.context.model.ConfigActionEnum; +import org.etsi.tfs.policy.context.model.ConfigRule; +import org.etsi.tfs.policy.context.model.ConfigRuleCustom; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.DeviceDriverEnum; +import org.etsi.tfs.policy.context.model.DeviceOperationalStatus; +import org.etsi.tfs.policy.context.model.EndPoint.EndPointBuilder; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.Location; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.context.model.TopologyId; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.policy.model.BooleanOperator; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleAction; +import org.etsi.tfs.policy.model.PolicyRuleActionConfig; +import org.etsi.tfs.policy.model.PolicyRuleActionEnum; +import org.etsi.tfs.policy.model.PolicyRuleBasic; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.model.PolicyRuleService; +import org.etsi.tfs.policy.model.PolicyRuleState; +import org.etsi.tfs.policy.model.PolicyRuleStateEnum; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValue; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyServiceTest.java similarity index 96% rename from src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/PolicyServiceTest.java index 2f5266c95..2d1a425a8 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/PolicyServiceTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/PolicyServiceTest.java @@ -14,14 +14,12 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import context.ContextOuterClass; import context.ContextOuterClass.Uuid; -import eu.teraflow.policy.monitoring.model.FloatKpiValue; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; import io.quarkus.grpc.GrpcClient; import io.quarkus.test.junit.QuarkusTest; import java.util.List; @@ -32,6 +30,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; import javax.inject.Inject; import monitoring.Monitoring.KpiId; +import org.etsi.tfs.policy.monitoring.model.FloatKpiValue; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; import org.jboss.logging.Logger; import org.junit.jupiter.api.Test; import policy.Policy; @@ -112,13 +112,13 @@ class PolicyServiceTest { final var expectedPolicyRuleConditions = List.of(firstExpectedPolicyRuleCondition, secondExpectedPolicyRuleCondition); - eu.teraflow.policy.model.PolicyRuleActionConfig policyRuleActionConfig_1 = - new eu.teraflow.policy.model.PolicyRuleActionConfig("paramater1", "parameter2"); + org.etsi.tfs.policy.model.PolicyRuleActionConfig policyRuleActionConfig_1 = + new org.etsi.tfs.policy.model.PolicyRuleActionConfig("paramater1", "parameter2"); final var serializedPolicyRuleActionConfigList_1 = serializer.serialize(policyRuleActionConfig_1); - eu.teraflow.policy.model.PolicyRuleActionConfig policyRuleActionConfig_2 = - new eu.teraflow.policy.model.PolicyRuleActionConfig("paramater3", "parameter4"); + org.etsi.tfs.policy.model.PolicyRuleActionConfig policyRuleActionConfig_2 = + new org.etsi.tfs.policy.model.PolicyRuleActionConfig("paramater3", "parameter4"); final var serializedPolicyRuleActionConfigList_2 = serializer.serialize(policyRuleActionConfig_2); diff --git a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java similarity index 97% rename from src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java rename to src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java index b57bdf10a..f29ae3697 100644 --- a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java +++ b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package eu.teraflow.policy; +package org.etsi.tfs.policy; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -25,79 +25,6 @@ import context.ContextOuterClass.ContextId; import context.ContextOuterClass.DeviceId; import context.ContextOuterClass.DeviceOperationalStatusEnum; import context.ContextOuterClass.Uuid; -import eu.teraflow.policy.acl.AclAction; -import eu.teraflow.policy.acl.AclEntry; -import eu.teraflow.policy.acl.AclForwardActionEnum; -import eu.teraflow.policy.acl.AclLogActionEnum; -import eu.teraflow.policy.acl.AclMatch; -import eu.teraflow.policy.acl.AclRuleSet; -import eu.teraflow.policy.acl.AclRuleTypeEnum; -import eu.teraflow.policy.context.model.ConfigActionEnum; -import eu.teraflow.policy.context.model.ConfigRule; -import eu.teraflow.policy.context.model.ConfigRuleAcl; -import eu.teraflow.policy.context.model.ConfigRuleCustom; -import eu.teraflow.policy.context.model.ConfigRuleTypeAcl; -import eu.teraflow.policy.context.model.ConfigRuleTypeCustom; -import eu.teraflow.policy.context.model.Constraint; -import eu.teraflow.policy.context.model.ConstraintCustom; -import eu.teraflow.policy.context.model.ConstraintEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintSchedule; -import eu.teraflow.policy.context.model.ConstraintSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintSlaLatency; -import eu.teraflow.policy.context.model.ConstraintTypeCustom; -import eu.teraflow.policy.context.model.ConstraintTypeEndPointLocation; -import eu.teraflow.policy.context.model.ConstraintTypeSchedule; -import eu.teraflow.policy.context.model.ConstraintTypeSlaAvailability; -import eu.teraflow.policy.context.model.ConstraintTypeSlaCapacity; -import eu.teraflow.policy.context.model.ConstraintTypeSlaIsolationLevel; -import eu.teraflow.policy.context.model.ConstraintTypeSlaLatency; -import eu.teraflow.policy.context.model.Device; -import eu.teraflow.policy.context.model.DeviceConfig; -import eu.teraflow.policy.context.model.DeviceDriverEnum; -import eu.teraflow.policy.context.model.DeviceOperationalStatus; -import eu.teraflow.policy.context.model.Empty; -import eu.teraflow.policy.context.model.EndPoint.EndPointBuilder; -import eu.teraflow.policy.context.model.EndPointId; -import eu.teraflow.policy.context.model.Event; -import eu.teraflow.policy.context.model.EventTypeEnum; -import eu.teraflow.policy.context.model.GpsPosition; -import eu.teraflow.policy.context.model.IsolationLevelEnum; -import eu.teraflow.policy.context.model.Location; -import eu.teraflow.policy.context.model.LocationTypeGpsPosition; -import eu.teraflow.policy.context.model.LocationTypeRegion; -import eu.teraflow.policy.context.model.Service; -import eu.teraflow.policy.context.model.ServiceConfig; -import eu.teraflow.policy.context.model.ServiceId; -import eu.teraflow.policy.context.model.ServiceStatus; -import eu.teraflow.policy.context.model.ServiceStatusEnum; -import eu.teraflow.policy.context.model.ServiceTypeEnum; -import eu.teraflow.policy.context.model.SliceId; -import eu.teraflow.policy.context.model.TopologyId; -import eu.teraflow.policy.kpi_sample_types.model.KpiSampleType; -import eu.teraflow.policy.model.BooleanOperator; -import eu.teraflow.policy.model.NumericalOperator; -import eu.teraflow.policy.model.PolicyRuleAction; -import eu.teraflow.policy.model.PolicyRuleActionConfig; -import eu.teraflow.policy.model.PolicyRuleActionEnum; -import eu.teraflow.policy.model.PolicyRuleBasic; -import eu.teraflow.policy.model.PolicyRuleCondition; -import eu.teraflow.policy.model.PolicyRuleDevice; -import eu.teraflow.policy.model.PolicyRuleService; -import eu.teraflow.policy.model.PolicyRuleState; -import eu.teraflow.policy.model.PolicyRuleStateEnum; -import eu.teraflow.policy.monitoring.model.AlarmDescriptor; -import eu.teraflow.policy.monitoring.model.AlarmResponse; -import eu.teraflow.policy.monitoring.model.BooleanKpiValue; -import eu.teraflow.policy.monitoring.model.FloatKpiValue; -import eu.teraflow.policy.monitoring.model.IntegerKpiValue; -import eu.teraflow.policy.monitoring.model.Kpi; -import eu.teraflow.policy.monitoring.model.KpiDescriptor; -import eu.teraflow.policy.monitoring.model.KpiValue; -import eu.teraflow.policy.monitoring.model.KpiValueRange; -import eu.teraflow.policy.monitoring.model.StringKpiValue; -import eu.teraflow.policy.monitoring.model.SubsDescriptor; import io.quarkus.test.junit.QuarkusTest; import java.util.List; import java.util.stream.Collectors; @@ -107,6 +34,79 @@ import kpi_sample_types.KpiSampleTypes; import monitoring.Monitoring; import monitoring.Monitoring.AlarmID; import monitoring.Monitoring.KpiId; +import org.etsi.tfs.policy.acl.AclAction; +import org.etsi.tfs.policy.acl.AclEntry; +import org.etsi.tfs.policy.acl.AclForwardActionEnum; +import org.etsi.tfs.policy.acl.AclLogActionEnum; +import org.etsi.tfs.policy.acl.AclMatch; +import org.etsi.tfs.policy.acl.AclRuleSet; +import org.etsi.tfs.policy.acl.AclRuleTypeEnum; +import org.etsi.tfs.policy.context.model.ConfigActionEnum; +import org.etsi.tfs.policy.context.model.ConfigRule; +import org.etsi.tfs.policy.context.model.ConfigRuleAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleCustom; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeAcl; +import org.etsi.tfs.policy.context.model.ConfigRuleTypeCustom; +import org.etsi.tfs.policy.context.model.Constraint; +import org.etsi.tfs.policy.context.model.ConstraintCustom; +import org.etsi.tfs.policy.context.model.ConstraintEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintSchedule; +import org.etsi.tfs.policy.context.model.ConstraintSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintSlaLatency; +import org.etsi.tfs.policy.context.model.ConstraintTypeCustom; +import org.etsi.tfs.policy.context.model.ConstraintTypeEndPointLocation; +import org.etsi.tfs.policy.context.model.ConstraintTypeSchedule; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaAvailability; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaCapacity; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaIsolationLevel; +import org.etsi.tfs.policy.context.model.ConstraintTypeSlaLatency; +import org.etsi.tfs.policy.context.model.Device; +import org.etsi.tfs.policy.context.model.DeviceConfig; +import org.etsi.tfs.policy.context.model.DeviceDriverEnum; +import org.etsi.tfs.policy.context.model.DeviceOperationalStatus; +import org.etsi.tfs.policy.context.model.Empty; +import org.etsi.tfs.policy.context.model.EndPoint.EndPointBuilder; +import org.etsi.tfs.policy.context.model.EndPointId; +import org.etsi.tfs.policy.context.model.Event; +import org.etsi.tfs.policy.context.model.EventTypeEnum; +import org.etsi.tfs.policy.context.model.GpsPosition; +import org.etsi.tfs.policy.context.model.IsolationLevelEnum; +import org.etsi.tfs.policy.context.model.Location; +import org.etsi.tfs.policy.context.model.LocationTypeGpsPosition; +import org.etsi.tfs.policy.context.model.LocationTypeRegion; +import org.etsi.tfs.policy.context.model.Service; +import org.etsi.tfs.policy.context.model.ServiceConfig; +import org.etsi.tfs.policy.context.model.ServiceId; +import org.etsi.tfs.policy.context.model.ServiceStatus; +import org.etsi.tfs.policy.context.model.ServiceStatusEnum; +import org.etsi.tfs.policy.context.model.ServiceTypeEnum; +import org.etsi.tfs.policy.context.model.SliceId; +import org.etsi.tfs.policy.context.model.TopologyId; +import org.etsi.tfs.policy.kpi_sample_types.model.KpiSampleType; +import org.etsi.tfs.policy.model.BooleanOperator; +import org.etsi.tfs.policy.model.NumericalOperator; +import org.etsi.tfs.policy.model.PolicyRuleAction; +import org.etsi.tfs.policy.model.PolicyRuleActionConfig; +import org.etsi.tfs.policy.model.PolicyRuleActionEnum; +import org.etsi.tfs.policy.model.PolicyRuleBasic; +import org.etsi.tfs.policy.model.PolicyRuleCondition; +import org.etsi.tfs.policy.model.PolicyRuleDevice; +import org.etsi.tfs.policy.model.PolicyRuleService; +import org.etsi.tfs.policy.model.PolicyRuleState; +import org.etsi.tfs.policy.model.PolicyRuleStateEnum; +import org.etsi.tfs.policy.monitoring.model.AlarmDescriptor; +import org.etsi.tfs.policy.monitoring.model.AlarmResponse; +import org.etsi.tfs.policy.monitoring.model.BooleanKpiValue; +import org.etsi.tfs.policy.monitoring.model.FloatKpiValue; +import org.etsi.tfs.policy.monitoring.model.IntegerKpiValue; +import org.etsi.tfs.policy.monitoring.model.Kpi; +import org.etsi.tfs.policy.monitoring.model.KpiDescriptor; +import org.etsi.tfs.policy.monitoring.model.KpiValue; +import org.etsi.tfs.policy.monitoring.model.KpiValueRange; +import org.etsi.tfs.policy.monitoring.model.StringKpiValue; +import org.etsi.tfs.policy.monitoring.model.SubsDescriptor; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments; @@ -862,7 +862,7 @@ class SerializerTest { final var aclRuleSet = new AclRuleSet( "aclRuleName", - eu.teraflow.policy.acl.AclRuleTypeEnum.IPV4, + org.etsi.tfs.policy.acl.AclRuleTypeEnum.IPV4, "AclRuleDescription", "userId", List.of(aclEntry)); diff --git a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java index 85bc0d278..a25798b88 100644 --- a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java +++ b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java @@ -24504,6 +24504,568 @@ public final class ContextOuterClass { } + public interface LinkAttributesOrBuilder extends + // @@protoc_insertion_point(interface_extends:context.LinkAttributes) + com.google.protobuf.MessageOrBuilder { + + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + float getTotalCapacityGbps(); + + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + float getUsedCapacityGbps(); + } + /** + * Protobuf type {@code context.LinkAttributes} + */ + public static final class LinkAttributes extends + com.google.protobuf.GeneratedMessageV3 implements + // @@protoc_insertion_point(message_implements:context.LinkAttributes) + LinkAttributesOrBuilder { + private static final long serialVersionUID = 0L; + // Use LinkAttributes.newBuilder() to construct. + private LinkAttributes(com.google.protobuf.GeneratedMessageV3.Builder builder) { + super(builder); + } + private LinkAttributes() { + } + + @java.lang.Override + @SuppressWarnings({"unused"}) + protected java.lang.Object newInstance( + UnusedPrivateParameter unused) { + return new LinkAttributes(); + } + + @java.lang.Override + public final com.google.protobuf.UnknownFieldSet + getUnknownFields() { + return this.unknownFields; + } + private LinkAttributes( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + this(); + if (extensionRegistry == null) { + throw new java.lang.NullPointerException(); + } + com.google.protobuf.UnknownFieldSet.Builder unknownFields = + com.google.protobuf.UnknownFieldSet.newBuilder(); + try { + boolean done = false; + while (!done) { + int tag = input.readTag(); + switch (tag) { + case 0: + done = true; + break; + case 13: { + + totalCapacityGbps_ = input.readFloat(); + break; + } + case 21: { + + usedCapacityGbps_ = input.readFloat(); + break; + } + default: { + if (!parseUnknownField( + input, unknownFields, extensionRegistry, tag)) { + done = true; + } + break; + } + } + } + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + throw e.setUnfinishedMessage(this); + } catch (java.io.IOException e) { + throw new com.google.protobuf.InvalidProtocolBufferException( + e).setUnfinishedMessage(this); + } finally { + this.unknownFields = unknownFields.build(); + makeExtensionsImmutable(); + } + } + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_fieldAccessorTable + .ensureFieldAccessorsInitialized( + context.ContextOuterClass.LinkAttributes.class, context.ContextOuterClass.LinkAttributes.Builder.class); + } + + public static final int TOTAL_CAPACITY_GBPS_FIELD_NUMBER = 1; + private float totalCapacityGbps_; + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + @java.lang.Override + public float getTotalCapacityGbps() { + return totalCapacityGbps_; + } + + public static final int USED_CAPACITY_GBPS_FIELD_NUMBER = 2; + private float usedCapacityGbps_; + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + @java.lang.Override + public float getUsedCapacityGbps() { + return usedCapacityGbps_; + } + + private byte memoizedIsInitialized = -1; + @java.lang.Override + public final boolean isInitialized() { + byte isInitialized = memoizedIsInitialized; + if (isInitialized == 1) return true; + if (isInitialized == 0) return false; + + memoizedIsInitialized = 1; + return true; + } + + @java.lang.Override + public void writeTo(com.google.protobuf.CodedOutputStream output) + throws java.io.IOException { + if (totalCapacityGbps_ != 0F) { + output.writeFloat(1, totalCapacityGbps_); + } + if (usedCapacityGbps_ != 0F) { + output.writeFloat(2, usedCapacityGbps_); + } + unknownFields.writeTo(output); + } + + @java.lang.Override + public int getSerializedSize() { + int size = memoizedSize; + if (size != -1) return size; + + size = 0; + if (totalCapacityGbps_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(1, totalCapacityGbps_); + } + if (usedCapacityGbps_ != 0F) { + size += com.google.protobuf.CodedOutputStream + .computeFloatSize(2, usedCapacityGbps_); + } + size += unknownFields.getSerializedSize(); + memoizedSize = size; + return size; + } + + @java.lang.Override + public boolean equals(final java.lang.Object obj) { + if (obj == this) { + return true; + } + if (!(obj instanceof context.ContextOuterClass.LinkAttributes)) { + return super.equals(obj); + } + context.ContextOuterClass.LinkAttributes other = (context.ContextOuterClass.LinkAttributes) obj; + + if (java.lang.Float.floatToIntBits(getTotalCapacityGbps()) + != java.lang.Float.floatToIntBits( + other.getTotalCapacityGbps())) return false; + if (java.lang.Float.floatToIntBits(getUsedCapacityGbps()) + != java.lang.Float.floatToIntBits( + other.getUsedCapacityGbps())) return false; + if (!unknownFields.equals(other.unknownFields)) return false; + return true; + } + + @java.lang.Override + public int hashCode() { + if (memoizedHashCode != 0) { + return memoizedHashCode; + } + int hash = 41; + hash = (19 * hash) + getDescriptor().hashCode(); + hash = (37 * hash) + TOTAL_CAPACITY_GBPS_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getTotalCapacityGbps()); + hash = (37 * hash) + USED_CAPACITY_GBPS_FIELD_NUMBER; + hash = (53 * hash) + java.lang.Float.floatToIntBits( + getUsedCapacityGbps()); + hash = (29 * hash) + unknownFields.hashCode(); + memoizedHashCode = hash; + return hash; + } + + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.nio.ByteBuffer data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.nio.ByteBuffer data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.ByteString data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.ByteString data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom(byte[] data) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + byte[] data, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return PARSER.parseFrom(data, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseDelimitedFrom(java.io.InputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseDelimitedFrom( + java.io.InputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseDelimitedWithIOException(PARSER, input, extensionRegistry); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.CodedInputStream input) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input); + } + public static context.ContextOuterClass.LinkAttributes parseFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + return com.google.protobuf.GeneratedMessageV3 + .parseWithIOException(PARSER, input, extensionRegistry); + } + + @java.lang.Override + public Builder newBuilderForType() { return newBuilder(); } + public static Builder newBuilder() { + return DEFAULT_INSTANCE.toBuilder(); + } + public static Builder newBuilder(context.ContextOuterClass.LinkAttributes prototype) { + return DEFAULT_INSTANCE.toBuilder().mergeFrom(prototype); + } + @java.lang.Override + public Builder toBuilder() { + return this == DEFAULT_INSTANCE + ? new Builder() : new Builder().mergeFrom(this); + } + + @java.lang.Override + protected Builder newBuilderForType( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + Builder builder = new Builder(parent); + return builder; + } + /** + * Protobuf type {@code context.LinkAttributes} + */ + public static final class Builder extends + com.google.protobuf.GeneratedMessageV3.Builder implements + // @@protoc_insertion_point(builder_implements:context.LinkAttributes) + context.ContextOuterClass.LinkAttributesOrBuilder { + public static final com.google.protobuf.Descriptors.Descriptor + getDescriptor() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + protected com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internalGetFieldAccessorTable() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_fieldAccessorTable + .ensureFieldAccessorsInitialized( + context.ContextOuterClass.LinkAttributes.class, context.ContextOuterClass.LinkAttributes.Builder.class); + } + + // Construct using context.ContextOuterClass.LinkAttributes.newBuilder() + private Builder() { + maybeForceBuilderInitialization(); + } + + private Builder( + com.google.protobuf.GeneratedMessageV3.BuilderParent parent) { + super(parent); + maybeForceBuilderInitialization(); + } + private void maybeForceBuilderInitialization() { + if (com.google.protobuf.GeneratedMessageV3 + .alwaysUseFieldBuilders) { + } + } + @java.lang.Override + public Builder clear() { + super.clear(); + totalCapacityGbps_ = 0F; + + usedCapacityGbps_ = 0F; + + return this; + } + + @java.lang.Override + public com.google.protobuf.Descriptors.Descriptor + getDescriptorForType() { + return context.ContextOuterClass.internal_static_context_LinkAttributes_descriptor; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getDefaultInstanceForType() { + return context.ContextOuterClass.LinkAttributes.getDefaultInstance(); + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes build() { + context.ContextOuterClass.LinkAttributes result = buildPartial(); + if (!result.isInitialized()) { + throw newUninitializedMessageException(result); + } + return result; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes buildPartial() { + context.ContextOuterClass.LinkAttributes result = new context.ContextOuterClass.LinkAttributes(this); + result.totalCapacityGbps_ = totalCapacityGbps_; + result.usedCapacityGbps_ = usedCapacityGbps_; + onBuilt(); + return result; + } + + @java.lang.Override + public Builder clone() { + return super.clone(); + } + @java.lang.Override + public Builder setField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.setField(field, value); + } + @java.lang.Override + public Builder clearField( + com.google.protobuf.Descriptors.FieldDescriptor field) { + return super.clearField(field); + } + @java.lang.Override + public Builder clearOneof( + com.google.protobuf.Descriptors.OneofDescriptor oneof) { + return super.clearOneof(oneof); + } + @java.lang.Override + public Builder setRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + int index, java.lang.Object value) { + return super.setRepeatedField(field, index, value); + } + @java.lang.Override + public Builder addRepeatedField( + com.google.protobuf.Descriptors.FieldDescriptor field, + java.lang.Object value) { + return super.addRepeatedField(field, value); + } + @java.lang.Override + public Builder mergeFrom(com.google.protobuf.Message other) { + if (other instanceof context.ContextOuterClass.LinkAttributes) { + return mergeFrom((context.ContextOuterClass.LinkAttributes)other); + } else { + super.mergeFrom(other); + return this; + } + } + + public Builder mergeFrom(context.ContextOuterClass.LinkAttributes other) { + if (other == context.ContextOuterClass.LinkAttributes.getDefaultInstance()) return this; + if (other.getTotalCapacityGbps() != 0F) { + setTotalCapacityGbps(other.getTotalCapacityGbps()); + } + if (other.getUsedCapacityGbps() != 0F) { + setUsedCapacityGbps(other.getUsedCapacityGbps()); + } + this.mergeUnknownFields(other.unknownFields); + onChanged(); + return this; + } + + @java.lang.Override + public final boolean isInitialized() { + return true; + } + + @java.lang.Override + public Builder mergeFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws java.io.IOException { + context.ContextOuterClass.LinkAttributes parsedMessage = null; + try { + parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry); + } catch (com.google.protobuf.InvalidProtocolBufferException e) { + parsedMessage = (context.ContextOuterClass.LinkAttributes) e.getUnfinishedMessage(); + throw e.unwrapIOException(); + } finally { + if (parsedMessage != null) { + mergeFrom(parsedMessage); + } + } + return this; + } + + private float totalCapacityGbps_ ; + /** + * float total_capacity_gbps = 1; + * @return The totalCapacityGbps. + */ + @java.lang.Override + public float getTotalCapacityGbps() { + return totalCapacityGbps_; + } + /** + * float total_capacity_gbps = 1; + * @param value The totalCapacityGbps to set. + * @return This builder for chaining. + */ + public Builder setTotalCapacityGbps(float value) { + + totalCapacityGbps_ = value; + onChanged(); + return this; + } + /** + * float total_capacity_gbps = 1; + * @return This builder for chaining. + */ + public Builder clearTotalCapacityGbps() { + + totalCapacityGbps_ = 0F; + onChanged(); + return this; + } + + private float usedCapacityGbps_ ; + /** + * float used_capacity_gbps = 2; + * @return The usedCapacityGbps. + */ + @java.lang.Override + public float getUsedCapacityGbps() { + return usedCapacityGbps_; + } + /** + * float used_capacity_gbps = 2; + * @param value The usedCapacityGbps to set. + * @return This builder for chaining. + */ + public Builder setUsedCapacityGbps(float value) { + + usedCapacityGbps_ = value; + onChanged(); + return this; + } + /** + * float used_capacity_gbps = 2; + * @return This builder for chaining. + */ + public Builder clearUsedCapacityGbps() { + + usedCapacityGbps_ = 0F; + onChanged(); + return this; + } + @java.lang.Override + public final Builder setUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.setUnknownFields(unknownFields); + } + + @java.lang.Override + public final Builder mergeUnknownFields( + final com.google.protobuf.UnknownFieldSet unknownFields) { + return super.mergeUnknownFields(unknownFields); + } + + + // @@protoc_insertion_point(builder_scope:context.LinkAttributes) + } + + // @@protoc_insertion_point(class_scope:context.LinkAttributes) + private static final context.ContextOuterClass.LinkAttributes DEFAULT_INSTANCE; + static { + DEFAULT_INSTANCE = new context.ContextOuterClass.LinkAttributes(); + } + + public static context.ContextOuterClass.LinkAttributes getDefaultInstance() { + return DEFAULT_INSTANCE; + } + + private static final com.google.protobuf.Parser + PARSER = new com.google.protobuf.AbstractParser() { + @java.lang.Override + public LinkAttributes parsePartialFrom( + com.google.protobuf.CodedInputStream input, + com.google.protobuf.ExtensionRegistryLite extensionRegistry) + throws com.google.protobuf.InvalidProtocolBufferException { + return new LinkAttributes(input, extensionRegistry); + } + }; + + public static com.google.protobuf.Parser parser() { + return PARSER; + } + + @java.lang.Override + public com.google.protobuf.Parser getParserForType() { + return PARSER; + } + + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getDefaultInstanceForType() { + return DEFAULT_INSTANCE; + } + + } + public interface LinkOrBuilder extends // @@protoc_insertion_point(interface_extends:context.Link) com.google.protobuf.MessageOrBuilder { @@ -24558,6 +25120,21 @@ public final class ContextOuterClass { */ context.ContextOuterClass.EndPointIdOrBuilder getLinkEndpointIdsOrBuilder( int index); + + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + boolean hasAttributes(); + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + context.ContextOuterClass.LinkAttributes getAttributes(); + /** + * .context.LinkAttributes attributes = 4; + */ + context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder(); } /** * Protobuf type {@code context.Link} @@ -24635,6 +25212,19 @@ public final class ContextOuterClass { input.readMessage(context.ContextOuterClass.EndPointId.parser(), extensionRegistry)); break; } + case 34: { + context.ContextOuterClass.LinkAttributes.Builder subBuilder = null; + if (attributes_ != null) { + subBuilder = attributes_.toBuilder(); + } + attributes_ = input.readMessage(context.ContextOuterClass.LinkAttributes.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(attributes_); + attributes_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -24774,6 +25364,32 @@ public final class ContextOuterClass { return linkEndpointIds_.get(index); } + public static final int ATTRIBUTES_FIELD_NUMBER = 4; + private context.ContextOuterClass.LinkAttributes attributes_; + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + @java.lang.Override + public boolean hasAttributes() { + return attributes_ != null; + } + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + @java.lang.Override + public context.ContextOuterClass.LinkAttributes getAttributes() { + return attributes_ == null ? context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } + /** + * .context.LinkAttributes attributes = 4; + */ + @java.lang.Override + public context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder() { + return getAttributes(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -24797,6 +25413,9 @@ public final class ContextOuterClass { for (int i = 0; i < linkEndpointIds_.size(); i++) { output.writeMessage(3, linkEndpointIds_.get(i)); } + if (attributes_ != null) { + output.writeMessage(4, getAttributes()); + } unknownFields.writeTo(output); } @@ -24817,6 +25436,10 @@ public final class ContextOuterClass { size += com.google.protobuf.CodedOutputStream .computeMessageSize(3, linkEndpointIds_.get(i)); } + if (attributes_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(4, getAttributes()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -24841,6 +25464,11 @@ public final class ContextOuterClass { .equals(other.getName())) return false; if (!getLinkEndpointIdsList() .equals(other.getLinkEndpointIdsList())) return false; + if (hasAttributes() != other.hasAttributes()) return false; + if (hasAttributes()) { + if (!getAttributes() + .equals(other.getAttributes())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -24862,6 +25490,10 @@ public final class ContextOuterClass { hash = (37 * hash) + LINK_ENDPOINT_IDS_FIELD_NUMBER; hash = (53 * hash) + getLinkEndpointIdsList().hashCode(); } + if (hasAttributes()) { + hash = (37 * hash) + ATTRIBUTES_FIELD_NUMBER; + hash = (53 * hash) + getAttributes().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -25010,6 +25642,12 @@ public final class ContextOuterClass { } else { linkEndpointIdsBuilder_.clear(); } + if (attributesBuilder_ == null) { + attributes_ = null; + } else { + attributes_ = null; + attributesBuilder_ = null; + } return this; } @@ -25052,6 +25690,11 @@ public final class ContextOuterClass { } else { result.linkEndpointIds_ = linkEndpointIdsBuilder_.build(); } + if (attributesBuilder_ == null) { + result.attributes_ = attributes_; + } else { + result.attributes_ = attributesBuilder_.build(); + } onBuilt(); return result; } @@ -25133,6 +25776,9 @@ public final class ContextOuterClass { } } } + if (other.hasAttributes()) { + mergeAttributes(other.getAttributes()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -25597,6 +26243,125 @@ public final class ContextOuterClass { } return linkEndpointIdsBuilder_; } + + private context.ContextOuterClass.LinkAttributes attributes_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder> attributesBuilder_; + /** + * .context.LinkAttributes attributes = 4; + * @return Whether the attributes field is set. + */ + public boolean hasAttributes() { + return attributesBuilder_ != null || attributes_ != null; + } + /** + * .context.LinkAttributes attributes = 4; + * @return The attributes. + */ + public context.ContextOuterClass.LinkAttributes getAttributes() { + if (attributesBuilder_ == null) { + return attributes_ == null ? context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } else { + return attributesBuilder_.getMessage(); + } + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder setAttributes(context.ContextOuterClass.LinkAttributes value) { + if (attributesBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + attributes_ = value; + onChanged(); + } else { + attributesBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder setAttributes( + context.ContextOuterClass.LinkAttributes.Builder builderForValue) { + if (attributesBuilder_ == null) { + attributes_ = builderForValue.build(); + onChanged(); + } else { + attributesBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder mergeAttributes(context.ContextOuterClass.LinkAttributes value) { + if (attributesBuilder_ == null) { + if (attributes_ != null) { + attributes_ = + context.ContextOuterClass.LinkAttributes.newBuilder(attributes_).mergeFrom(value).buildPartial(); + } else { + attributes_ = value; + } + onChanged(); + } else { + attributesBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public Builder clearAttributes() { + if (attributesBuilder_ == null) { + attributes_ = null; + onChanged(); + } else { + attributes_ = null; + attributesBuilder_ = null; + } + + return this; + } + /** + * .context.LinkAttributes attributes = 4; + */ + public context.ContextOuterClass.LinkAttributes.Builder getAttributesBuilder() { + + onChanged(); + return getAttributesFieldBuilder().getBuilder(); + } + /** + * .context.LinkAttributes attributes = 4; + */ + public context.ContextOuterClass.LinkAttributesOrBuilder getAttributesOrBuilder() { + if (attributesBuilder_ != null) { + return attributesBuilder_.getMessageOrBuilder(); + } else { + return attributes_ == null ? + context.ContextOuterClass.LinkAttributes.getDefaultInstance() : attributes_; + } + } + /** + * .context.LinkAttributes attributes = 4; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder> + getAttributesFieldBuilder() { + if (attributesBuilder_ == null) { + attributesBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkAttributes, context.ContextOuterClass.LinkAttributes.Builder, context.ContextOuterClass.LinkAttributesOrBuilder>( + getAttributes(), + getParentForChildren(), + isClean()); + attributes_ = null; + } + return attributesBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -74566,6 +75331,11 @@ public final class ContextOuterClass { private static final com.google.protobuf.GeneratedMessageV3.FieldAccessorTable internal_static_context_LinkId_fieldAccessorTable; + private static final com.google.protobuf.Descriptors.Descriptor + internal_static_context_LinkAttributes_descriptor; + private static final + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable + internal_static_context_LinkAttributes_fieldAccessorTable; private static final com.google.protobuf.Descriptors.Descriptor internal_static_context_Link_descriptor; private static final @@ -74899,268 +75669,271 @@ public final class ContextOuterClass { "nt\030\001 \001(\0132\016.context.Event\022$\n\tdevice_id\030\002 " + "\001(\0132\021.context.DeviceId\022,\n\rdevice_config\030" + "\003 \001(\0132\025.context.DeviceConfig\"*\n\006LinkId\022 " + - "\n\tlink_uuid\030\001 \001(\0132\r.context.Uuid\"f\n\004Link" + - "\022 \n\007link_id\030\001 \001(\0132\017.context.LinkId\022\014\n\004na" + - "me\030\002 \001(\t\022.\n\021link_endpoint_ids\030\003 \003(\0132\023.co" + - "ntext.EndPointId\"/\n\nLinkIdList\022!\n\010link_i" + - "ds\030\001 \003(\0132\017.context.LinkId\"(\n\010LinkList\022\034\n" + - "\005links\030\001 \003(\0132\r.context.Link\"L\n\tLinkEvent" + - "\022\035\n\005event\030\001 \001(\0132\016.context.Event\022 \n\007link_" + - "id\030\002 \001(\0132\017.context.LinkId\"X\n\tServiceId\022&" + - "\n\ncontext_id\030\001 \001(\0132\022.context.ContextId\022#" + - "\n\014service_uuid\030\002 \001(\0132\r.context.Uuid\"\333\002\n\007" + - "Service\022&\n\nservice_id\030\001 \001(\0132\022.context.Se" + - "rviceId\022\014\n\004name\030\002 \001(\t\022.\n\014service_type\030\003 " + - "\001(\0162\030.context.ServiceTypeEnum\0221\n\024service" + - "_endpoint_ids\030\004 \003(\0132\023.context.EndPointId" + - "\0220\n\023service_constraints\030\005 \003(\0132\023.context." + - "Constraint\022.\n\016service_status\030\006 \001(\0132\026.con" + - "text.ServiceStatus\022.\n\016service_config\030\007 \001" + - "(\0132\026.context.ServiceConfig\022%\n\ttimestamp\030" + - "\010 \001(\0132\022.context.Timestamp\"C\n\rServiceStat" + - "us\0222\n\016service_status\030\001 \001(\0162\032.context.Ser" + - "viceStatusEnum\":\n\rServiceConfig\022)\n\014confi" + - "g_rules\030\001 \003(\0132\023.context.ConfigRule\"8\n\rSe" + - "rviceIdList\022\'\n\013service_ids\030\001 \003(\0132\022.conte" + - "xt.ServiceId\"1\n\013ServiceList\022\"\n\010services\030" + - "\001 \003(\0132\020.context.Service\"\225\001\n\rServiceFilte" + - "r\022+\n\013service_ids\030\001 \001(\0132\026.context.Service" + - "IdList\022\034\n\024include_endpoint_ids\030\002 \001(\010\022\033\n\023" + - "include_constraints\030\003 \001(\010\022\034\n\024include_con" + - "fig_rules\030\004 \001(\010\"U\n\014ServiceEvent\022\035\n\005event" + - "\030\001 \001(\0132\016.context.Event\022&\n\nservice_id\030\002 \001" + - "(\0132\022.context.ServiceId\"T\n\007SliceId\022&\n\ncon" + - "text_id\030\001 \001(\0132\022.context.ContextId\022!\n\nsli" + - "ce_uuid\030\002 \001(\0132\r.context.Uuid\"\240\003\n\005Slice\022\"" + - "\n\010slice_id\030\001 \001(\0132\020.context.SliceId\022\014\n\004na" + - "me\030\002 \001(\t\022/\n\022slice_endpoint_ids\030\003 \003(\0132\023.c" + - "ontext.EndPointId\022.\n\021slice_constraints\030\004" + - " \003(\0132\023.context.Constraint\022-\n\021slice_servi" + - "ce_ids\030\005 \003(\0132\022.context.ServiceId\022,\n\022slic" + - "e_subslice_ids\030\006 \003(\0132\020.context.SliceId\022*" + - "\n\014slice_status\030\007 \001(\0132\024.context.SliceStat" + - "us\022*\n\014slice_config\030\010 \001(\0132\024.context.Slice" + - "Config\022(\n\013slice_owner\030\t \001(\0132\023.context.Sl" + - "iceOwner\022%\n\ttimestamp\030\n \001(\0132\022.context.Ti" + - "mestamp\"E\n\nSliceOwner\022!\n\nowner_uuid\030\001 \001(" + - "\0132\r.context.Uuid\022\024\n\014owner_string\030\002 \001(\t\"=" + - "\n\013SliceStatus\022.\n\014slice_status\030\001 \001(\0162\030.co" + - "ntext.SliceStatusEnum\"8\n\013SliceConfig\022)\n\014" + - "config_rules\030\001 \003(\0132\023.context.ConfigRule\"" + - "2\n\013SliceIdList\022#\n\tslice_ids\030\001 \003(\0132\020.cont" + - "ext.SliceId\"+\n\tSliceList\022\036\n\006slices\030\001 \003(\013" + - "2\016.context.Slice\"\312\001\n\013SliceFilter\022\'\n\tslic" + - "e_ids\030\001 \001(\0132\024.context.SliceIdList\022\034\n\024inc" + - "lude_endpoint_ids\030\002 \001(\010\022\033\n\023include_const" + - "raints\030\003 \001(\010\022\033\n\023include_service_ids\030\004 \001(" + - "\010\022\034\n\024include_subslice_ids\030\005 \001(\010\022\034\n\024inclu" + - "de_config_rules\030\006 \001(\010\"O\n\nSliceEvent\022\035\n\005e" + - "vent\030\001 \001(\0132\016.context.Event\022\"\n\010slice_id\030\002" + - " \001(\0132\020.context.SliceId\"6\n\014ConnectionId\022&" + - "\n\017connection_uuid\030\001 \001(\0132\r.context.Uuid\"2" + - "\n\025ConnectionSettings_L0\022\031\n\021lsp_symbolic_" + - "name\030\001 \001(\t\"\236\001\n\025ConnectionSettings_L2\022\027\n\017" + - "src_mac_address\030\001 \001(\t\022\027\n\017dst_mac_address" + - "\030\002 \001(\t\022\022\n\nether_type\030\003 \001(\r\022\017\n\007vlan_id\030\004 " + - "\001(\r\022\022\n\nmpls_label\030\005 \001(\r\022\032\n\022mpls_traffic_" + - "class\030\006 \001(\r\"t\n\025ConnectionSettings_L3\022\026\n\016" + - "src_ip_address\030\001 \001(\t\022\026\n\016dst_ip_address\030\002" + - " \001(\t\022\014\n\004dscp\030\003 \001(\r\022\020\n\010protocol\030\004 \001(\r\022\013\n\003" + - "ttl\030\005 \001(\r\"[\n\025ConnectionSettings_L4\022\020\n\010sr" + - "c_port\030\001 \001(\r\022\020\n\010dst_port\030\002 \001(\r\022\021\n\ttcp_fl" + - "ags\030\003 \001(\r\022\013\n\003ttl\030\004 \001(\r\"\304\001\n\022ConnectionSet" + - "tings\022*\n\002l0\030\001 \001(\0132\036.context.ConnectionSe" + - "ttings_L0\022*\n\002l2\030\002 \001(\0132\036.context.Connecti" + - "onSettings_L2\022*\n\002l3\030\003 \001(\0132\036.context.Conn" + - "ectionSettings_L3\022*\n\002l4\030\004 \001(\0132\036.context." + - "ConnectionSettings_L4\"\363\001\n\nConnection\022,\n\r" + - "connection_id\030\001 \001(\0132\025.context.Connection" + - "Id\022&\n\nservice_id\030\002 \001(\0132\022.context.Service" + - "Id\0223\n\026path_hops_endpoint_ids\030\003 \003(\0132\023.con" + - "text.EndPointId\022+\n\017sub_service_ids\030\004 \003(\013" + - "2\022.context.ServiceId\022-\n\010settings\030\005 \001(\0132\033" + - ".context.ConnectionSettings\"A\n\020Connectio" + - "nIdList\022-\n\016connection_ids\030\001 \003(\0132\025.contex" + - "t.ConnectionId\":\n\016ConnectionList\022(\n\013conn" + - "ections\030\001 \003(\0132\023.context.Connection\"^\n\017Co" + - "nnectionEvent\022\035\n\005event\030\001 \001(\0132\016.context.E" + - "vent\022,\n\rconnection_id\030\002 \001(\0132\025.context.Co" + - "nnectionId\"\202\001\n\nEndPointId\022(\n\013topology_id" + - "\030\001 \001(\0132\023.context.TopologyId\022$\n\tdevice_id" + - "\030\002 \001(\0132\021.context.DeviceId\022$\n\rendpoint_uu" + - "id\030\003 \001(\0132\r.context.Uuid\"\302\001\n\010EndPoint\022(\n\013" + - "endpoint_id\030\001 \001(\0132\023.context.EndPointId\022\014" + - "\n\004name\030\002 \001(\t\022\025\n\rendpoint_type\030\003 \001(\t\0229\n\020k" + - "pi_sample_types\030\004 \003(\0162\037.kpi_sample_types" + - ".KpiSampleType\022,\n\021endpoint_location\030\005 \001(" + - "\0132\021.context.Location\"{\n\014EndPointName\022(\n\013" + - "endpoint_id\030\001 \001(\0132\023.context.EndPointId\022\023" + - "\n\013device_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 \001" + - "(\t\022\025\n\rendpoint_type\030\004 \001(\t\";\n\016EndPointIdL" + - "ist\022)\n\014endpoint_ids\030\001 \003(\0132\023.context.EndP" + - "ointId\"A\n\020EndPointNameList\022-\n\016endpoint_n" + - "ames\030\001 \003(\0132\025.context.EndPointName\"A\n\021Con" + - "figRule_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n\016" + - "resource_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022(" + - "\n\013endpoint_id\030\001 \001(\0132\023.context.EndPointId" + - "\022!\n\010rule_set\030\002 \001(\0132\017.acl.AclRuleSet\"\234\001\n\n" + - "ConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Con" + - "figActionEnum\022,\n\006custom\030\002 \001(\0132\032.context." + - "ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.conte" + - "xt.ConfigRule_ACLH\000B\r\n\013config_rule\"F\n\021Co" + - "nstraint_Custom\022\027\n\017constraint_type\030\001 \001(\t" + - "\022\030\n\020constraint_value\030\002 \001(\t\"E\n\023Constraint" + - "_Schedule\022\027\n\017start_timestamp\030\001 \001(\002\022\025\n\rdu" + - "ration_days\030\002 \001(\002\"3\n\014GPS_Position\022\020\n\010lat" + - "itude\030\001 \001(\002\022\021\n\tlongitude\030\002 \001(\002\"W\n\010Locati" + - "on\022\020\n\006region\030\001 \001(\tH\000\022-\n\014gps_position\030\002 \001" + - "(\0132\025.context.GPS_PositionH\000B\n\n\010location\"" + - "l\n\033Constraint_EndPointLocation\022(\n\013endpoi" + - "nt_id\030\001 \001(\0132\023.context.EndPointId\022#\n\010loca" + - "tion\030\002 \001(\0132\021.context.Location\"Y\n\033Constra" + - "int_EndPointPriority\022(\n\013endpoint_id\030\001 \001(" + - "\0132\023.context.EndPointId\022\020\n\010priority\030\002 \001(\r" + - "\"0\n\026Constraint_SLA_Latency\022\026\n\016e2e_latenc" + - "y_ms\030\001 \001(\002\"0\n\027Constraint_SLA_Capacity\022\025\n" + - "\rcapacity_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_A" + - "vailability\022\032\n\022num_disjoint_paths\030\001 \001(\r\022" + - "\022\n\nall_active\030\002 \001(\010\022\024\n\014availability\030\003 \001(" + - "\002\"V\n\036Constraint_SLA_Isolation_level\0224\n\017i" + - "solation_level\030\001 \003(\0162\033.context.Isolation" + - "LevelEnum\"\242\001\n\025Constraint_Exclusions\022\024\n\014i" + - "s_permanent\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021." + - "context.DeviceId\022)\n\014endpoint_ids\030\003 \003(\0132\023" + - ".context.EndPointId\022!\n\010link_ids\030\004 \003(\0132\017." + - "context.LinkId\"\333\004\n\nConstraint\022-\n\006action\030" + - "\001 \001(\0162\035.context.ConstraintActionEnum\022,\n\006" + - "custom\030\002 \001(\0132\032.context.Constraint_Custom" + - "H\000\0220\n\010schedule\030\003 \001(\0132\034.context.Constrain" + - "t_ScheduleH\000\022A\n\021endpoint_location\030\004 \001(\0132" + - "$.context.Constraint_EndPointLocationH\000\022" + - "A\n\021endpoint_priority\030\005 \001(\0132$.context.Con" + - "straint_EndPointPriorityH\000\0228\n\014sla_capaci" + - "ty\030\006 \001(\0132 .context.Constraint_SLA_Capaci" + - "tyH\000\0226\n\013sla_latency\030\007 \001(\0132\037.context.Cons" + - "traint_SLA_LatencyH\000\022@\n\020sla_availability" + - "\030\010 \001(\0132$.context.Constraint_SLA_Availabi" + - "lityH\000\022@\n\rsla_isolation\030\t \001(\0132\'.context." + - "Constraint_SLA_Isolation_levelH\000\0224\n\nexcl" + - "usions\030\n \001(\0132\036.context.Constraint_Exclus" + - "ionsH\000B\014\n\nconstraint\"^\n\022TeraFlowControll" + - "er\022&\n\ncontext_id\030\001 \001(\0132\022.context.Context" + - "Id\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n\024" + - "AuthenticationResult\022&\n\ncontext_id\030\001 \001(\013" + - "2\022.context.ContextId\022\025\n\rauthenticated\030\002 " + - "\001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEFI" + - "NED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYPE" + - "_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Devi" + - "ceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020\000" + - "\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICED" + - "RIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P4" + - "\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOGY" + - "\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVIC" + - "EDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020" + - "\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n\033" + - "DeviceOperationalStatusEnum\022%\n!DEVICEOPE" + - "RATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPER" + - "ATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERAT" + - "IONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEnu" + - "m\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETYP" + - "E_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVIC" + - "ETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SER" + - "VICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027S" + - "ERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTATU" + - "S_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032\n" + - "\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTAT" + - "US_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_SL" + - "A_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLIC" + - "ESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLANN" + - "ED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTATU" + - "S_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030SL" + - "ICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigAction" + - "Enum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CONF" + - "IGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002*" + - "m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTACT" + - "ION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET\020" + - "\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isola" + - "tionLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYSI" + - "CAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022\025" + - "\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMORY" + - "_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLATI" + - "ON\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n\033" + - "NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVICE" + - "_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016ListC" + - "ontextIds\022\016.context.Empty\032\026.context.Cont" + - "extIdList\"\000\0226\n\014ListContexts\022\016.context.Em" + - "pty\032\024.context.ContextList\"\000\0224\n\nGetContex" + - "t\022\022.context.ContextId\032\020.context.Context\"" + - "\000\0224\n\nSetContext\022\020.context.Context\032\022.cont" + - "ext.ContextId\"\000\0225\n\rRemoveContext\022\022.conte" + - "xt.ContextId\032\016.context.Empty\"\000\022=\n\020GetCon" + - "textEvents\022\016.context.Empty\032\025.context.Con" + - "textEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.conte" + - "xt.ContextId\032\027.context.TopologyIdList\"\000\022" + - "=\n\016ListTopologies\022\022.context.ContextId\032\025." + - "context.TopologyList\"\000\0227\n\013GetTopology\022\023." + - "context.TopologyId\032\021.context.Topology\"\000\022" + - "E\n\022GetTopologyDetails\022\023.context.Topology" + - "Id\032\030.context.TopologyDetails\"\000\0227\n\013SetTop" + - "ology\022\021.context.Topology\032\023.context.Topol" + - "ogyId\"\000\0227\n\016RemoveTopology\022\023.context.Topo" + - "logyId\032\016.context.Empty\"\000\022?\n\021GetTopologyE" + - "vents\022\016.context.Empty\032\026.context.Topology" + - "Event\"\0000\001\0228\n\rListDeviceIds\022\016.context.Emp" + - "ty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevic" + - "es\022\016.context.Empty\032\023.context.DeviceList\"" + - "\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.cont" + - "ext.Device\"\000\0221\n\tSetDevice\022\017.context.Devi" + - "ce\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice\022" + - "\021.context.DeviceId\032\016.context.Empty\"\000\022;\n\017" + - "GetDeviceEvents\022\016.context.Empty\032\024.contex" + - "t.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.cont" + - "ext.DeviceFilter\032\023.context.DeviceList\"\000\022" + - "I\n\021ListEndPointNames\022\027.context.EndPointI" + - "dList\032\031.context.EndPointNameList\"\000\0224\n\013Li" + - "stLinkIds\022\016.context.Empty\032\023.context.Link" + - "IdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021." + - "context.LinkList\"\000\022+\n\007GetLink\022\017.context." + - "LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.con" + - "text.Link\032\017.context.LinkId\"\000\022/\n\nRemoveLi" + - "nk\022\017.context.LinkId\032\016.context.Empty\"\000\0227\n" + - "\rGetLinkEvents\022\016.context.Empty\032\022.context" + - ".LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.conte" + - "xt.ContextId\032\026.context.ServiceIdList\"\000\022:" + - "\n\014ListServices\022\022.context.ContextId\032\024.con" + - "text.ServiceList\"\000\0224\n\nGetService\022\022.conte" + - "xt.ServiceId\032\020.context.Service\"\000\0224\n\nSetS" + - "ervice\022\020.context.Service\032\022.context.Servi" + - "ceId\"\000\0226\n\014UnsetService\022\020.context.Service" + - "\032\022.context.ServiceId\"\000\0225\n\rRemoveService\022" + - "\022.context.ServiceId\032\016.context.Empty\"\000\022=\n" + - "\020GetServiceEvents\022\016.context.Empty\032\025.cont" + - "ext.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026." + - "context.ServiceFilter\032\024.context.ServiceL" + - "ist\"\000\022:\n\014ListSliceIds\022\022.context.ContextI" + - "d\032\024.context.SliceIdList\"\000\0226\n\nListSlices\022" + - "\022.context.ContextId\032\022.context.SliceList\"" + - "\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.contex" + - "t.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020." + - "context.SliceId\"\000\0220\n\nUnsetSlice\022\016.contex" + - "t.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSli" + - "ce\022\020.context.SliceId\032\016.context.Empty\"\000\0229" + - "\n\016GetSliceEvents\022\016.context.Empty\032\023.conte" + - "xt.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.conte" + - "xt.SliceFilter\032\022.context.SliceList\"\000\022D\n\021" + - "ListConnectionIds\022\022.context.ServiceId\032\031." + - "context.ConnectionIdList\"\000\022@\n\017ListConnec" + - "tions\022\022.context.ServiceId\032\027.context.Conn" + - "ectionList\"\000\022=\n\rGetConnection\022\025.context." + - "ConnectionId\032\023.context.Connection\"\000\022=\n\rS" + - "etConnection\022\023.context.Connection\032\025.cont" + - "ext.ConnectionId\"\000\022;\n\020RemoveConnection\022\025" + - ".context.ConnectionId\032\016.context.Empty\"\000\022" + - "C\n\023GetConnectionEvents\022\016.context.Empty\032\030" + - ".context.ConnectionEvent\"\0000\001b\006proto3" + "\n\tlink_uuid\030\001 \001(\0132\r.context.Uuid\"I\n\016Link" + + "Attributes\022\033\n\023total_capacity_gbps\030\001 \001(\002\022" + + "\032\n\022used_capacity_gbps\030\002 \001(\002\"\223\001\n\004Link\022 \n\007" + + "link_id\030\001 \001(\0132\017.context.LinkId\022\014\n\004name\030\002" + + " \001(\t\022.\n\021link_endpoint_ids\030\003 \003(\0132\023.contex" + + "t.EndPointId\022+\n\nattributes\030\004 \001(\0132\027.conte" + + "xt.LinkAttributes\"/\n\nLinkIdList\022!\n\010link_" + + "ids\030\001 \003(\0132\017.context.LinkId\"(\n\010LinkList\022\034" + + "\n\005links\030\001 \003(\0132\r.context.Link\"L\n\tLinkEven" + + "t\022\035\n\005event\030\001 \001(\0132\016.context.Event\022 \n\007link" + + "_id\030\002 \001(\0132\017.context.LinkId\"X\n\tServiceId\022" + + "&\n\ncontext_id\030\001 \001(\0132\022.context.ContextId\022" + + "#\n\014service_uuid\030\002 \001(\0132\r.context.Uuid\"\333\002\n" + + "\007Service\022&\n\nservice_id\030\001 \001(\0132\022.context.S" + + "erviceId\022\014\n\004name\030\002 \001(\t\022.\n\014service_type\030\003" + + " \001(\0162\030.context.ServiceTypeEnum\0221\n\024servic" + + "e_endpoint_ids\030\004 \003(\0132\023.context.EndPointI" + + "d\0220\n\023service_constraints\030\005 \003(\0132\023.context" + + ".Constraint\022.\n\016service_status\030\006 \001(\0132\026.co" + + "ntext.ServiceStatus\022.\n\016service_config\030\007 " + + "\001(\0132\026.context.ServiceConfig\022%\n\ttimestamp" + + "\030\010 \001(\0132\022.context.Timestamp\"C\n\rServiceSta" + + "tus\0222\n\016service_status\030\001 \001(\0162\032.context.Se" + + "rviceStatusEnum\":\n\rServiceConfig\022)\n\014conf" + + "ig_rules\030\001 \003(\0132\023.context.ConfigRule\"8\n\rS" + + "erviceIdList\022\'\n\013service_ids\030\001 \003(\0132\022.cont" + + "ext.ServiceId\"1\n\013ServiceList\022\"\n\010services" + + "\030\001 \003(\0132\020.context.Service\"\225\001\n\rServiceFilt" + + "er\022+\n\013service_ids\030\001 \001(\0132\026.context.Servic" + + "eIdList\022\034\n\024include_endpoint_ids\030\002 \001(\010\022\033\n" + + "\023include_constraints\030\003 \001(\010\022\034\n\024include_co" + + "nfig_rules\030\004 \001(\010\"U\n\014ServiceEvent\022\035\n\005even" + + "t\030\001 \001(\0132\016.context.Event\022&\n\nservice_id\030\002 " + + "\001(\0132\022.context.ServiceId\"T\n\007SliceId\022&\n\nco" + + "ntext_id\030\001 \001(\0132\022.context.ContextId\022!\n\nsl" + + "ice_uuid\030\002 \001(\0132\r.context.Uuid\"\240\003\n\005Slice\022" + + "\"\n\010slice_id\030\001 \001(\0132\020.context.SliceId\022\014\n\004n" + + "ame\030\002 \001(\t\022/\n\022slice_endpoint_ids\030\003 \003(\0132\023." + + "context.EndPointId\022.\n\021slice_constraints\030" + + "\004 \003(\0132\023.context.Constraint\022-\n\021slice_serv" + + "ice_ids\030\005 \003(\0132\022.context.ServiceId\022,\n\022sli" + + "ce_subslice_ids\030\006 \003(\0132\020.context.SliceId\022" + + "*\n\014slice_status\030\007 \001(\0132\024.context.SliceSta" + + "tus\022*\n\014slice_config\030\010 \001(\0132\024.context.Slic" + + "eConfig\022(\n\013slice_owner\030\t \001(\0132\023.context.S" + + "liceOwner\022%\n\ttimestamp\030\n \001(\0132\022.context.T" + + "imestamp\"E\n\nSliceOwner\022!\n\nowner_uuid\030\001 \001" + + "(\0132\r.context.Uuid\022\024\n\014owner_string\030\002 \001(\t\"" + + "=\n\013SliceStatus\022.\n\014slice_status\030\001 \001(\0162\030.c" + + "ontext.SliceStatusEnum\"8\n\013SliceConfig\022)\n" + + "\014config_rules\030\001 \003(\0132\023.context.ConfigRule" + + "\"2\n\013SliceIdList\022#\n\tslice_ids\030\001 \003(\0132\020.con" + + "text.SliceId\"+\n\tSliceList\022\036\n\006slices\030\001 \003(" + + "\0132\016.context.Slice\"\312\001\n\013SliceFilter\022\'\n\tsli" + + "ce_ids\030\001 \001(\0132\024.context.SliceIdList\022\034\n\024in" + + "clude_endpoint_ids\030\002 \001(\010\022\033\n\023include_cons" + + "traints\030\003 \001(\010\022\033\n\023include_service_ids\030\004 \001" + + "(\010\022\034\n\024include_subslice_ids\030\005 \001(\010\022\034\n\024incl" + + "ude_config_rules\030\006 \001(\010\"O\n\nSliceEvent\022\035\n\005" + + "event\030\001 \001(\0132\016.context.Event\022\"\n\010slice_id\030" + + "\002 \001(\0132\020.context.SliceId\"6\n\014ConnectionId\022" + + "&\n\017connection_uuid\030\001 \001(\0132\r.context.Uuid\"" + + "2\n\025ConnectionSettings_L0\022\031\n\021lsp_symbolic" + + "_name\030\001 \001(\t\"\236\001\n\025ConnectionSettings_L2\022\027\n" + + "\017src_mac_address\030\001 \001(\t\022\027\n\017dst_mac_addres" + + "s\030\002 \001(\t\022\022\n\nether_type\030\003 \001(\r\022\017\n\007vlan_id\030\004" + + " \001(\r\022\022\n\nmpls_label\030\005 \001(\r\022\032\n\022mpls_traffic" + + "_class\030\006 \001(\r\"t\n\025ConnectionSettings_L3\022\026\n" + + "\016src_ip_address\030\001 \001(\t\022\026\n\016dst_ip_address\030" + + "\002 \001(\t\022\014\n\004dscp\030\003 \001(\r\022\020\n\010protocol\030\004 \001(\r\022\013\n" + + "\003ttl\030\005 \001(\r\"[\n\025ConnectionSettings_L4\022\020\n\010s" + + "rc_port\030\001 \001(\r\022\020\n\010dst_port\030\002 \001(\r\022\021\n\ttcp_f" + + "lags\030\003 \001(\r\022\013\n\003ttl\030\004 \001(\r\"\304\001\n\022ConnectionSe" + + "ttings\022*\n\002l0\030\001 \001(\0132\036.context.ConnectionS" + + "ettings_L0\022*\n\002l2\030\002 \001(\0132\036.context.Connect" + + "ionSettings_L2\022*\n\002l3\030\003 \001(\0132\036.context.Con" + + "nectionSettings_L3\022*\n\002l4\030\004 \001(\0132\036.context" + + ".ConnectionSettings_L4\"\363\001\n\nConnection\022,\n" + + "\rconnection_id\030\001 \001(\0132\025.context.Connectio" + + "nId\022&\n\nservice_id\030\002 \001(\0132\022.context.Servic" + + "eId\0223\n\026path_hops_endpoint_ids\030\003 \003(\0132\023.co" + + "ntext.EndPointId\022+\n\017sub_service_ids\030\004 \003(" + + "\0132\022.context.ServiceId\022-\n\010settings\030\005 \001(\0132" + + "\033.context.ConnectionSettings\"A\n\020Connecti" + + "onIdList\022-\n\016connection_ids\030\001 \003(\0132\025.conte" + + "xt.ConnectionId\":\n\016ConnectionList\022(\n\013con" + + "nections\030\001 \003(\0132\023.context.Connection\"^\n\017C" + + "onnectionEvent\022\035\n\005event\030\001 \001(\0132\016.context." + + "Event\022,\n\rconnection_id\030\002 \001(\0132\025.context.C" + + "onnectionId\"\202\001\n\nEndPointId\022(\n\013topology_i" + + "d\030\001 \001(\0132\023.context.TopologyId\022$\n\tdevice_i" + + "d\030\002 \001(\0132\021.context.DeviceId\022$\n\rendpoint_u" + + "uid\030\003 \001(\0132\r.context.Uuid\"\302\001\n\010EndPoint\022(\n" + + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + + "\014\n\004name\030\002 \001(\t\022\025\n\rendpoint_type\030\003 \001(\t\0229\n\020" + + "kpi_sample_types\030\004 \003(\0162\037.kpi_sample_type" + + "s.KpiSampleType\022,\n\021endpoint_location\030\005 \001" + + "(\0132\021.context.Location\"{\n\014EndPointName\022(\n" + + "\013endpoint_id\030\001 \001(\0132\023.context.EndPointId\022" + + "\023\n\013device_name\030\002 \001(\t\022\025\n\rendpoint_name\030\003 " + + "\001(\t\022\025\n\rendpoint_type\030\004 \001(\t\";\n\016EndPointId" + + "List\022)\n\014endpoint_ids\030\001 \003(\0132\023.context.End" + + "PointId\"A\n\020EndPointNameList\022-\n\016endpoint_" + + "names\030\001 \003(\0132\025.context.EndPointName\"A\n\021Co" + + "nfigRule_Custom\022\024\n\014resource_key\030\001 \001(\t\022\026\n" + + "\016resource_value\030\002 \001(\t\"]\n\016ConfigRule_ACL\022" + + "(\n\013endpoint_id\030\001 \001(\0132\023.context.EndPointI" + + "d\022!\n\010rule_set\030\002 \001(\0132\017.acl.AclRuleSet\"\234\001\n" + + "\nConfigRule\022)\n\006action\030\001 \001(\0162\031.context.Co" + + "nfigActionEnum\022,\n\006custom\030\002 \001(\0132\032.context" + + ".ConfigRule_CustomH\000\022&\n\003acl\030\003 \001(\0132\027.cont" + + "ext.ConfigRule_ACLH\000B\r\n\013config_rule\"F\n\021C" + + "onstraint_Custom\022\027\n\017constraint_type\030\001 \001(" + + "\t\022\030\n\020constraint_value\030\002 \001(\t\"E\n\023Constrain" + + "t_Schedule\022\027\n\017start_timestamp\030\001 \001(\002\022\025\n\rd" + + "uration_days\030\002 \001(\002\"3\n\014GPS_Position\022\020\n\010la" + + "titude\030\001 \001(\002\022\021\n\tlongitude\030\002 \001(\002\"W\n\010Locat" + + "ion\022\020\n\006region\030\001 \001(\tH\000\022-\n\014gps_position\030\002 " + + "\001(\0132\025.context.GPS_PositionH\000B\n\n\010location" + + "\"l\n\033Constraint_EndPointLocation\022(\n\013endpo" + + "int_id\030\001 \001(\0132\023.context.EndPointId\022#\n\010loc" + + "ation\030\002 \001(\0132\021.context.Location\"Y\n\033Constr" + + "aint_EndPointPriority\022(\n\013endpoint_id\030\001 \001" + + "(\0132\023.context.EndPointId\022\020\n\010priority\030\002 \001(" + + "\r\"0\n\026Constraint_SLA_Latency\022\026\n\016e2e_laten" + + "cy_ms\030\001 \001(\002\"0\n\027Constraint_SLA_Capacity\022\025" + + "\n\rcapacity_gbps\030\001 \001(\002\"c\n\033Constraint_SLA_" + + "Availability\022\032\n\022num_disjoint_paths\030\001 \001(\r" + + "\022\022\n\nall_active\030\002 \001(\010\022\024\n\014availability\030\003 \001" + + "(\002\"V\n\036Constraint_SLA_Isolation_level\0224\n\017" + + "isolation_level\030\001 \003(\0162\033.context.Isolatio" + + "nLevelEnum\"\242\001\n\025Constraint_Exclusions\022\024\n\014" + + "is_permanent\030\001 \001(\010\022%\n\ndevice_ids\030\002 \003(\0132\021" + + ".context.DeviceId\022)\n\014endpoint_ids\030\003 \003(\0132" + + "\023.context.EndPointId\022!\n\010link_ids\030\004 \003(\0132\017" + + ".context.LinkId\"\333\004\n\nConstraint\022-\n\006action" + + "\030\001 \001(\0162\035.context.ConstraintActionEnum\022,\n" + + "\006custom\030\002 \001(\0132\032.context.Constraint_Custo" + + "mH\000\0220\n\010schedule\030\003 \001(\0132\034.context.Constrai" + + "nt_ScheduleH\000\022A\n\021endpoint_location\030\004 \001(\013" + + "2$.context.Constraint_EndPointLocationH\000" + + "\022A\n\021endpoint_priority\030\005 \001(\0132$.context.Co" + + "nstraint_EndPointPriorityH\000\0228\n\014sla_capac" + + "ity\030\006 \001(\0132 .context.Constraint_SLA_Capac" + + "ityH\000\0226\n\013sla_latency\030\007 \001(\0132\037.context.Con" + + "straint_SLA_LatencyH\000\022@\n\020sla_availabilit" + + "y\030\010 \001(\0132$.context.Constraint_SLA_Availab" + + "ilityH\000\022@\n\rsla_isolation\030\t \001(\0132\'.context" + + ".Constraint_SLA_Isolation_levelH\000\0224\n\nexc" + + "lusions\030\n \001(\0132\036.context.Constraint_Exclu" + + "sionsH\000B\014\n\nconstraint\"^\n\022TeraFlowControl" + + "ler\022&\n\ncontext_id\030\001 \001(\0132\022.context.Contex" + + "tId\022\022\n\nip_address\030\002 \001(\t\022\014\n\004port\030\003 \001(\r\"U\n" + + "\024AuthenticationResult\022&\n\ncontext_id\030\001 \001(" + + "\0132\022.context.ContextId\022\025\n\rauthenticated\030\002" + + " \001(\010*j\n\rEventTypeEnum\022\027\n\023EVENTTYPE_UNDEF" + + "INED\020\000\022\024\n\020EVENTTYPE_CREATE\020\001\022\024\n\020EVENTTYP" + + "E_UPDATE\020\002\022\024\n\020EVENTTYPE_REMOVE\020\003*\231\002\n\020Dev" + + "iceDriverEnum\022\032\n\026DEVICEDRIVER_UNDEFINED\020" + + "\000\022\033\n\027DEVICEDRIVER_OPENCONFIG\020\001\022\036\n\032DEVICE" + + "DRIVER_TRANSPORT_API\020\002\022\023\n\017DEVICEDRIVER_P" + + "4\020\003\022&\n\"DEVICEDRIVER_IETF_NETWORK_TOPOLOG" + + "Y\020\004\022\033\n\027DEVICEDRIVER_ONF_TR_532\020\005\022\023\n\017DEVI" + + "CEDRIVER_XR\020\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN" + + "\020\007\022 \n\034DEVICEDRIVER_GNMI_OPENCONFIG\020\010*\217\001\n" + + "\033DeviceOperationalStatusEnum\022%\n!DEVICEOP" + + "ERATIONALSTATUS_UNDEFINED\020\000\022$\n DEVICEOPE" + + "RATIONALSTATUS_DISABLED\020\001\022#\n\037DEVICEOPERA" + + "TIONALSTATUS_ENABLED\020\002*\225\001\n\017ServiceTypeEn" + + "um\022\027\n\023SERVICETYPE_UNKNOWN\020\000\022\024\n\020SERVICETY" + + "PE_L3NM\020\001\022\024\n\020SERVICETYPE_L2NM\020\002\022)\n%SERVI" + + "CETYPE_TAPI_CONNECTIVITY_SERVICE\020\003\022\022\n\016SE" + + "RVICETYPE_TE\020\004*\304\001\n\021ServiceStatusEnum\022\033\n\027" + + "SERVICESTATUS_UNDEFINED\020\000\022\031\n\025SERVICESTAT" + + "US_PLANNED\020\001\022\030\n\024SERVICESTATUS_ACTIVE\020\002\022\032" + + "\n\026SERVICESTATUS_UPDATING\020\003\022!\n\035SERVICESTA" + + "TUS_PENDING_REMOVAL\020\004\022\036\n\032SERVICESTATUS_S" + + "LA_VIOLATED\020\005*\251\001\n\017SliceStatusEnum\022\031\n\025SLI" + + "CESTATUS_UNDEFINED\020\000\022\027\n\023SLICESTATUS_PLAN" + + "NED\020\001\022\024\n\020SLICESTATUS_INIT\020\002\022\026\n\022SLICESTAT" + + "US_ACTIVE\020\003\022\026\n\022SLICESTATUS_DEINIT\020\004\022\034\n\030S" + + "LICESTATUS_SLA_VIOLATED\020\005*]\n\020ConfigActio" + + "nEnum\022\032\n\026CONFIGACTION_UNDEFINED\020\000\022\024\n\020CON" + + "FIGACTION_SET\020\001\022\027\n\023CONFIGACTION_DELETE\020\002" + + "*m\n\024ConstraintActionEnum\022\036\n\032CONSTRAINTAC" + + "TION_UNDEFINED\020\000\022\030\n\024CONSTRAINTACTION_SET" + + "\020\001\022\033\n\027CONSTRAINTACTION_DELETE\020\002*\203\002\n\022Isol" + + "ationLevelEnum\022\020\n\014NO_ISOLATION\020\000\022\026\n\022PHYS" + + "ICAL_ISOLATION\020\001\022\025\n\021LOGICAL_ISOLATION\020\002\022" + + "\025\n\021PROCESS_ISOLATION\020\003\022\035\n\031PHYSICAL_MEMOR" + + "Y_ISOLATION\020\004\022\036\n\032PHYSICAL_NETWORK_ISOLAT" + + "ION\020\005\022\036\n\032VIRTUAL_RESOURCE_ISOLATION\020\006\022\037\n" + + "\033NETWORK_FUNCTIONS_ISOLATION\020\007\022\025\n\021SERVIC" + + "E_ISOLATION\020\0102\245\026\n\016ContextService\022:\n\016List" + + "ContextIds\022\016.context.Empty\032\026.context.Con" + + "textIdList\"\000\0226\n\014ListContexts\022\016.context.E" + + "mpty\032\024.context.ContextList\"\000\0224\n\nGetConte" + + "xt\022\022.context.ContextId\032\020.context.Context" + + "\"\000\0224\n\nSetContext\022\020.context.Context\032\022.con" + + "text.ContextId\"\000\0225\n\rRemoveContext\022\022.cont" + + "ext.ContextId\032\016.context.Empty\"\000\022=\n\020GetCo" + + "ntextEvents\022\016.context.Empty\032\025.context.Co" + + "ntextEvent\"\0000\001\022@\n\017ListTopologyIds\022\022.cont" + + "ext.ContextId\032\027.context.TopologyIdList\"\000" + + "\022=\n\016ListTopologies\022\022.context.ContextId\032\025" + + ".context.TopologyList\"\000\0227\n\013GetTopology\022\023" + + ".context.TopologyId\032\021.context.Topology\"\000" + + "\022E\n\022GetTopologyDetails\022\023.context.Topolog" + + "yId\032\030.context.TopologyDetails\"\000\0227\n\013SetTo" + + "pology\022\021.context.Topology\032\023.context.Topo" + + "logyId\"\000\0227\n\016RemoveTopology\022\023.context.Top" + + "ologyId\032\016.context.Empty\"\000\022?\n\021GetTopology" + + "Events\022\016.context.Empty\032\026.context.Topolog" + + "yEvent\"\0000\001\0228\n\rListDeviceIds\022\016.context.Em" + + "pty\032\025.context.DeviceIdList\"\000\0224\n\013ListDevi" + + "ces\022\016.context.Empty\032\023.context.DeviceList" + + "\"\000\0221\n\tGetDevice\022\021.context.DeviceId\032\017.con" + + "text.Device\"\000\0221\n\tSetDevice\022\017.context.Dev" + + "ice\032\021.context.DeviceId\"\000\0223\n\014RemoveDevice" + + "\022\021.context.DeviceId\032\016.context.Empty\"\000\022;\n" + + "\017GetDeviceEvents\022\016.context.Empty\032\024.conte" + + "xt.DeviceEvent\"\0000\001\022<\n\014SelectDevice\022\025.con" + + "text.DeviceFilter\032\023.context.DeviceList\"\000" + + "\022I\n\021ListEndPointNames\022\027.context.EndPoint" + + "IdList\032\031.context.EndPointNameList\"\000\0224\n\013L" + + "istLinkIds\022\016.context.Empty\032\023.context.Lin" + + "kIdList\"\000\0220\n\tListLinks\022\016.context.Empty\032\021" + + ".context.LinkList\"\000\022+\n\007GetLink\022\017.context" + + ".LinkId\032\r.context.Link\"\000\022+\n\007SetLink\022\r.co" + + "ntext.Link\032\017.context.LinkId\"\000\022/\n\nRemoveL" + + "ink\022\017.context.LinkId\032\016.context.Empty\"\000\0227" + + "\n\rGetLinkEvents\022\016.context.Empty\032\022.contex" + + "t.LinkEvent\"\0000\001\022>\n\016ListServiceIds\022\022.cont" + + "ext.ContextId\032\026.context.ServiceIdList\"\000\022" + + ":\n\014ListServices\022\022.context.ContextId\032\024.co" + + "ntext.ServiceList\"\000\0224\n\nGetService\022\022.cont" + + "ext.ServiceId\032\020.context.Service\"\000\0224\n\nSet" + + "Service\022\020.context.Service\032\022.context.Serv" + + "iceId\"\000\0226\n\014UnsetService\022\020.context.Servic" + + "e\032\022.context.ServiceId\"\000\0225\n\rRemoveService" + + "\022\022.context.ServiceId\032\016.context.Empty\"\000\022=" + + "\n\020GetServiceEvents\022\016.context.Empty\032\025.con" + + "text.ServiceEvent\"\0000\001\022?\n\rSelectService\022\026" + + ".context.ServiceFilter\032\024.context.Service" + + "List\"\000\022:\n\014ListSliceIds\022\022.context.Context" + + "Id\032\024.context.SliceIdList\"\000\0226\n\nListSlices" + + "\022\022.context.ContextId\032\022.context.SliceList" + + "\"\000\022.\n\010GetSlice\022\020.context.SliceId\032\016.conte" + + "xt.Slice\"\000\022.\n\010SetSlice\022\016.context.Slice\032\020" + + ".context.SliceId\"\000\0220\n\nUnsetSlice\022\016.conte" + + "xt.Slice\032\020.context.SliceId\"\000\0221\n\013RemoveSl" + + "ice\022\020.context.SliceId\032\016.context.Empty\"\000\022" + + "9\n\016GetSliceEvents\022\016.context.Empty\032\023.cont" + + "ext.SliceEvent\"\0000\001\0229\n\013SelectSlice\022\024.cont" + + "ext.SliceFilter\032\022.context.SliceList\"\000\022D\n" + + "\021ListConnectionIds\022\022.context.ServiceId\032\031" + + ".context.ConnectionIdList\"\000\022@\n\017ListConne" + + "ctions\022\022.context.ServiceId\032\027.context.Con" + + "nectionList\"\000\022=\n\rGetConnection\022\025.context" + + ".ConnectionId\032\023.context.Connection\"\000\022=\n\r" + + "SetConnection\022\023.context.Connection\032\025.con" + + "text.ConnectionId\"\000\022;\n\020RemoveConnection\022" + + "\025.context.ConnectionId\032\016.context.Empty\"\000" + + "\022C\n\023GetConnectionEvents\022\016.context.Empty\032" + + "\030.context.ConnectionEvent\"\0000\001b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -75318,320 +76091,326 @@ public final class ContextOuterClass { com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkId_descriptor, new java.lang.String[] { "LinkUuid", }); - internal_static_context_Link_descriptor = + internal_static_context_LinkAttributes_descriptor = getDescriptor().getMessageTypes().get(24); + internal_static_context_LinkAttributes_fieldAccessorTable = new + com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( + internal_static_context_LinkAttributes_descriptor, + new java.lang.String[] { "TotalCapacityGbps", "UsedCapacityGbps", }); + internal_static_context_Link_descriptor = + getDescriptor().getMessageTypes().get(25); internal_static_context_Link_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Link_descriptor, - new java.lang.String[] { "LinkId", "Name", "LinkEndpointIds", }); + new java.lang.String[] { "LinkId", "Name", "LinkEndpointIds", "Attributes", }); internal_static_context_LinkIdList_descriptor = - getDescriptor().getMessageTypes().get(25); + getDescriptor().getMessageTypes().get(26); internal_static_context_LinkIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkIdList_descriptor, new java.lang.String[] { "LinkIds", }); internal_static_context_LinkList_descriptor = - getDescriptor().getMessageTypes().get(26); + getDescriptor().getMessageTypes().get(27); internal_static_context_LinkList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkList_descriptor, new java.lang.String[] { "Links", }); internal_static_context_LinkEvent_descriptor = - getDescriptor().getMessageTypes().get(27); + getDescriptor().getMessageTypes().get(28); internal_static_context_LinkEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_LinkEvent_descriptor, new java.lang.String[] { "Event", "LinkId", }); internal_static_context_ServiceId_descriptor = - getDescriptor().getMessageTypes().get(28); + getDescriptor().getMessageTypes().get(29); internal_static_context_ServiceId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceId_descriptor, new java.lang.String[] { "ContextId", "ServiceUuid", }); internal_static_context_Service_descriptor = - getDescriptor().getMessageTypes().get(29); + getDescriptor().getMessageTypes().get(30); internal_static_context_Service_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Service_descriptor, new java.lang.String[] { "ServiceId", "Name", "ServiceType", "ServiceEndpointIds", "ServiceConstraints", "ServiceStatus", "ServiceConfig", "Timestamp", }); internal_static_context_ServiceStatus_descriptor = - getDescriptor().getMessageTypes().get(30); + getDescriptor().getMessageTypes().get(31); internal_static_context_ServiceStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceStatus_descriptor, new java.lang.String[] { "ServiceStatus", }); internal_static_context_ServiceConfig_descriptor = - getDescriptor().getMessageTypes().get(31); + getDescriptor().getMessageTypes().get(32); internal_static_context_ServiceConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceConfig_descriptor, new java.lang.String[] { "ConfigRules", }); internal_static_context_ServiceIdList_descriptor = - getDescriptor().getMessageTypes().get(32); + getDescriptor().getMessageTypes().get(33); internal_static_context_ServiceIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceIdList_descriptor, new java.lang.String[] { "ServiceIds", }); internal_static_context_ServiceList_descriptor = - getDescriptor().getMessageTypes().get(33); + getDescriptor().getMessageTypes().get(34); internal_static_context_ServiceList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceList_descriptor, new java.lang.String[] { "Services", }); internal_static_context_ServiceFilter_descriptor = - getDescriptor().getMessageTypes().get(34); + getDescriptor().getMessageTypes().get(35); internal_static_context_ServiceFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceFilter_descriptor, new java.lang.String[] { "ServiceIds", "IncludeEndpointIds", "IncludeConstraints", "IncludeConfigRules", }); internal_static_context_ServiceEvent_descriptor = - getDescriptor().getMessageTypes().get(35); + getDescriptor().getMessageTypes().get(36); internal_static_context_ServiceEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ServiceEvent_descriptor, new java.lang.String[] { "Event", "ServiceId", }); internal_static_context_SliceId_descriptor = - getDescriptor().getMessageTypes().get(36); + getDescriptor().getMessageTypes().get(37); internal_static_context_SliceId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceId_descriptor, new java.lang.String[] { "ContextId", "SliceUuid", }); internal_static_context_Slice_descriptor = - getDescriptor().getMessageTypes().get(37); + getDescriptor().getMessageTypes().get(38); internal_static_context_Slice_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Slice_descriptor, new java.lang.String[] { "SliceId", "Name", "SliceEndpointIds", "SliceConstraints", "SliceServiceIds", "SliceSubsliceIds", "SliceStatus", "SliceConfig", "SliceOwner", "Timestamp", }); internal_static_context_SliceOwner_descriptor = - getDescriptor().getMessageTypes().get(38); + getDescriptor().getMessageTypes().get(39); internal_static_context_SliceOwner_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceOwner_descriptor, new java.lang.String[] { "OwnerUuid", "OwnerString", }); internal_static_context_SliceStatus_descriptor = - getDescriptor().getMessageTypes().get(39); + getDescriptor().getMessageTypes().get(40); internal_static_context_SliceStatus_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceStatus_descriptor, new java.lang.String[] { "SliceStatus", }); internal_static_context_SliceConfig_descriptor = - getDescriptor().getMessageTypes().get(40); + getDescriptor().getMessageTypes().get(41); internal_static_context_SliceConfig_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceConfig_descriptor, new java.lang.String[] { "ConfigRules", }); internal_static_context_SliceIdList_descriptor = - getDescriptor().getMessageTypes().get(41); + getDescriptor().getMessageTypes().get(42); internal_static_context_SliceIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceIdList_descriptor, new java.lang.String[] { "SliceIds", }); internal_static_context_SliceList_descriptor = - getDescriptor().getMessageTypes().get(42); + getDescriptor().getMessageTypes().get(43); internal_static_context_SliceList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceList_descriptor, new java.lang.String[] { "Slices", }); internal_static_context_SliceFilter_descriptor = - getDescriptor().getMessageTypes().get(43); + getDescriptor().getMessageTypes().get(44); internal_static_context_SliceFilter_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceFilter_descriptor, new java.lang.String[] { "SliceIds", "IncludeEndpointIds", "IncludeConstraints", "IncludeServiceIds", "IncludeSubsliceIds", "IncludeConfigRules", }); internal_static_context_SliceEvent_descriptor = - getDescriptor().getMessageTypes().get(44); + getDescriptor().getMessageTypes().get(45); internal_static_context_SliceEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_SliceEvent_descriptor, new java.lang.String[] { "Event", "SliceId", }); internal_static_context_ConnectionId_descriptor = - getDescriptor().getMessageTypes().get(45); + getDescriptor().getMessageTypes().get(46); internal_static_context_ConnectionId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionId_descriptor, new java.lang.String[] { "ConnectionUuid", }); internal_static_context_ConnectionSettings_L0_descriptor = - getDescriptor().getMessageTypes().get(46); + getDescriptor().getMessageTypes().get(47); internal_static_context_ConnectionSettings_L0_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L0_descriptor, new java.lang.String[] { "LspSymbolicName", }); internal_static_context_ConnectionSettings_L2_descriptor = - getDescriptor().getMessageTypes().get(47); + getDescriptor().getMessageTypes().get(48); internal_static_context_ConnectionSettings_L2_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L2_descriptor, new java.lang.String[] { "SrcMacAddress", "DstMacAddress", "EtherType", "VlanId", "MplsLabel", "MplsTrafficClass", }); internal_static_context_ConnectionSettings_L3_descriptor = - getDescriptor().getMessageTypes().get(48); + getDescriptor().getMessageTypes().get(49); internal_static_context_ConnectionSettings_L3_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L3_descriptor, new java.lang.String[] { "SrcIpAddress", "DstIpAddress", "Dscp", "Protocol", "Ttl", }); internal_static_context_ConnectionSettings_L4_descriptor = - getDescriptor().getMessageTypes().get(49); + getDescriptor().getMessageTypes().get(50); internal_static_context_ConnectionSettings_L4_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_L4_descriptor, new java.lang.String[] { "SrcPort", "DstPort", "TcpFlags", "Ttl", }); internal_static_context_ConnectionSettings_descriptor = - getDescriptor().getMessageTypes().get(50); + getDescriptor().getMessageTypes().get(51); internal_static_context_ConnectionSettings_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionSettings_descriptor, new java.lang.String[] { "L0", "L2", "L3", "L4", }); internal_static_context_Connection_descriptor = - getDescriptor().getMessageTypes().get(51); + getDescriptor().getMessageTypes().get(52); internal_static_context_Connection_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Connection_descriptor, new java.lang.String[] { "ConnectionId", "ServiceId", "PathHopsEndpointIds", "SubServiceIds", "Settings", }); internal_static_context_ConnectionIdList_descriptor = - getDescriptor().getMessageTypes().get(52); + getDescriptor().getMessageTypes().get(53); internal_static_context_ConnectionIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionIdList_descriptor, new java.lang.String[] { "ConnectionIds", }); internal_static_context_ConnectionList_descriptor = - getDescriptor().getMessageTypes().get(53); + getDescriptor().getMessageTypes().get(54); internal_static_context_ConnectionList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionList_descriptor, new java.lang.String[] { "Connections", }); internal_static_context_ConnectionEvent_descriptor = - getDescriptor().getMessageTypes().get(54); + getDescriptor().getMessageTypes().get(55); internal_static_context_ConnectionEvent_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConnectionEvent_descriptor, new java.lang.String[] { "Event", "ConnectionId", }); internal_static_context_EndPointId_descriptor = - getDescriptor().getMessageTypes().get(55); + getDescriptor().getMessageTypes().get(56); internal_static_context_EndPointId_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointId_descriptor, new java.lang.String[] { "TopologyId", "DeviceId", "EndpointUuid", }); internal_static_context_EndPoint_descriptor = - getDescriptor().getMessageTypes().get(56); + getDescriptor().getMessageTypes().get(57); internal_static_context_EndPoint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPoint_descriptor, new java.lang.String[] { "EndpointId", "Name", "EndpointType", "KpiSampleTypes", "EndpointLocation", }); internal_static_context_EndPointName_descriptor = - getDescriptor().getMessageTypes().get(57); + getDescriptor().getMessageTypes().get(58); internal_static_context_EndPointName_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointName_descriptor, new java.lang.String[] { "EndpointId", "DeviceName", "EndpointName", "EndpointType", }); internal_static_context_EndPointIdList_descriptor = - getDescriptor().getMessageTypes().get(58); + getDescriptor().getMessageTypes().get(59); internal_static_context_EndPointIdList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointIdList_descriptor, new java.lang.String[] { "EndpointIds", }); internal_static_context_EndPointNameList_descriptor = - getDescriptor().getMessageTypes().get(59); + getDescriptor().getMessageTypes().get(60); internal_static_context_EndPointNameList_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_EndPointNameList_descriptor, new java.lang.String[] { "EndpointNames", }); internal_static_context_ConfigRule_Custom_descriptor = - getDescriptor().getMessageTypes().get(60); + getDescriptor().getMessageTypes().get(61); internal_static_context_ConfigRule_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_Custom_descriptor, new java.lang.String[] { "ResourceKey", "ResourceValue", }); internal_static_context_ConfigRule_ACL_descriptor = - getDescriptor().getMessageTypes().get(61); + getDescriptor().getMessageTypes().get(62); internal_static_context_ConfigRule_ACL_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_ACL_descriptor, new java.lang.String[] { "EndpointId", "RuleSet", }); internal_static_context_ConfigRule_descriptor = - getDescriptor().getMessageTypes().get(62); + getDescriptor().getMessageTypes().get(63); internal_static_context_ConfigRule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_ConfigRule_descriptor, new java.lang.String[] { "Action", "Custom", "Acl", "ConfigRule", }); internal_static_context_Constraint_Custom_descriptor = - getDescriptor().getMessageTypes().get(63); + getDescriptor().getMessageTypes().get(64); internal_static_context_Constraint_Custom_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Custom_descriptor, new java.lang.String[] { "ConstraintType", "ConstraintValue", }); internal_static_context_Constraint_Schedule_descriptor = - getDescriptor().getMessageTypes().get(64); + getDescriptor().getMessageTypes().get(65); internal_static_context_Constraint_Schedule_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Schedule_descriptor, new java.lang.String[] { "StartTimestamp", "DurationDays", }); internal_static_context_GPS_Position_descriptor = - getDescriptor().getMessageTypes().get(65); + getDescriptor().getMessageTypes().get(66); internal_static_context_GPS_Position_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_GPS_Position_descriptor, new java.lang.String[] { "Latitude", "Longitude", }); internal_static_context_Location_descriptor = - getDescriptor().getMessageTypes().get(66); + getDescriptor().getMessageTypes().get(67); internal_static_context_Location_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Location_descriptor, new java.lang.String[] { "Region", "GpsPosition", "Location", }); internal_static_context_Constraint_EndPointLocation_descriptor = - getDescriptor().getMessageTypes().get(67); + getDescriptor().getMessageTypes().get(68); internal_static_context_Constraint_EndPointLocation_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_EndPointLocation_descriptor, new java.lang.String[] { "EndpointId", "Location", }); internal_static_context_Constraint_EndPointPriority_descriptor = - getDescriptor().getMessageTypes().get(68); + getDescriptor().getMessageTypes().get(69); internal_static_context_Constraint_EndPointPriority_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_EndPointPriority_descriptor, new java.lang.String[] { "EndpointId", "Priority", }); internal_static_context_Constraint_SLA_Latency_descriptor = - getDescriptor().getMessageTypes().get(69); + getDescriptor().getMessageTypes().get(70); internal_static_context_Constraint_SLA_Latency_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Latency_descriptor, new java.lang.String[] { "E2ELatencyMs", }); internal_static_context_Constraint_SLA_Capacity_descriptor = - getDescriptor().getMessageTypes().get(70); + getDescriptor().getMessageTypes().get(71); internal_static_context_Constraint_SLA_Capacity_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Capacity_descriptor, new java.lang.String[] { "CapacityGbps", }); internal_static_context_Constraint_SLA_Availability_descriptor = - getDescriptor().getMessageTypes().get(71); + getDescriptor().getMessageTypes().get(72); internal_static_context_Constraint_SLA_Availability_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Availability_descriptor, new java.lang.String[] { "NumDisjointPaths", "AllActive", "Availability", }); internal_static_context_Constraint_SLA_Isolation_level_descriptor = - getDescriptor().getMessageTypes().get(72); + getDescriptor().getMessageTypes().get(73); internal_static_context_Constraint_SLA_Isolation_level_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_SLA_Isolation_level_descriptor, new java.lang.String[] { "IsolationLevel", }); internal_static_context_Constraint_Exclusions_descriptor = - getDescriptor().getMessageTypes().get(73); + getDescriptor().getMessageTypes().get(74); internal_static_context_Constraint_Exclusions_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_Exclusions_descriptor, new java.lang.String[] { "IsPermanent", "DeviceIds", "EndpointIds", "LinkIds", }); internal_static_context_Constraint_descriptor = - getDescriptor().getMessageTypes().get(74); + getDescriptor().getMessageTypes().get(75); internal_static_context_Constraint_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_Constraint_descriptor, new java.lang.String[] { "Action", "Custom", "Schedule", "EndpointLocation", "EndpointPriority", "SlaCapacity", "SlaLatency", "SlaAvailability", "SlaIsolation", "Exclusions", "Constraint", }); internal_static_context_TeraFlowController_descriptor = - getDescriptor().getMessageTypes().get(75); + getDescriptor().getMessageTypes().get(76); internal_static_context_TeraFlowController_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_TeraFlowController_descriptor, new java.lang.String[] { "ContextId", "IpAddress", "Port", }); internal_static_context_AuthenticationResult_descriptor = - getDescriptor().getMessageTypes().get(76); + getDescriptor().getMessageTypes().get(77); internal_static_context_AuthenticationResult_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_context_AuthenticationResult_descriptor, diff --git a/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java b/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java index 98bdbbd2c..66ce0f8f2 100644 --- a/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java +++ b/src/policy/target/generated-sources/grpc/kpi_sample_types/KpiSampleTypes.java @@ -283,22 +283,24 @@ public final class KpiSampleTypes { static { java.lang.String[] descriptorData = { "\n\026kpi_sample_types.proto\022\020kpi_sample_typ" + - "es*\327\004\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" + + "es*\260\005\n\rKpiSampleType\022\031\n\025KPISAMPLETYPE_UN" + "KNOWN\020\000\022%\n!KPISAMPLETYPE_PACKETS_TRANSMI" + "TTED\020e\022\"\n\036KPISAMPLETYPE_PACKETS_RECEIVED" + "\020f\022!\n\035KPISAMPLETYPE_PACKETS_DROPPED\020g\022$\n" + "\037KPISAMPLETYPE_BYTES_TRANSMITTED\020\311\001\022!\n\034K" + "PISAMPLETYPE_BYTES_RECEIVED\020\312\001\022 \n\033KPISAM" + - "PLETYPE_BYTES_DROPPED\020\313\001\022 \n\033KPISAMPLETYP" + - "E_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLETYPE_OPTI" + - "CAL_SECURITY_STATUS\020\365\003\022)\n$KPISAMPLETYPE_" + - "L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KPISAMPLETY" + - "PE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&\n!KPISAMP" + - "LETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220\n+KPISAMP" + - "LETYPE_L3_UNIQUE_COMPROMISED_CLIENTS\020\334\004\022" + - ",\n\'KPISAMPLETYPE_L3_SECURITY_STATUS_CRYP" + - "TO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_LATENCY_M" + - "S\020\275\005b\006proto3" + "PLETYPE_BYTES_DROPPED\020\313\001\022+\n&KPISAMPLETYP" + + "E_LINK_TOTAL_CAPACITY_GBPS\020\255\002\022*\n%KPISAMP" + + "LETYPE_LINK_USED_CAPACITY_GBPS\020\256\002\022 \n\033KPI" + + "SAMPLETYPE_ML_CONFIDENCE\020\221\003\022*\n%KPISAMPLE" + + "TYPE_OPTICAL_SECURITY_STATUS\020\365\003\022)\n$KPISA" + + "MPLETYPE_L3_UNIQUE_ATTACK_CONNS\020\331\004\022*\n%KP" + + "ISAMPLETYPE_L3_TOTAL_DROPPED_PACKTS\020\332\004\022&" + + "\n!KPISAMPLETYPE_L3_UNIQUE_ATTACKERS\020\333\004\0220" + + "\n+KPISAMPLETYPE_L3_UNIQUE_COMPROMISED_CL" + + "IENTS\020\334\004\022,\n\'KPISAMPLETYPE_L3_SECURITY_ST" + + "ATUS_CRYPTO\020\335\004\022%\n KPISAMPLETYPE_SERVICE_" + + "LATENCY_MS\020\275\005b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, diff --git a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java index 38f026eb1..ef9ef6be6 100644 --- a/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java +++ b/src/policy/target/generated-sources/grpc/monitoring/Monitoring.java @@ -154,6 +154,21 @@ public final class Monitoring { * .context.ConnectionId connection_id = 9; */ context.ContextOuterClass.ConnectionIdOrBuilder getConnectionIdOrBuilder(); + + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + boolean hasLinkId(); + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + context.ContextOuterClass.LinkId getLinkId(); + /** + * .context.LinkId link_id = 10; + */ + context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder(); } /** * Protobuf type {@code monitoring.KpiDescriptor} @@ -303,6 +318,19 @@ public final class Monitoring { break; } + case 82: { + context.ContextOuterClass.LinkId.Builder subBuilder = null; + if (linkId_ != null) { + subBuilder = linkId_.toBuilder(); + } + linkId_ = input.readMessage(context.ContextOuterClass.LinkId.parser(), extensionRegistry); + if (subBuilder != null) { + subBuilder.mergeFrom(linkId_); + linkId_ = subBuilder.buildPartial(); + } + + break; + } default: { if (!parseUnknownField( input, unknownFields, extensionRegistry, tag)) { @@ -591,6 +619,32 @@ public final class Monitoring { return getConnectionId(); } + public static final int LINK_ID_FIELD_NUMBER = 10; + private context.ContextOuterClass.LinkId linkId_; + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + @java.lang.Override + public boolean hasLinkId() { + return linkId_ != null; + } + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + @java.lang.Override + public context.ContextOuterClass.LinkId getLinkId() { + return linkId_ == null ? context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } + /** + * .context.LinkId link_id = 10; + */ + @java.lang.Override + public context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder() { + return getLinkId(); + } + private byte memoizedIsInitialized = -1; @java.lang.Override public final boolean isInitialized() { @@ -632,6 +686,9 @@ public final class Monitoring { if (connectionId_ != null) { output.writeMessage(9, getConnectionId()); } + if (linkId_ != null) { + output.writeMessage(10, getLinkId()); + } unknownFields.writeTo(output); } @@ -676,6 +733,10 @@ public final class Monitoring { size += com.google.protobuf.CodedOutputStream .computeMessageSize(9, getConnectionId()); } + if (linkId_ != null) { + size += com.google.protobuf.CodedOutputStream + .computeMessageSize(10, getLinkId()); + } size += unknownFields.getSerializedSize(); memoizedSize = size; return size; @@ -726,6 +787,11 @@ public final class Monitoring { if (!getConnectionId() .equals(other.getConnectionId())) return false; } + if (hasLinkId() != other.hasLinkId()) return false; + if (hasLinkId()) { + if (!getLinkId() + .equals(other.getLinkId())) return false; + } if (!unknownFields.equals(other.unknownFields)) return false; return true; } @@ -769,6 +835,10 @@ public final class Monitoring { hash = (37 * hash) + CONNECTION_ID_FIELD_NUMBER; hash = (53 * hash) + getConnectionId().hashCode(); } + if (hasLinkId()) { + hash = (37 * hash) + LINK_ID_FIELD_NUMBER; + hash = (53 * hash) + getLinkId().hashCode(); + } hash = (29 * hash) + unknownFields.hashCode(); memoizedHashCode = hash; return hash; @@ -949,6 +1019,12 @@ public final class Monitoring { connectionId_ = null; connectionIdBuilder_ = null; } + if (linkIdBuilder_ == null) { + linkId_ = null; + } else { + linkId_ = null; + linkIdBuilder_ = null; + } return this; } @@ -1017,6 +1093,11 @@ public final class Monitoring { } else { result.connectionId_ = connectionIdBuilder_.build(); } + if (linkIdBuilder_ == null) { + result.linkId_ = linkId_; + } else { + result.linkId_ = linkIdBuilder_.build(); + } onBuilt(); return result; } @@ -1116,6 +1197,9 @@ public final class Monitoring { if (other.hasConnectionId()) { mergeConnectionId(other.getConnectionId()); } + if (other.hasLinkId()) { + mergeLinkId(other.getLinkId()); + } this.mergeUnknownFields(other.unknownFields); onChanged(); return this; @@ -2229,6 +2313,125 @@ public final class Monitoring { } return connectionIdBuilder_; } + + private context.ContextOuterClass.LinkId linkId_; + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder> linkIdBuilder_; + /** + * .context.LinkId link_id = 10; + * @return Whether the linkId field is set. + */ + public boolean hasLinkId() { + return linkIdBuilder_ != null || linkId_ != null; + } + /** + * .context.LinkId link_id = 10; + * @return The linkId. + */ + public context.ContextOuterClass.LinkId getLinkId() { + if (linkIdBuilder_ == null) { + return linkId_ == null ? context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } else { + return linkIdBuilder_.getMessage(); + } + } + /** + * .context.LinkId link_id = 10; + */ + public Builder setLinkId(context.ContextOuterClass.LinkId value) { + if (linkIdBuilder_ == null) { + if (value == null) { + throw new NullPointerException(); + } + linkId_ = value; + onChanged(); + } else { + linkIdBuilder_.setMessage(value); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder setLinkId( + context.ContextOuterClass.LinkId.Builder builderForValue) { + if (linkIdBuilder_ == null) { + linkId_ = builderForValue.build(); + onChanged(); + } else { + linkIdBuilder_.setMessage(builderForValue.build()); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder mergeLinkId(context.ContextOuterClass.LinkId value) { + if (linkIdBuilder_ == null) { + if (linkId_ != null) { + linkId_ = + context.ContextOuterClass.LinkId.newBuilder(linkId_).mergeFrom(value).buildPartial(); + } else { + linkId_ = value; + } + onChanged(); + } else { + linkIdBuilder_.mergeFrom(value); + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public Builder clearLinkId() { + if (linkIdBuilder_ == null) { + linkId_ = null; + onChanged(); + } else { + linkId_ = null; + linkIdBuilder_ = null; + } + + return this; + } + /** + * .context.LinkId link_id = 10; + */ + public context.ContextOuterClass.LinkId.Builder getLinkIdBuilder() { + + onChanged(); + return getLinkIdFieldBuilder().getBuilder(); + } + /** + * .context.LinkId link_id = 10; + */ + public context.ContextOuterClass.LinkIdOrBuilder getLinkIdOrBuilder() { + if (linkIdBuilder_ != null) { + return linkIdBuilder_.getMessageOrBuilder(); + } else { + return linkId_ == null ? + context.ContextOuterClass.LinkId.getDefaultInstance() : linkId_; + } + } + /** + * .context.LinkId link_id = 10; + */ + private com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder> + getLinkIdFieldBuilder() { + if (linkIdBuilder_ == null) { + linkIdBuilder_ = new com.google.protobuf.SingleFieldBuilderV3< + context.ContextOuterClass.LinkId, context.ContextOuterClass.LinkId.Builder, context.ContextOuterClass.LinkIdOrBuilder>( + getLinkId(), + getParentForChildren(), + isClean()); + linkId_ = null; + } + return linkIdBuilder_; + } @java.lang.Override public final Builder setUnknownFields( final com.google.protobuf.UnknownFieldSet unknownFields) { @@ -21361,7 +21564,7 @@ public final class Monitoring { static { java.lang.String[] descriptorData = { "\n\020monitoring.proto\022\nmonitoring\032\rcontext." + - "proto\032\026kpi_sample_types.proto\"\367\002\n\rKpiDes" + + "proto\032\026kpi_sample_types.proto\"\231\003\n\rKpiDes" + "criptor\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.Kpi" + "Id\022\027\n\017kpi_description\030\002 \001(\t\022&\n\013kpi_id_li" + "st\030\003 \003(\0132\021.monitoring.KpiId\0228\n\017kpi_sampl" + @@ -21371,91 +21574,92 @@ public final class Monitoring { "intId\022&\n\nservice_id\030\007 \001(\0132\022.context.Serv" + "iceId\022\"\n\010slice_id\030\010 \001(\0132\020.context.SliceI" + "d\022,\n\rconnection_id\030\t \001(\0132\025.context.Conne" + - "ctionId\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001" + - " \001(\0132\021.monitoring.KpiId\022\033\n\023monitoring_wi" + - "ndow_s\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\273\001" + - "\n\010KpiQuery\022\"\n\007kpi_ids\030\001 \003(\0132\021.monitoring" + - ".KpiId\022\033\n\023monitoring_window_s\030\002 \001(\002\022\026\n\016l" + - "ast_n_samples\030\003 \001(\r\022+\n\017start_timestamp\030\004" + - " \001(\0132\022.context.Timestamp\022)\n\rend_timestam" + - "p\030\005 \001(\0132\022.context.Timestamp\"X\n\006RawKpi\022%\n" + - "\ttimestamp\030\001 \001(\0132\022.context.Timestamp\022\'\n\t" + - "kpi_value\030\002 \001(\0132\024.monitoring.KpiValue\"U\n" + - "\nRawKpiList\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring" + - ".KpiId\022$\n\010raw_kpis\030\002 \003(\0132\022.monitoring.Ra" + - "wKpi\"<\n\013RawKpiTable\022-\n\rraw_kpi_lists\030\001 \003" + - "(\0132\026.monitoring.RawKpiList\"&\n\005KpiId\022\035\n\006k" + - "pi_id\030\001 \001(\0132\r.context.Uuid\"x\n\003Kpi\022!\n\006kpi" + - "_id\030\001 \001(\0132\021.monitoring.KpiId\022%\n\ttimestam" + - "p\030\002 \001(\0132\022.context.Timestamp\022\'\n\tkpi_value" + - "\030\003 \001(\0132\024.monitoring.KpiValue\"\250\001\n\rKpiValu" + - "eRange\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring" + - ".KpiValue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitor" + - "ing.KpiValue\022\017\n\007inRange\030\003 \001(\010\022\027\n\017include" + - "MinValue\030\004 \001(\010\022\027\n\017includeMaxValue\030\005 \001(\010\"" + - "\241\001\n\010KpiValue\022\022\n\010int32Val\030\001 \001(\005H\000\022\023\n\tuint" + - "32Val\030\002 \001(\rH\000\022\022\n\010int64Val\030\003 \001(\003H\000\022\023\n\tuin" + - "t64Val\030\004 \001(\004H\000\022\022\n\010floatVal\030\005 \001(\002H\000\022\023\n\tst" + - "ringVal\030\006 \001(\tH\000\022\021\n\007boolVal\030\007 \001(\010H\000B\007\n\005va" + - "lue\"\'\n\007KpiList\022\034\n\003kpi\030\001 \003(\0132\017.monitoring" + - ".Kpi\"K\n\021KpiDescriptorList\0226\n\023kpi_descrip" + - "tor_list\030\001 \003(\0132\031.monitoring.KpiDescripto" + - "r\"\362\001\n\016SubsDescriptor\022+\n\007subs_id\030\001 \001(\0132\032." + - "monitoring.SubscriptionID\022!\n\006kpi_id\030\002 \001(" + - "\0132\021.monitoring.KpiId\022\033\n\023sampling_duratio" + - "n_s\030\003 \001(\002\022\033\n\023sampling_interval_s\030\004 \001(\002\022+" + - "\n\017start_timestamp\030\005 \001(\0132\022.context.Timest" + - "amp\022)\n\rend_timestamp\030\006 \001(\0132\022.context.Tim" + - "estamp\"0\n\016SubscriptionID\022\036\n\007subs_id\030\001 \001(" + - "\0132\r.context.Uuid\"b\n\014SubsResponse\022+\n\007subs" + - "_id\030\001 \001(\0132\032.monitoring.SubscriptionID\022%\n" + - "\010kpi_list\030\002 \001(\0132\023.monitoring.KpiList\"?\n\010" + - "SubsList\0223\n\017subs_descriptor\030\001 \003(\0132\032.moni" + - "toring.SubsDescriptor\"\337\001\n\017AlarmDescripto" + - "r\022%\n\010alarm_id\030\001 \001(\0132\023.monitoring.AlarmID" + - "\022\031\n\021alarm_description\030\002 \001(\t\022\014\n\004name\030\003 \001(" + - "\t\022!\n\006kpi_id\030\004 \001(\0132\021.monitoring.KpiId\0222\n\017" + - "kpi_value_range\030\005 \001(\0132\031.monitoring.KpiVa" + - "lueRange\022%\n\ttimestamp\030\006 \001(\0132\022.context.Ti" + - "mestamp\"*\n\007AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.c" + - "ontext.Uuid\"}\n\021AlarmSubscription\022%\n\010alar" + - "m_id\030\001 \001(\0132\023.monitoring.AlarmID\022\036\n\026subsc" + - "ription_timeout_s\030\002 \001(\002\022!\n\031subscription_" + - "frequency_ms\030\003 \001(\002\"k\n\rAlarmResponse\022%\n\010a" + - "larm_id\030\001 \001(\0132\023.monitoring.AlarmID\022\014\n\004te" + - "xt\030\002 \001(\t\022%\n\010kpi_list\030\003 \001(\0132\023.monitoring." + - "KpiList\"B\n\tAlarmList\0225\n\020alarm_descriptor" + - "\030\001 \003(\0132\033.monitoring.AlarmDescriptor2\234\t\n\021" + - "MonitoringService\0228\n\006SetKpi\022\031.monitoring" + - ".KpiDescriptor\032\021.monitoring.KpiId\"\000\0220\n\tD" + - "eleteKpi\022\021.monitoring.KpiId\032\016.context.Em" + - "pty\"\000\022B\n\020GetKpiDescriptor\022\021.monitoring.K" + - "piId\032\031.monitoring.KpiDescriptor\"\000\022G\n\024Get" + - "KpiDescriptorList\022\016.context.Empty\032\035.moni" + - "toring.KpiDescriptorList\"\000\022/\n\nIncludeKpi" + - "\022\017.monitoring.Kpi\032\016.context.Empty\"\000\022=\n\nM" + - "onitorKpi\022\035.monitoring.MonitorKpiRequest" + - "\032\016.context.Empty\"\000\022?\n\014QueryKpiData\022\024.mon" + - "itoring.KpiQuery\032\027.monitoring.RawKpiTabl" + - "e\"\000\022N\n\022SetKpiSubscription\022\032.monitoring.S" + - "ubsDescriptor\032\030.monitoring.SubsResponse\"" + - "\0000\001\022M\n\021GetSubsDescriptor\022\032.monitoring.Su" + - "bscriptionID\032\032.monitoring.SubsDescriptor" + - "\"\000\022:\n\020GetSubscriptions\022\016.context.Empty\032\024" + - ".monitoring.SubsList\"\000\022B\n\022DeleteSubscrip" + - "tion\022\032.monitoring.SubscriptionID\032\016.conte" + - "xt.Empty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring.A" + - "larmDescriptor\032\023.monitoring.AlarmID\"\000\0224\n" + - "\tGetAlarms\022\016.context.Empty\032\025.monitoring." + - "AlarmList\"\000\022H\n\022GetAlarmDescriptor\022\023.moni" + - "toring.AlarmID\032\033.monitoring.AlarmDescrip" + - "tor\"\000\022V\n\026GetAlarmResponseStream\022\035.monito" + - "ring.AlarmSubscription\032\031.monitoring.Alar" + - "mResponse\"\0000\001\0224\n\013DeleteAlarm\022\023.monitorin" + - "g.AlarmID\032\016.context.Empty\"\000\0226\n\014GetStream" + - "Kpi\022\021.monitoring.KpiId\032\017.monitoring.Kpi\"" + - "\0000\001\0225\n\rGetInstantKpi\022\021.monitoring.KpiId\032" + - "\017.monitoring.Kpi\"\000b\006proto3" + "ctionId\022 \n\007link_id\030\n \001(\0132\017.context.LinkI" + + "d\"l\n\021MonitorKpiRequest\022!\n\006kpi_id\030\001 \001(\0132\021" + + ".monitoring.KpiId\022\033\n\023monitoring_window_s" + + "\030\002 \001(\002\022\027\n\017sampling_rate_s\030\003 \001(\002\"\273\001\n\010KpiQ" + + "uery\022\"\n\007kpi_ids\030\001 \003(\0132\021.monitoring.KpiId" + + "\022\033\n\023monitoring_window_s\030\002 \001(\002\022\026\n\016last_n_" + + "samples\030\003 \001(\r\022+\n\017start_timestamp\030\004 \001(\0132\022" + + ".context.Timestamp\022)\n\rend_timestamp\030\005 \001(" + + "\0132\022.context.Timestamp\"X\n\006RawKpi\022%\n\ttimes" + + "tamp\030\001 \001(\0132\022.context.Timestamp\022\'\n\tkpi_va" + + "lue\030\002 \001(\0132\024.monitoring.KpiValue\"U\n\nRawKp" + + "iList\022!\n\006kpi_id\030\001 \001(\0132\021.monitoring.KpiId" + + "\022$\n\010raw_kpis\030\002 \003(\0132\022.monitoring.RawKpi\"<" + + "\n\013RawKpiTable\022-\n\rraw_kpi_lists\030\001 \003(\0132\026.m" + + "onitoring.RawKpiList\"&\n\005KpiId\022\035\n\006kpi_id\030" + + "\001 \001(\0132\r.context.Uuid\"x\n\003Kpi\022!\n\006kpi_id\030\001 " + + "\001(\0132\021.monitoring.KpiId\022%\n\ttimestamp\030\002 \001(" + + "\0132\022.context.Timestamp\022\'\n\tkpi_value\030\003 \001(\013" + + "2\024.monitoring.KpiValue\"\250\001\n\rKpiValueRange" + + "\022)\n\013kpiMinValue\030\001 \001(\0132\024.monitoring.KpiVa" + + "lue\022)\n\013kpiMaxValue\030\002 \001(\0132\024.monitoring.Kp" + + "iValue\022\017\n\007inRange\030\003 \001(\010\022\027\n\017includeMinVal" + + "ue\030\004 \001(\010\022\027\n\017includeMaxValue\030\005 \001(\010\"\241\001\n\010Kp" + + "iValue\022\022\n\010int32Val\030\001 \001(\005H\000\022\023\n\tuint32Val\030" + + "\002 \001(\rH\000\022\022\n\010int64Val\030\003 \001(\003H\000\022\023\n\tuint64Val" + + "\030\004 \001(\004H\000\022\022\n\010floatVal\030\005 \001(\002H\000\022\023\n\tstringVa" + + "l\030\006 \001(\tH\000\022\021\n\007boolVal\030\007 \001(\010H\000B\007\n\005value\"\'\n" + + "\007KpiList\022\034\n\003kpi\030\001 \003(\0132\017.monitoring.Kpi\"K" + + "\n\021KpiDescriptorList\0226\n\023kpi_descriptor_li" + + "st\030\001 \003(\0132\031.monitoring.KpiDescriptor\"\362\001\n\016" + + "SubsDescriptor\022+\n\007subs_id\030\001 \001(\0132\032.monito" + + "ring.SubscriptionID\022!\n\006kpi_id\030\002 \001(\0132\021.mo" + + "nitoring.KpiId\022\033\n\023sampling_duration_s\030\003 " + + "\001(\002\022\033\n\023sampling_interval_s\030\004 \001(\002\022+\n\017star" + + "t_timestamp\030\005 \001(\0132\022.context.Timestamp\022)\n" + + "\rend_timestamp\030\006 \001(\0132\022.context.Timestamp" + + "\"0\n\016SubscriptionID\022\036\n\007subs_id\030\001 \001(\0132\r.co" + + "ntext.Uuid\"b\n\014SubsResponse\022+\n\007subs_id\030\001 " + + "\001(\0132\032.monitoring.SubscriptionID\022%\n\010kpi_l" + + "ist\030\002 \001(\0132\023.monitoring.KpiList\"?\n\010SubsLi" + + "st\0223\n\017subs_descriptor\030\001 \003(\0132\032.monitoring" + + ".SubsDescriptor\"\337\001\n\017AlarmDescriptor\022%\n\010a" + + "larm_id\030\001 \001(\0132\023.monitoring.AlarmID\022\031\n\021al" + + "arm_description\030\002 \001(\t\022\014\n\004name\030\003 \001(\t\022!\n\006k" + + "pi_id\030\004 \001(\0132\021.monitoring.KpiId\0222\n\017kpi_va" + + "lue_range\030\005 \001(\0132\031.monitoring.KpiValueRan" + + "ge\022%\n\ttimestamp\030\006 \001(\0132\022.context.Timestam" + + "p\"*\n\007AlarmID\022\037\n\010alarm_id\030\001 \001(\0132\r.context" + + ".Uuid\"}\n\021AlarmSubscription\022%\n\010alarm_id\030\001" + + " \001(\0132\023.monitoring.AlarmID\022\036\n\026subscriptio" + + "n_timeout_s\030\002 \001(\002\022!\n\031subscription_freque" + + "ncy_ms\030\003 \001(\002\"k\n\rAlarmResponse\022%\n\010alarm_i" + + "d\030\001 \001(\0132\023.monitoring.AlarmID\022\014\n\004text\030\002 \001" + + "(\t\022%\n\010kpi_list\030\003 \001(\0132\023.monitoring.KpiLis" + + "t\"B\n\tAlarmList\0225\n\020alarm_descriptor\030\001 \003(\013" + + "2\033.monitoring.AlarmDescriptor2\234\t\n\021Monito" + + "ringService\0228\n\006SetKpi\022\031.monitoring.KpiDe" + + "scriptor\032\021.monitoring.KpiId\"\000\0220\n\tDeleteK" + + "pi\022\021.monitoring.KpiId\032\016.context.Empty\"\000\022" + + "B\n\020GetKpiDescriptor\022\021.monitoring.KpiId\032\031" + + ".monitoring.KpiDescriptor\"\000\022G\n\024GetKpiDes" + + "criptorList\022\016.context.Empty\032\035.monitoring" + + ".KpiDescriptorList\"\000\022/\n\nIncludeKpi\022\017.mon" + + "itoring.Kpi\032\016.context.Empty\"\000\022=\n\nMonitor" + + "Kpi\022\035.monitoring.MonitorKpiRequest\032\016.con" + + "text.Empty\"\000\022?\n\014QueryKpiData\022\024.monitorin" + + "g.KpiQuery\032\027.monitoring.RawKpiTable\"\000\022N\n" + + "\022SetKpiSubscription\022\032.monitoring.SubsDes" + + "criptor\032\030.monitoring.SubsResponse\"\0000\001\022M\n" + + "\021GetSubsDescriptor\022\032.monitoring.Subscrip" + + "tionID\032\032.monitoring.SubsDescriptor\"\000\022:\n\020" + + "GetSubscriptions\022\016.context.Empty\032\024.monit" + + "oring.SubsList\"\000\022B\n\022DeleteSubscription\022\032" + + ".monitoring.SubscriptionID\032\016.context.Emp" + + "ty\"\000\022A\n\013SetKpiAlarm\022\033.monitoring.AlarmDe" + + "scriptor\032\023.monitoring.AlarmID\"\000\0224\n\tGetAl" + + "arms\022\016.context.Empty\032\025.monitoring.AlarmL" + + "ist\"\000\022H\n\022GetAlarmDescriptor\022\023.monitoring" + + ".AlarmID\032\033.monitoring.AlarmDescriptor\"\000\022" + + "V\n\026GetAlarmResponseStream\022\035.monitoring.A" + + "larmSubscription\032\031.monitoring.AlarmRespo" + + "nse\"\0000\001\0224\n\013DeleteAlarm\022\023.monitoring.Alar" + + "mID\032\016.context.Empty\"\000\0226\n\014GetStreamKpi\022\021." + + "monitoring.KpiId\032\017.monitoring.Kpi\"\0000\001\0225\n" + + "\rGetInstantKpi\022\021.monitoring.KpiId\032\017.moni" + + "toring.Kpi\"\000b\006proto3" }; descriptor = com.google.protobuf.Descriptors.FileDescriptor .internalBuildGeneratedFileFrom(descriptorData, @@ -21468,7 +21672,7 @@ public final class Monitoring { internal_static_monitoring_KpiDescriptor_fieldAccessorTable = new com.google.protobuf.GeneratedMessageV3.FieldAccessorTable( internal_static_monitoring_KpiDescriptor_descriptor, - new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", "ConnectionId", }); + new java.lang.String[] { "KpiId", "KpiDescription", "KpiIdList", "KpiSampleType", "DeviceId", "EndpointId", "ServiceId", "SliceId", "ConnectionId", "LinkId", }); internal_static_monitoring_MonitorKpiRequest_descriptor = getDescriptor().getMessageTypes().get(1); internal_static_monitoring_MonitorKpiRequest_fieldAccessorTable = new diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml index 5a576268f..9ef28a7e3 100644 --- a/src/policy/target/kubernetes/kubernetes.yml +++ b/src/policy/target/kubernetes/kubernetes.yml @@ -1,74 +1,63 @@ -# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/) -# -# 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. --- apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542 - app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000 + app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app.kubernetes.io/name: policyservice - app: policyservice - name: policyservice + app.kubernetes.io/name: policy + app.kubernetes.io/version: 0.1.0 + name: policy spec: ports: + - name: grpc-server + port: 9000 + targetPort: 9000 - name: http - port: 9192 + port: 80 targetPort: 8080 - - name: grpc-server - port: 6060 - targetPort: 6060 selector: - app.kubernetes.io/name: policyservice + app.kubernetes.io/name: policy + app.kubernetes.io/version: 0.1.0 type: ClusterIP --- apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542 - app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000 + app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app: policyservice - app.kubernetes.io/name: policyservice - name: policyservice + app.kubernetes.io/version: 0.1.0 + app.kubernetes.io/name: policy + name: policy spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/name: policyservice + app.kubernetes.io/version: 0.1.0 + app.kubernetes.io/name: policy template: metadata: annotations: - app.quarkus.io/commit-id: 447bcf0c8224e0b15715f54d82a0936dd93f5542 - app.quarkus.io/build-timestamp: 2023-11-07 - 12:10:37 +0000 + app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 + app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app: policyservice - app.kubernetes.io/name: policyservice + app.kubernetes.io/version: 0.1.0 + app.kubernetes.io/name: policy spec: containers: - env: @@ -76,13 +65,7 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: CONTEXT_SERVICE_HOST - value: contextservice - - name: SERVICE_SERVICE_HOST - value: serviceservice - - name: MONITORING_SERVICE_HOST - value: monitoringservice - image: labs.etsi.org:5050/tfs/controller/policy:0.1.0 + image: nuc8/policy:0.1.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -90,32 +73,25 @@ spec: path: /q/health/live port: 8080 scheme: HTTP - initialDelaySeconds: 2 - periodSeconds: 10 + initialDelaySeconds: 0 + periodSeconds: 30 successThreshold: 1 timeoutSeconds: 10 - name: policyservice + name: policy ports: + - containerPort: 9000 + name: grpc-server + protocol: TCP - containerPort: 8080 name: http protocol: TCP - - containerPort: 6060 - name: grpc-server - protocol: TCP readinessProbe: failureThreshold: 3 httpGet: path: /q/health/ready port: 8080 scheme: HTTP - initialDelaySeconds: 2 - periodSeconds: 10 + initialDelaySeconds: 0 + periodSeconds: 30 successThreshold: 1 timeoutSeconds: 10 - resources: - limits: - cpu: 500m - memory: 2048Mi - requests: - cpu: 50m - memory: 512Mi -- GitLab From 205d8ef84e2f745543b50ba05d3492009e5c6609 Mon Sep 17 00:00:00 2001 From: pfamelis Date: Fri, 15 Dec 2023 14:05:18 +0200 Subject: [PATCH 3/3] fix: fix kubernetes.yml files for ztp and policy --- src/policy/target/kubernetes/kubernetes.yml | 67 ++++++++++++--------- src/ztp/target/kubernetes/kubernetes.yml | 28 ++++----- 2 files changed, 53 insertions(+), 42 deletions(-) diff --git a/src/policy/target/kubernetes/kubernetes.yml b/src/policy/target/kubernetes/kubernetes.yml index 9ef28a7e3..5cd1f1c4c 100644 --- a/src/policy/target/kubernetes/kubernetes.yml +++ b/src/policy/target/kubernetes/kubernetes.yml @@ -3,61 +3,59 @@ apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app.kubernetes.io/name: policy - app.kubernetes.io/version: 0.1.0 - name: policy + app.kubernetes.io/name: policyservice + app: policyservice + name: policyservice spec: ports: - name: grpc-server - port: 9000 - targetPort: 9000 + port: 6060 + targetPort: 6060 - name: http - port: 80 + port: 9192 targetPort: 8080 selector: - app.kubernetes.io/name: policy - app.kubernetes.io/version: 0.1.0 + app.kubernetes.io/name: policyservice type: ClusterIP --- apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app.kubernetes.io/version: 0.1.0 - app.kubernetes.io/name: policy - name: policy + app: policyservice + app.kubernetes.io/name: policyservice + name: policyservice spec: replicas: 1 selector: matchLabels: - app.kubernetes.io/version: 0.1.0 - app.kubernetes.io/name: policy + app.kubernetes.io/name: policyservice template: metadata: annotations: - app.quarkus.io/commit-id: f75e466c51bdad466bcf28acffd06f5a56f75539 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:19:04 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 11:56:20 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" prometheus.io/scheme: http labels: - app.kubernetes.io/version: 0.1.0 - app.kubernetes.io/name: policy + app: policyservice + app.kubernetes.io/name: policyservice spec: containers: - env: @@ -65,7 +63,13 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - image: nuc8/policy:0.1.0 + - name: CONTEXT_SERVICE_HOST + value: contextservice + - name: MONITORING_SERVICE_HOST + value: monitoringservice + - name: SERVICE_SERVICE_HOST + value: serviceservice + image: labs.etsi.org:5050/tfs/controller/policy:0.1.0 imagePullPolicy: Always livenessProbe: failureThreshold: 3 @@ -73,13 +77,13 @@ spec: path: /q/health/live port: 8080 scheme: HTTP - initialDelaySeconds: 0 - periodSeconds: 30 + initialDelaySeconds: 2 + periodSeconds: 10 successThreshold: 1 timeoutSeconds: 10 - name: policy + name: policyservice ports: - - containerPort: 9000 + - containerPort: 6060 name: grpc-server protocol: TCP - containerPort: 8080 @@ -91,7 +95,14 @@ spec: path: /q/health/ready port: 8080 scheme: HTTP - initialDelaySeconds: 0 - periodSeconds: 30 + initialDelaySeconds: 2 + periodSeconds: 10 successThreshold: 1 timeoutSeconds: 10 + resources: + limits: + cpu: 500m + memory: 2048Mi + requests: + cpu: 50m + memory: 512Mi diff --git a/src/ztp/target/kubernetes/kubernetes.yml b/src/ztp/target/kubernetes/kubernetes.yml index 741c4d5cd..f3e4a6d6d 100644 --- a/src/ztp/target/kubernetes/kubernetes.yml +++ b/src/ztp/target/kubernetes/kubernetes.yml @@ -3,8 +3,8 @@ apiVersion: v1 kind: Service metadata: annotations: - app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -15,12 +15,12 @@ metadata: name: ztpservice spec: ports: - - name: http - port: 9192 - targetPort: 8080 - name: grpc-server port: 5050 targetPort: 5050 + - name: http + port: 9192 + targetPort: 8080 selector: app.kubernetes.io/name: ztpservice type: ClusterIP @@ -29,8 +29,8 @@ apiVersion: apps/v1 kind: Deployment metadata: annotations: - app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -47,8 +47,8 @@ spec: template: metadata: annotations: - app.quarkus.io/commit-id: daed600da1c35d66317293d78bfe3cc6b69cff43 - app.quarkus.io/build-timestamp: 2023-12-08 - 14:17:19 +0000 + app.quarkus.io/commit-id: 46486023929121fc955e9550fc8fd625ded433d2 + app.quarkus.io/build-timestamp: 2023-12-15 - 12:04:12 +0000 prometheus.io/scrape: "true" prometheus.io/path: /q/metrics prometheus.io/port: "8080" @@ -63,10 +63,10 @@ spec: valueFrom: fieldRef: fieldPath: metadata.namespace - - name: DEVICE_SERVICE_HOST - value: deviceservice - name: CONTEXT_SERVICE_HOST value: contextservice + - name: DEVICE_SERVICE_HOST + value: deviceservice image: labs.etsi.org:5050/tfs/controller/ztp:0.2.0 imagePullPolicy: Always livenessProbe: @@ -81,12 +81,12 @@ spec: timeoutSeconds: 10 name: ztpservice ports: - - containerPort: 8080 - name: http - protocol: TCP - containerPort: 5050 name: grpc-server protocol: TCP + - containerPort: 8080 + name: http + protocol: TCP readinessProbe: failureThreshold: 3 httpGet: -- GitLab