Commit c2320117 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into... 

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into fix/policy/context_policy-configuration
parents 6aafabc1 6c256dd9

src/policy/pom.xml

+1 −1
Changes for src/policy/pom.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">

    <modelVersion>4.0.0</modelVersion>



    <groupId>eu.teraflow</groupId>

    <groupId>org.etsi.tfs</groupId>

    <artifactId>policy</artifactId>

    <version>0.1.0</version>

    <name>TeraFlow Policy Component</name>

src/policy/src/main/java/eu/teraflow/policy/PolicyGateway.java→src/policy/src/main/java/org/etsi/tfs/policy/PolicyGateway.java

+1 −1
Changes for src/policy/src/main/java/org/etsi/tfs/policy/PolicyGateway.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
* limitations under the License.

*/



package eu.teraflow.policy;

package org.etsi.tfs.policy;



import policy.PolicyService;

src/policy/src/main/java/eu/teraflow/policy/PolicyGatewayImpl.java→src/policy/src/main/java/org/etsi/tfs/policy/PolicyGatewayImpl.java

+1 −1
Changes for src/policy/src/main/java/org/etsi/tfs/policy/PolicyGatewayImpl.java: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -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;

src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionFieldsGetter.java→src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionFieldsGetter.java

+4 −4
Changes for src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionFieldsGetter.java: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -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 {

src/policy/src/main/java/eu/teraflow/policy/PolicyRuleConditionValidator.java→src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionValidator.java

+8 −8
Changes for src/policy/src/main/java/org/etsi/tfs/policy/PolicyRuleConditionValidator.java: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -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