Commit includes ControlLoopPolicy API and bugfixes
Change-Id: I3e18bb8b4c31a0d908bb0cff4c85e2a3fb450a63
Signed-off-by: Ravindra Bakkamanthala <rb7147@att.com>
diff --git a/packages/install/src/files/brmsgw.conf b/packages/install/src/files/brmsgw.conf
index 9f2252c..bff9a9c 100644
--- a/packages/install/src/files/brmsgw.conf
+++ b/packages/install/src/files/brmsgw.conf
@@ -37,6 +37,6 @@
resource_name=brmsgw_1
node_type=brms_gateway
-CLIENT_ID=PyPDPServer
+CLIENT_ID=PDPServer
CLIENT_KEY=test
ENVIRONMENT=DEVL
diff --git a/packages/install/src/files/elk.conf b/packages/install/src/files/elk.conf
new file mode 100644
index 0000000..938954c
--- /dev/null
+++ b/packages/install/src/files/elk.conf
@@ -0,0 +1,3 @@
+# elasticsearch
+
+ELK_JMX_PORT=9995
\ No newline at end of file
diff --git a/packages/install/src/files/pdp.conf b/packages/install/src/files/pdp.conf
index 239f149..95c1300 100644
--- a/packages/install/src/files/pdp.conf
+++ b/packages/install/src/files/pdp.conf
@@ -30,5 +30,5 @@
node_type=pdp_xacml
resource_name=pdp_1
-dependency_groups=pdplp_1;pypdp_1;brmsgw_1
+dependency_groups=pdplp_1;brmsgw_1
diff --git a/packages/install/src/files/pypdp.conf b/packages/install/src/files/pypdp.conf
deleted file mode 100644
index 2117ff8..0000000
--- a/packages/install/src/files/pypdp.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-# pypdp component installation configuration parameters
-
-# tomcat specific parameters
-
-TOMCAT_JMX_PORT=9994
-TOMCAT_SHUTDOWN_PORT=8405
-SSL_HTTP_CONNECTOR_PORT=8480
-SSL_AJP_CONNECTOR_PORT=8384
-SSL_AJP_CONNECTOR_REDIRECT_PORT=8443
-
-TOMCAT_X_MS_MB=1024
-TOMCAT_X_MX_MB=1024
-
-# pypdp parameters
-
-PDP_URL=https://${{FQDN}}:8081/pdp/,testpdp,alpha123
-PAP_URL=https://${{FQDN}}:9091/pap/
-PYPDP_ID=testrest
-PYPDP_PASSWORD=alpha123
-
-node_type=pypdp
-# the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase
-resource_name=pypdp_1
-
-CLIENT_FILE=client.properties