aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJorge Hernandez <jh1730@att.com>2018-03-27 00:57:44 +0000
committerGerrit Code Review <gerrit@onap.org>2018-03-27 00:57:44 +0000
commita65513610152ff5e48ee8e528fd6c3706f5d3c45 (patch)
tree67a4bfeebb3eab388b6d6c1ce45ae074cc9d7f71
parenta84f47325effa7baffb0f8fed2de1fc49ec733e1 (diff)
parent9e1e8b949671e8b0d07908a96e1891d94beb2a67 (diff)
Merge "Fix path to logging class"
Diffstat
-rw-r--r--controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java2
-rw-r--r--controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java2
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java2
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java2
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java2
-rw-r--r--controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java2
-rw-r--r--controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java2
-rw-r--r--controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java2
-rw-r--r--controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java2
-rw-r--r--controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java2
10 files changed, 10 insertions, 10 deletions
diff --git a/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java b/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java
index edb48fed5..bb058262f 100644
--- a/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java
+++ b/controlloop/common/feature-controlloop-utils/src/test/java/org/onap/policy/drools/apps/controlloop/feature/utils/ControlLoopUtilsFeatureTest.java
@@ -25,7 +25,7 @@ import static org.junit.Assert.assertNotNull;
import org.junit.Test;
import org.onap.policy.drools.http.server.HttpServletServer;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.simulators.Util;
/**
diff --git a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
index 40123a4bb..628bfedc2 100644
--- a/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
+++ b/controlloop/common/guard/src/test/java/org/onap/policy/guard/PolicyGuardXacmlHelperTest.java
@@ -56,7 +56,7 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.drools.http.server.HttpServletServer;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
public class PolicyGuardXacmlHelperTest {
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
index e42d5574c..07ec6ac28 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/AaiSimulatorTest.java
@@ -40,7 +40,7 @@ import org.onap.policy.aai.AaiNqQueryParameters;
import org.onap.policy.aai.AaiNqRequest;
import org.onap.policy.aai.AaiNqResponse;
import org.onap.policy.drools.http.server.HttpServletServer;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.rest.RESTManager;
public class AaiSimulatorTest {
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
index 9522e55da..9c44bc9de 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/GuardSimulatorTest.java
@@ -28,7 +28,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.drools.http.server.HttpServletServer;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
index edc942bbe..28620d59d 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/SoSimulatorTest.java
@@ -30,7 +30,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.drools.http.server.HttpServletServer;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
import org.onap.policy.so.SOCloudConfiguration;
diff --git a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
index d26cee321..4e61d4b72 100644
--- a/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
+++ b/controlloop/common/simulators/src/test/java/org/onap/policy/simulators/VfcSimulatorTest.java
@@ -30,7 +30,7 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.drools.http.server.HttpServletServer;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.rest.RESTManager;
import org.onap.policy.rest.RESTManager.Pair;
import org.onap.policy.vfc.VFCResponse;
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
index 661d8c187..4a755bffa 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VCPEControlLoopTest.java
@@ -55,7 +55,7 @@ import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.system.PolicyController;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
index 25a69b14e..c8a8c700f 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VDNSControlLoopTest.java
@@ -53,7 +53,7 @@ import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.system.PolicyController;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.so.SORequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
index 178b5b29d..0e2a78ada 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFCControlLoopTest.java
@@ -54,7 +54,7 @@ import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.system.PolicyController;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.vfc.VFCRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
index 156fbbaa8..8c449cebd 100644
--- a/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
+++ b/controlloop/templates/template.demo/src/test/java/org/onap/policy/template/demo/VFWControlLoopTest.java
@@ -56,7 +56,7 @@ import org.onap.policy.drools.protocol.coders.EventProtocolCoder;
import org.onap.policy.drools.protocol.coders.JsonProtocolFilter;
import org.onap.policy.drools.system.PolicyController;
import org.onap.policy.drools.system.PolicyEngine;
-import org.onap.policy.drools.utils.LoggerUtil;
+import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
|M |1 |String |The service type. It is defined in AAI | +-------------------+---------+-----------+-------+----------------------------------------+ Response: +-------------+---------+-----------+-------+------------------------------------------------------------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +-------------+---------+-----------+-------+------------------------------------------------------------------------+ |operationId |M |1 |String |The operation id. | +-------------+---------+-----------+-------+------------------------------------------------------------------------+ Query E2E service operation result ++++++++++++++++++++++++++ +--------------------+------------------------------------------------------------------------+ |Interface Definition|Description | +====================+========================================================================+ |URI |{serverRoot}/e2eServiceInstances/v3/{serviceId}/operations/{operationId}| +--------------------+------------------------------------------------------------------------+ |Operation Type |GET | +--------------------+------------------------------------------------------------------------+ Request Parameters: +--------------+---------+-----------+-------+--------------+ |Attribute |Qualifier|Cardinality|Content|Description | +==============+=========+===========+=======+==============+ |serviceId |M |1 |Service instance ID. | +--------------+---------+-----------+-------+--------------+ |operationId |M |1 |Service Operation ID. | +--------------+---------+-----------+-------+--------------+ Response: +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |operation |M |1 |String |Operation object identify. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |operationId |M |1 |String |Operation ID. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |operation |M |1 |String |Operation type, create|delete. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |result |M |1 |String |Operation result: finished, error, processing. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |reason |M |1 |String |If failing, need to write fail reason. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |userId |M |1 |String |Operation user ID. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |operationContent |M |1 |String |The status detail of current operation which is being executing. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |progress |M |1 |String |Current operation progress. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |operateAt |M |1 |String |Time that it starts to execute operation. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ |finishedAt |M |1 |String |Time that it finished executing operation. | +------------------+---------+-----------+-------+------------------------------------------------------------------------+ AAI API ---------------- create or update an existing service-instance +++++++++++++++++++++++++++++++++++++++++++++ +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+====================================================================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}| +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Operation Type |PUT | +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ |service-instance-id|M |1 |String |Service Instance ID | +-------------------+---------+-----------+-------+-----------------------+ Response: +---------+---------+-----------+-------+-------------------+ |Attribute|Qualifier|Cardinality|Content|Description | +---------+---------+-----------+-------+-------------------+ |HTTP code|M |1 |Integer|HTTP response code | +---------+---------+-----------+-------+-------------------+ delete an existing service-instance +++++++++++++++++++++++++++++++++++ +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+====================================================================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}| +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Operation Type |DELETE | +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ |service-instance-id|M |1 |String |Service Instance ID | +-------------------+---------+-----------+-------+-----------------------+ Response: +---------+---------+-----------+-------+-------------------+ |Attribute|Qualifier|Cardinality|Content|Description | +---------+---------+-----------+-------+-------------------+ |HTTP code|M |1 |Integer|HTTP response code | +---------+---------+-----------+-------+-------------------+ get service-instances +++++++++++++++++++++ +--------------------+-----------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+=============================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances| +--------------------+-----------------------------------------------------------------------------------------------------------------------------+ |Operation Type |GET | +--------------------+-----------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ Response: +-----------------+---------+-----------+----------------+-------------------+ |Attribute |Qualifier|Cardinality|Content |Description | +-----------------+---------+-----------+----------------+-------------------+ |service-instances|M |1 |ServiceInstances|Service Instances | +-----------------+---------+-----------+----------------+-------------------+ get service-instance ++++++++++++++++++++ +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+====================================================================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}| +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Operation Type |GET | +--------------------+--------------------------------------------------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ |service-instance-id|M |1 |String |Service instance ID | +-------------------+---------+-----------+-------+-----------------------+ Response: +-----------------+---------+-----------+----------------+-------------------+ |Attribute |Qualifier|Cardinality|Content |Description | +-----------------+---------+-----------+----------------+-------------------+ |service-instance |M |1 |ServiceInstance |Service Instance | +-----------------+---------+-----------+----------------+-------------------+ see node definition for valid relationships +++++++++++++++++++++++++++++++++++++++++++ +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+===================================================================================================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/relationship-list/relationship| +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Operation Type |PUT | +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ |service-instance-id|M |1 |String |Service instance ID | +-------------------+---------+-----------+-------+-----------------------+ Response: +---------+---------+-----------+-------+-------------------+ |Attribute|Qualifier|Cardinality|Content|Description | +---------+---------+-----------+-------+-------------------+ |HTTP code|M |1 |Integer|HTTP response code | +---------+---------+-----------+-------+-------------------+ delete an existing relationship +++++++++++++++++++++++++++++++ +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Interface Definition|Description | +====================+===================================================================================================================================================================================================+ |URI |/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id}/relationship-list/relationship| +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ |Operation Type |DELETE | +--------------------+---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+ Request Parameters: +-------------------+---------+-----------+-------+-----------------------+ |Attribute |Qualifier|Cardinality|Content|Description | +===================+=========+===========+=======+=======================+ |global-customer-id |M |1 |String |Global Customer ID | +-------------------+---------+-----------+-------+-----------------------+ |service-type |M |1 |String |Service Type | +-------------------+---------+-----------+-------+-----------------------+ |service-instance-id|M |1 |String |Service instance ID | +-------------------+---------+-----------+-------+-----------------------+ Response: +---------+---------+-----------+-------+-------------------+ |Attribute|Qualifier|Cardinality|Content|Description | +---------+---------+-----------+-------+-------------------+ |HTTP code|M |1 |Integer|HTTP response code | +---------+---------+-----------+-------+-------------------+