-#
+#
# Create CLDS database objects (tables, etc.)
#
#
CREATE DATABASE `camundabpm`;
-USE `camundabpm`;
-DROP USER 'camunda';
-CREATE USER 'camunda';
-GRANT ALL on camundabpm.* to 'camunda' identified by 'ndMSpw4CAM' with GRANT OPTION;
-FLUSH PRIVILEGES;
+USE `camundabpm`;
+DROP USER 'camunda';
+CREATE USER 'camunda';
+GRANT ALL on camundabpm.* to 'camunda' identified by 'ndMSpw4CAM' with GRANT OPTION;
+FLUSH PRIVILEGES;
CREATE DATABASE `cldsdb4`;
-USE `cldsdb4`;
-DROP USER 'clds';
-CREATE USER 'clds';
+USE `cldsdb4`;
+DROP USER 'clds';
+CREATE USER 'clds';
GRANT ALL on cldsdb4.* to 'clds' identified by 'sidnnd83K' with GRANT OPTION;
GRANT SELECT on mysql.proc TO 'clds';
FLUSH PRIVILEGES;
template_bpmn_id VARCHAR(36) NOT NULL,
template_id VARCHAR(36) NOT NULL,
template_bpmn_text MEDIUMTEXT NOT NULL,
- userid VARCHAR(8),
+ user_id VARCHAR(80),
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (template_bpmn_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
template_image_id VARCHAR(36) NOT NULL,
template_id VARCHAR(36) NOT NULL,
template_image_text MEDIUMTEXT NULL,
- userid VARCHAR(8),
+ user_id VARCHAR(80),
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (template_image_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
template_doc_id VARCHAR(36) NOT NULL,
template_id VARCHAR(36) NOT NULL,
template_doc_text MEDIUMTEXT NULL,
- userid VARCHAR(8),
+ user_id VARCHAR(80),
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (template_doc_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
event_id VARCHAR(36) NULL,
control_name_prefix VARCHAR(80) NULL,
control_name_uuid VARCHAR(36) NOT NULL,
+ service_type_id VARCHAR(80) NULL,
+ deployment_id VARCHAR(80) NULL,
PRIMARY KEY (model_id),
UNIQUE (model_name),
- UNIQUE (control_name_uuid)
+ UNIQUE (control_name_uuid),
+ UNIQUE (service_type_id),
+ UNIQUE (deployment_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
CREATE TABLE model_properties (
model_prop_id VARCHAR(36) NOT NULL,
model_id VARCHAR(36) NOT NULL,
model_prop_text MEDIUMTEXT NULL,
- userid VARCHAR(8),
+ user_id VARCHAR(80),
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (model_prop_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
model_blueprint_id VARCHAR(36) NOT NULL,
model_id VARCHAR(36) NOT NULL,
model_blueprint_text MEDIUMTEXT NULL,
- userid VARCHAR(8),
+ user_id VARCHAR(80),
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (model_blueprint_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
action_state_cd VARCHAR(80) NULL,
prev_event_id VARCHAR(36) NULL,
process_instance_id VARCHAR(80) NULL,
- userid VARCHAR(8) NULL,
+ user_id VARCHAR(80) NULL,
timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (event_id)
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE utf8_bin;
ADD CONSTRAINT template_doc_id_fkey01
FOREIGN KEY (template_doc_id)
REFERENCES template_doc (template_doc_id);
-
+
ALTER TABLE template_bpmn
ADD CONSTRAINT template_id_fkey02
FOREIGN KEY (template_id)
ALTER TABLE template_doc
ADD CONSTRAINT template_id_fkey04
FOREIGN KEY (template_id)
- REFERENCES template (template_id);
-
+ REFERENCES template (template_id);
+
ALTER TABLE model
ADD CONSTRAINT template_id_fkey01
FOREIGN KEY (template_id)
ADD CONSTRAINT model_blueprint_id_fkey01
FOREIGN KEY (model_blueprint_id)
REFERENCES model_blueprint (model_blueprint_id);
-
+
ALTER TABLE model
ADD CONSTRAINT event_id_fkey01
FOREIGN KEY (event_id)
ALTER TABLE model_properties
ADD CONSTRAINT model_id_fkey01
FOREIGN KEY (model_id)
- REFERENCES model (model_id);
+ REFERENCES model (model_id);
ALTER TABLE model_blueprint
ADD CONSTRAINT model_id_fkey02
FOREIGN KEY (model_id)
- REFERENCES model (model_id);
+ REFERENCES model (model_id);
ALTER TABLE model_instance
ADD CONSTRAINT model_id_fkey04
FOREIGN KEY (model_id)
- REFERENCES model (model_id);
-
+ REFERENCES model (model_id);
+
ALTER TABLE event
ADD CONSTRAINT model_id_fkey03
FOREIGN KEY (model_id)
- REFERENCES model (model_id);
-
+ REFERENCES model (model_id);
-#
-# CLDS stored procedures
#
+# CLDS stored procedures
#
+
USE cldsdb4;
DROP PROCEDURE IF EXISTS upd_event;
DROP PROCEDURE IF EXISTS del_model_instance;
DROP PROCEDURE IF EXISTS ins_model_instance;
DROP PROCEDURE IF EXISTS set_model;
-DROP PROCEDURE IF EXISTS get_model;
-DROP PROCEDURE IF EXISTS get_model_template;
+DROP PROCEDURE IF EXISTS get_model;
+DROP PROCEDURE IF EXISTS get_model_template;
DROP PROCEDURE IF EXISTS set_template;
-DROP PROCEDURE IF EXISTS get_template;
+DROP PROCEDURE IF EXISTS get_template;
DELIMITER //
CREATE PROCEDURE get_template
(IN v_template_name VARCHAR(80),
OUT v_template_id VARCHAR(36),
OUT v_template_bpmn_id VARCHAR(36),
- OUT v_template_bpmn_userid VARCHAR(8),
+ OUT v_template_bpmn_user_id VARCHAR(80),
OUT v_template_bpmn_text MEDIUMTEXT,
OUT v_template_image_id VARCHAR(36),
- OUT v_template_image_userid VARCHAR(8),
+ OUT v_template_image_user_id VARCHAR(80),
OUT v_template_image_text MEDIUMTEXT,
OUT v_template_doc_id VARCHAR(36),
- OUT v_template_doc_userid VARCHAR(8),
+ OUT v_template_doc_user_id VARCHAR(80),
OUT v_template_doc_text MEDIUMTEXT)
BEGIN
SELECT t.template_id,
tb.template_bpmn_id,
- tb.userid,
+ tb.user_id,
tb.template_bpmn_text,
ti.template_image_id,
- ti.userid,
+ ti.user_id,
ti.template_image_text,
td.template_doc_id,
- td.userid,
+ td.user_id,
td.template_doc_text
INTO v_template_id,
v_template_bpmn_id,
- v_template_bpmn_userid,
+ v_template_bpmn_user_id,
v_template_bpmn_text,
v_template_image_id,
- v_template_image_userid,
+ v_template_image_user_id,
v_template_image_text,
v_template_doc_id,
- v_template_doc_userid,
+ v_template_doc_user_id,
v_template_doc_text
FROM template t,
template_bpmn tb,
END;
CREATE PROCEDURE set_template
(IN v_template_name VARCHAR(80),
- IN v_userid VARCHAR(8),
+ IN v_user_id VARCHAR(80),
IN v_template_bpmn_text MEDIUMTEXT,
IN v_template_image_text MEDIUMTEXT,
IN v_template_doc_text MEDIUMTEXT,
OUT v_template_id VARCHAR(36),
OUT v_template_bpmn_id VARCHAR(36),
- OUT v_template_bpmn_userid VARCHAR(8),
+ OUT v_template_bpmn_user_id VARCHAR(80),
OUT v_template_image_id VARCHAR(36),
- OUT v_template_image_userid VARCHAR(8),
+ OUT v_template_image_user_id VARCHAR(80),
OUT v_template_doc_id VARCHAR(36),
- OUT v_template_doc_userid VARCHAR(8))
+ OUT v_template_doc_user_id VARCHAR(80))
BEGIN
DECLARE v_old_template_bpmn_text MEDIUMTEXT;
DECLARE v_old_template_image_text MEDIUMTEXT;
v_template_name,
v_template_id,
v_template_bpmn_id,
- v_template_bpmn_userid,
+ v_template_bpmn_user_id,
v_old_template_bpmn_text,
v_template_image_id,
- v_template_image_userid,
+ v_template_image_user_id,
v_old_template_image_text,
v_template_doc_id,
- v_template_doc_userid,
+ v_template_doc_user_id,
v_old_template_doc_text);
IF v_template_id IS NULL THEN
BEGIN
IF v_template_bpmn_id IS NULL OR v_template_bpmn_text <> v_old_template_bpmn_text THEN
SET v_template_bpmn_id = UUID();
INSERT INTO template_bpmn
- (template_bpmn_id, template_id, template_bpmn_text, userid)
- VALUES (v_template_bpmn_id, v_template_id, v_template_bpmn_text, v_userid);
- SET v_template_bpmn_userid = v_userid;
+ (template_bpmn_id, template_id, template_bpmn_text, user_id)
+ VALUES (v_template_bpmn_id, v_template_id, v_template_bpmn_text, v_user_id);
+ SET v_template_bpmn_user_id = v_user_id;
END IF;
IF v_template_image_id IS NULL OR v_template_image_text <> v_old_template_image_text THEN
SET v_template_image_id = UUID();
INSERT INTO template_image
- (template_image_id, template_id, template_image_text, userid)
- VALUES (v_template_image_id, v_template_id, v_template_image_text, v_userid);
- SET v_template_image_userid = v_userid;
+ (template_image_id, template_id, template_image_text, user_id)
+ VALUES (v_template_image_id, v_template_id, v_template_image_text, v_user_id);
+ SET v_template_image_user_id = v_user_id;
END IF;
IF v_template_doc_id IS NULL OR v_template_doc_text <> v_old_template_doc_text THEN
SET v_template_doc_id = UUID();
INSERT INTO template_doc
- (template_doc_id, template_id, template_doc_text, userid)
- VALUES (v_template_doc_id, v_template_id, v_template_doc_text, v_userid);
- SET v_template_doc_userid = v_userid;
+ (template_doc_id, template_id, template_doc_text, user_id)
+ VALUES (v_template_doc_id, v_template_id, v_template_doc_text, v_user_id);
+ SET v_template_doc_user_id = v_user_id;
END IF;
UPDATE template
SET template_bpmn_id = v_template_bpmn_id,
OUT v_control_name_prefix VARCHAR(80),
INOUT v_control_name_uuid VARCHAR(36),
OUT v_model_id VARCHAR(36),
+ OUT v_service_type_id VARCHAR(80),
+ OUT v_deployment_id VARCHAR(80),
OUT v_template_name VARCHAR(80),
OUT v_template_id VARCHAR(36),
OUT v_model_prop_id VARCHAR(36),
- OUT v_model_prop_userid VARCHAR(8),
+ OUT v_model_prop_user_id VARCHAR(80),
OUT v_model_prop_text MEDIUMTEXT,
OUT v_model_blueprint_id VARCHAR(36),
- OUT v_model_blueprint_userid VARCHAR(8),
+ OUT v_model_blueprint_user_id VARCHAR(80),
OUT v_model_blueprint_text MEDIUMTEXT,
OUT v_event_id VARCHAR(36),
OUT v_action_cd VARCHAR(80),
OUT v_action_state_cd VARCHAR(80),
OUT v_event_process_instance_id VARCHAR(80),
- OUT v_event_userid VARCHAR(8))
+ OUT v_event_user_id VARCHAR(80))
BEGIN
SELECT m.control_name_prefix,
m.control_name_uuid,
m.model_id,
+ m.service_type_id,
+ m.deployment_id,
t.template_name,
m.template_id,
mp.model_prop_id,
- mp.userid,
+ mp.user_id,
mp.model_prop_text,
mb.model_blueprint_id,
- mb.userid,
+ mb.user_id,
mb.model_blueprint_text,
e.event_id,
e.action_cd,
e.action_state_cd,
e.process_instance_id,
- e.userid
+ e.user_id
INTO v_control_name_prefix,
v_control_name_uuid,
v_model_id,
+ v_service_type_id,
+ v_deployment_id,
v_template_name,
v_template_id,
v_model_prop_id,
- v_model_prop_userid,
+ v_model_prop_user_id,
v_model_prop_text,
v_model_blueprint_id,
- v_model_blueprint_userid,
+ v_model_blueprint_user_id,
v_model_blueprint_text,
v_event_id,
v_action_cd,
v_action_state_cd,
v_event_process_instance_id,
- v_event_userid
+ v_event_user_id
FROM model m,
template t,
model_properties mp,
OUT v_control_name_prefix VARCHAR(80),
INOUT v_control_name_uuid VARCHAR(36),
OUT v_model_id VARCHAR(36),
+ OUT v_service_type_id VARCHAR(80),
+ OUT v_deployment_id VARCHAR(80),
OUT v_template_name VARCHAR(80),
OUT v_template_id VARCHAR(36),
OUT v_model_prop_id VARCHAR(36),
- OUT v_model_prop_userid VARCHAR(8),
+ OUT v_model_prop_user_id VARCHAR(80),
OUT v_model_prop_text MEDIUMTEXT,
OUT v_model_blueprint_id VARCHAR(36),
- OUT v_model_blueprint_userid VARCHAR(8),
+ OUT v_model_blueprint_user_id VARCHAR(80),
OUT v_model_blueprint_text MEDIUMTEXT,
OUT v_template_bpmn_id VARCHAR(36),
- OUT v_template_bpmn_userid VARCHAR(8),
+ OUT v_template_bpmn_user_id VARCHAR(80),
OUT v_template_bpmn_text MEDIUMTEXT,
OUT v_template_image_id VARCHAR(36),
- OUT v_template_image_userid VARCHAR(8),
+ OUT v_template_image_user_id VARCHAR(80),
OUT v_template_image_text MEDIUMTEXT,
OUT v_template_doc_id VARCHAR(36),
- OUT v_template_doc_userid VARCHAR(8),
+ OUT v_template_doc_user_id VARCHAR(80),
OUT v_template_doc_text MEDIUMTEXT,
OUT v_event_id VARCHAR(36),
OUT v_action_cd VARCHAR(80),
OUT v_action_state_cd VARCHAR(80),
OUT v_event_process_instance_id VARCHAR(80),
- OUT v_event_userid VARCHAR(8))
+ OUT v_event_user_id VARCHAR(80))
BEGIN
CALL get_model(
v_model_name,
v_control_name_prefix,
v_control_name_uuid,
v_model_id,
+ v_service_type_id,
+ v_deployment_id,
v_template_name,
v_template_id,
v_model_prop_id,
- v_model_prop_userid,
+ v_model_prop_user_id,
v_model_prop_text,
v_model_blueprint_id,
- v_model_blueprint_userid,
+ v_model_blueprint_user_id,
v_model_blueprint_text,
v_event_id,
v_action_cd,
v_action_state_cd,
v_event_process_instance_id,
- v_event_userid);
+ v_event_user_id);
CALL get_template(
v_template_name,
v_template_id,
v_template_bpmn_id,
- v_template_bpmn_userid,
+ v_template_bpmn_user_id,
v_template_bpmn_text,
v_template_image_id,
- v_template_image_userid,
+ v_template_image_user_id,
v_template_image_text,
v_template_doc_id,
- v_template_doc_userid,
+ v_template_doc_user_id,
v_template_doc_text);
END;
CREATE PROCEDURE set_model
(IN v_model_name VARCHAR(80),
IN v_template_id VARCHAR(36),
- IN v_userid VARCHAR(8),
+ IN v_user_id VARCHAR(80),
IN v_model_prop_text MEDIUMTEXT,
IN v_model_blueprint_text MEDIUMTEXT,
+ IN v_service_type_id VARCHAR(80),
+ IN v_deployment_id VARCHAR(80),
INOUT v_control_name_prefix VARCHAR(80),
INOUT v_control_name_uuid VARCHAR(36),
OUT v_model_id VARCHAR(36),
OUT v_model_prop_id VARCHAR(36),
- OUT v_model_prop_userid VARCHAR(8),
+ OUT v_model_prop_user_id VARCHAR(80),
OUT v_model_blueprint_id VARCHAR(36),
- OUT v_model_blueprint_userid VARCHAR(8),
+ OUT v_model_blueprint_user_id VARCHAR(80),
OUT v_event_id VARCHAR(36),
OUT v_action_cd VARCHAR(80),
OUT v_action_state_cd VARCHAR(80),
OUT v_event_process_instance_id VARCHAR(80),
- OUT v_event_userid VARCHAR(8))
+ OUT v_event_user_id VARCHAR(80))
BEGIN
DECLARE v_old_template_name VARCHAR(80);
DECLARE v_old_template_id VARCHAR(36);
DECLARE v_old_control_name_uuid VARCHAR(36);
DECLARE v_old_model_prop_text MEDIUMTEXT;
DECLARE v_old_model_blueprint_text MEDIUMTEXT;
+ DECLARE v_old_service_type_id VARCHAR(80);
+ DECLARE v_old_deployment_id VARCHAR(80);
SET v_model_id = NULL;
CALL get_model(
v_model_name,
v_old_control_name_prefix,
v_old_control_name_uuid,
v_model_id,
+ v_old_service_type_id,
+ v_old_deployment_id,
v_old_template_name,
v_old_template_id,
v_model_prop_id,
- v_model_prop_userid,
+ v_model_prop_user_id,
v_old_model_prop_text,
v_model_blueprint_id,
- v_model_blueprint_userid,
+ v_model_blueprint_user_id,
v_old_model_blueprint_text,
v_event_id,
v_action_cd,
v_action_state_cd,
v_event_process_instance_id,
- v_event_userid);
+ v_event_user_id);
IF v_model_id IS NULL THEN
BEGIN
# UUID can be provided initially but cannot be updated
END IF;
SET v_model_id = v_control_name_uuid;
INSERT INTO model
- (model_id, model_name, template_id, control_name_prefix, control_name_uuid)
- VALUES (v_model_id, v_model_name, v_template_id, v_control_name_prefix, v_control_name_uuid);
+ (model_id, model_name, template_id, control_name_prefix, control_name_uuid, service_type_id, deployment_id)
+ VALUES (v_model_id, v_model_name, v_template_id, v_control_name_prefix, v_control_name_uuid, v_service_type_id, v_deployment_id);
# since just created model, insert CREATED event as initial default event
SET v_action_cd = 'CREATE';
SET v_action_state_cd = 'COMPLETED';
- SET v_event_userid = v_userid;
+ SET v_event_user_id = v_user_id;
SET v_event_id = UUID();
INSERT INTO event
- (event_id, model_id, action_cd, action_state_cd, userid)
- VALUES (v_event_id, v_model_id, v_action_cd, v_action_state_cd, v_event_userid);
+ (event_id, model_id, action_cd, action_state_cd, user_id)
+ VALUES (v_event_id, v_model_id, v_action_cd, v_action_state_cd, v_event_user_id);
UPDATE model
SET event_id = v_event_id
WHERE model_id = v_model_id;
IF v_model_prop_id IS NULL OR v_model_prop_text <> v_old_model_prop_text THEN
SET v_model_prop_id = UUID();
INSERT INTO model_properties
- (model_prop_id, model_id, model_prop_text, userid)
- VALUES (v_model_prop_id, v_model_id, v_model_prop_text, v_userid);
- SET v_model_prop_userid = v_userid;
+ (model_prop_id, model_id, model_prop_text, user_id)
+ VALUES (v_model_prop_id, v_model_id, v_model_prop_text, v_user_id);
+ SET v_model_prop_user_id = v_user_id;
END IF;
IF v_model_blueprint_id IS NULL OR v_model_blueprint_text <> v_old_model_blueprint_text THEN
SET v_model_blueprint_id = UUID();
INSERT INTO model_blueprint
- (model_blueprint_id, model_id, model_blueprint_text, userid)
- VALUES (v_model_blueprint_id, v_model_id, v_model_blueprint_text, v_userid);
- SET v_model_blueprint_userid = v_userid;
+ (model_blueprint_id, model_id, model_blueprint_text, user_id)
+ VALUES (v_model_blueprint_id, v_model_id, v_model_blueprint_text, v_user_id);
+ SET v_model_blueprint_user_id = v_user_id;
END IF;
UPDATE model
SET control_name_prefix = v_control_name_prefix,
model_prop_id = v_model_prop_id,
- model_blueprint_id = v_model_blueprint_id
+ model_blueprint_id = v_model_blueprint_id,
+ service_type_id = v_service_type_id,
+ deployment_id = v_deployment_id
WHERE model_id = v_model_id;
END;
CREATE PROCEDURE ins_model_instance
(IN v_model_name VARCHAR(80),
IN v_control_name_prefix VARCHAR(80),
IN v_control_name_uuid VARCHAR(36),
- IN v_userid VARCHAR(8),
+ IN v_user_id VARCHAR(80),
IN v_action_cd VARCHAR(80),
IN v_action_state_cd VARCHAR(80),
IN v_process_instance_id VARCHAR(80),
OR m.control_name_uuid = v_control_name_uuid;
SET v_event_id = UUID();
INSERT INTO event
- (event_id, model_id, action_cd, action_state_cd, prev_event_id, process_instance_id, userid)
- VALUES (v_event_id, v_model_id, v_action_cd, v_action_state_cd, v_prev_event_id, v_process_instance_id, v_userid);
+ (event_id, model_id, action_cd, action_state_cd, prev_event_id, process_instance_id, user_id)
+ VALUES (v_event_id, v_model_id, v_action_cd, v_action_state_cd, v_prev_event_id, v_process_instance_id, v_user_id);
UPDATE model
SET event_id = v_event_id
WHERE model_id = v_model_id;
-#
-# Drop CLDS database objects (tables, etc.)
#
+# Drop CLDS database objects (tables, etc.)
#
DROP FOREIGN KEY template_bpmn_id_fkey01;
ALTER TABLE template
DROP FOREIGN KEY template_doc_id_fkey01;
-
+
ALTER TABLE model
DROP FOREIGN KEY template_id_fkey01;
ALTER TABLE model
ALTER TABLE model
DROP FOREIGN KEY event_id_fkey01;
+DROP TABLE clds_service_cache;
+
DROP TABLE model_instance;
DROP TABLE model_blueprint;
DROP TABLE model_properties;
public class CldsAlarmCondition implements Serializable {
- private static final long serialVersionUID = 1L;
- private String eventSourceType;
- private String alarmConditionKey;
- private String severity;
+ private static final long serialVersionUID = 4271364536747705555L;
+ private String eventSourceType;
+ private String alarmConditionKey;
+ private String severity;
public String getEventSourceType() {
return eventSourceType;
package org.onap.clamp.clds.model;
-import java.io.*;
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.ObjectOutputStream;
public class CldsDBServiceCache {
- private String invariantId;
- private String serviceId;
+ private String invariantId;
+ private String serviceId;
private InputStream cldsDataInstream;
public String getInvariantId() {
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
* Represent a CLDS Event.
*/
public class CldsEvent {
- public static final String ACTION_CREATE = "CREATE";
- public static final String ACTION_SUBMIT = "SUBMIT";
- public static final String ACTION_RESUBMIT = "RESUBMIT"; // an update before model is active
- public static final String ACTION_DISTRIBUTE = "DISTRIBUTE"; // only from dcae
- public static final String ACTION_DEPLOY = "DEPLOY"; // only from dcae
- public static final String ACTION_UNDEPLOY = "UNDEPLOY"; // only from dcae
- public static final String ACTION_UPDATE = "UPDATE";
- public static final String ACTION_DELETE = "DELETE";
- public static final String ACTION_STOP = "STOP";
- public static final String ACTION_RESTART = "RESTART";
+ public static final String ACTION_TEST = "TEST";
+ public static final String ACTION_CREATE = "CREATE";
+ public static final String ACTION_SUBMIT = "SUBMIT";
+ // an update before model is active
+ public static final String ACTION_RESUBMIT = "RESUBMIT";
+ // only from dcae
+ public static final String ACTION_DISTRIBUTE = "DISTRIBUTE";
+ // only from dcae
+ public static final String ACTION_DEPLOY = "DEPLOY";
+ // only from dcae
+ public static final String ACTION_UNDEPLOY = "UNDEPLOY";
+ public static final String ACTION_UPDATE = "UPDATE";
+ public static final String ACTION_DELETE = "DELETE";
+ public static final String ACTION_STOP = "STOP";
+ public static final String ACTION_RESTART = "RESTART";
public static final String ACTION_STATE_INITIATED = "INITIATED";
- public static final String ACTION_STATE_SENT = "SENT";
+ public static final String ACTION_STATE_SENT = "SENT";
public static final String ACTION_STATE_COMPLETED = "COMPLETED";
- public static final String ACTION_STATE_RECEIVED = "RECEIVED";
- public static final String ACTION_STATE_ERROR = "ERROR";
- public static final String ACTION_STATE_ANY = null;
+ public static final String ACTION_STATE_RECEIVED = "RECEIVED";
+ public static final String ACTION_STATE_ERROR = "ERROR";
+ public static final String ACTION_STATE_ANY = null;
- private String id;
- private String actionCd;
- private String actionStateCd;
- private String processInstanceId;
- private String userid;
+ private String id;
+ private String actionCd;
+ private String actionStateCd;
+ private String processInstanceId;
+ private String userid;
public String getId() {
return id;
* @param processInstanceId
* @return
*/
- public static CldsEvent insEvent(CldsDao cldsDao, String controlName, String userid, String actionCd, String actionStateCd, String processInstanceId) {
+ public static CldsEvent insEvent(CldsDao cldsDao, String controlName, String userid, String actionCd,
+ String actionStateCd, String processInstanceId) {
CldsModel model = CldsModel.createUsingControlName(controlName);
- return insEvent(cldsDao, model, actionCd, actionStateCd, processInstanceId);
+ return insEvent(cldsDao, model, userid, actionCd, actionStateCd, processInstanceId);
}
/**
- * Insert event using controlNameUuid to find the model.
- * This method meant for processing events from dcae.
+ * Insert event using controlNameUuid to find the model. This method meant
+ * for processing events from dcae.
+ *
* @param cldsDao
* @param model
* @param actionCd
* @param processInstanceId
* @return
*/
- public static CldsEvent insEvent(CldsDao cldsDao, CldsModel model, String actionCd, String actionStateCd, String processInstanceId) {
+ public static CldsEvent insEvent(CldsDao cldsDao, CldsModel model, String userId, String actionCd, String actionStateCd,
+ String processInstanceId) {
CldsEvent event = new CldsEvent();
+ event.setUserid(userId);
event.setActionCd(actionCd);
event.setActionStateCd(actionStateCd);
event.setProcessInstanceId(processInstanceId);
}
/**
- * Check if actionCd and actionStateCd are equal to the supplied checkActionCd and checkActionStateCd.
- * Treat checkActionStateCd == null as a wildcard
- * checkActionCd should not be null.
+ * Check if actionCd is equal to the supplied checkActionCd checkActionCd
+ * should not be null.
+ *
+ * @param checkActionCd
+ * @return
+ */
+ public boolean isActionCd(String checkActionCd) {
+ if (actionCd == null) {
+ return false;
+ }
+ return actionCd.equals(checkActionCd);
+ }
+
+ /**
+ * Check if actionCd and actionStateCd are equal to the supplied
+ * checkActionCd and checkActionStateCd. Treat checkActionStateCd == null as
+ * a wildcard checkActionCd should not be null.
*
* @param checkActionCd
* @param checkActionStateCd
if (actionCd == null) {
return false;
}
- // treat checkActionStateCd == null as a wildcard (same for actionStateCd, although it shouln't be null...)
+ // treat checkActionStateCd == null as a wildcard (same for
+ // actionStateCd, although it shouln't be null...)
if (checkActionStateCd == null || actionStateCd == null) {
return actionCd.equals(checkActionCd);
}
}
/**
- * @param actionCd the actionCd to set
+ * @param actionCd
+ * the actionCd to set
*/
public void setActionCd(String actionCd) {
this.actionCd = actionCd;
}
/**
- * @param actionStateCd the actionStateCd to set
+ * @param actionStateCd
+ * the actionStateCd to set
*/
public void setActionStateCd(String actionStateCd) {
this.actionStateCd = actionStateCd;
}
/**
- * @param processInstanceId the processInstanceId to set
+ * @param processInstanceId
+ * the processInstanceId to set
*/
public void setProcessInstanceId(String processInstanceId) {
this.processInstanceId = processInstanceId;
}
/**
- * @param userid the userid to set
+ * @param userid
+ * the userid to set
*/
public void setUserid(String userid) {
this.userid = userid;
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
package org.onap.clamp.clds.model;
-import org.onap.clamp.clds.dao.CldsDao;
-import org.jboss.resteasy.spi.BadRequestException;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.NotFoundException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+import javax.ws.rs.NotFoundException;
+
+import org.jboss.resteasy.spi.BadRequestException;
+import org.onap.clamp.clds.dao.CldsDao;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
/**
* Represent a CLDS Model.
*/
public class CldsModel {
- private static final Logger logger = LoggerFactory.getLogger(CldsModel.class);
-
- private static final int UUID_LENGTH = 36;
-
- public static final String STATUS_DESIGN = "DESIGN";
- public static final String STATUS_DISTRIBUTED = "DISTRIBUTED";
- public static final String STATUS_ACTIVE = "ACTIVE";
- public static final String STATUS_STOPPED = "STOPPED";
- public static final String STATUS_DELETING = "DELETING";
- public static final String STATUS_ERROR = "ERROR"; // manual intervention required
- public static final String STATUS_UNKNOWN = "UNKNOWN";
-
- private String id;
- private String templateId;
- private String templateName;
- private String name;
- private String controlNamePrefix;
- private String controlNameUuid;
- private String bpmnId;
- private String bpmnUserid;
- private String bpmnText;
- private String propId;
- private String propUserid;
- private String propText;
- private String imageId;
- private String imageUserid;
- private String imageText;
- private String docId;
- private String docUserid;
- private String docText;
- private String blueprintId;
- private String blueprintUserid;
- private String blueprintText;
- private CldsEvent event;
- private String status;
- private List<String> permittedActionCd;
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsModel.class);
+ protected static final EELFLogger metricsLogger = EELFManager.getInstance().getMetricsLogger();
+
+ private static final int UUID_LENGTH = 36;
+
+ public static final String STATUS_DESIGN = "DESIGN";
+ public static final String STATUS_DISTRIBUTED = "DISTRIBUTED";
+ public static final String STATUS_ACTIVE = "ACTIVE";
+ public static final String STATUS_STOPPED = "STOPPED";
+ public static final String STATUS_DELETING = "DELETING";
+ public static final String STATUS_ERROR = "ERROR"; // manual
+ // intervention
+ // required
+ public static final String STATUS_UNKNOWN = "UNKNOWN";
+
+ private String id;
+ private String templateId;
+ private String templateName;
+ private String name;
+ private String controlNamePrefix;
+ private String controlNameUuid;
+ private String bpmnId;
+ private String bpmnUserid;
+ private String bpmnText;
+ private String propId;
+ private String propUserid;
+ private String propText;
+ private String imageId;
+ private String imageUserid;
+ private String imageText;
+ private String docId;
+ private String docUserid;
+ private String docText;
+ private String blueprintId;
+ private String blueprintUserid;
+ private String blueprintText;
+ private CldsEvent event;
+ private String status;
+ private List<String> permittedActionCd;
private List<CldsModelInstance> cldsModelInstanceList;
+ private String typeId;
+ private String typeName;
+
+ private String dispatcherResponse;
+
+ private String deploymentId;
+
+ private boolean userAuthorizedToUpdate;
+
/**
* Construct empty model.
*/
return model;
}
+ public boolean canInventoryCall() {
+ boolean canCall = false;
+ /* Below checks the clds ecent is submit/resubmit */
+
+ if ((event.isActionCd(CldsEvent.ACTION_SUBMIT) || event.isActionCd(CldsEvent.ACTION_RESUBMIT))) {
+ canCall = true;
+ }
+ return canCall;
+ }
+
/**
* Save model to DB.
*
}
/**
- * Insert a new event for the new action.
- * Throw IllegalArgumentException if requested actionCd is not permitted.
+ * Insert a new event for the new action. Throw IllegalArgumentException if
+ * requested actionCd is not permitted.
*
* @param cldsDao
* @param userid
*/
public void insEvent(CldsDao cldsDao, String userid, String actionCd, String actionStateCd) {
validateAction(actionCd);
- event = CldsEvent.insEvent(cldsDao, this, actionCd, actionStateCd, null);
+ event = CldsEvent.insEvent(cldsDao, this, userid, actionCd, actionStateCd, null);
determineStatus();
determinePermittedActionCd();
}
status = STATUS_DESIGN;
} else if (event.isActionStateCd(CldsEvent.ACTION_STATE_ERROR)) {
status = STATUS_ERROR;
- } else if (event.isActionAndStateCd(CldsEvent.ACTION_CREATE, CldsEvent.ACTION_STATE_ANY) ||
- event.isActionAndStateCd(CldsEvent.ACTION_SUBMIT, CldsEvent.ACTION_STATE_ANY) ||
- event.isActionAndStateCd(CldsEvent.ACTION_RESUBMIT, CldsEvent.ACTION_STATE_ANY) ||
- event.isActionAndStateCd(CldsEvent.ACTION_DELETE, CldsEvent.ACTION_STATE_RECEIVED)) {
+ } else if (event.isActionAndStateCd(CldsEvent.ACTION_CREATE, CldsEvent.ACTION_STATE_ANY)
+ || event.isActionAndStateCd(CldsEvent.ACTION_SUBMIT, CldsEvent.ACTION_STATE_ANY)
+ || event.isActionAndStateCd(CldsEvent.ACTION_RESUBMIT, CldsEvent.ACTION_STATE_ANY)
+ || event.isActionAndStateCd(CldsEvent.ACTION_DELETE, CldsEvent.ACTION_STATE_RECEIVED)) {
status = STATUS_DESIGN;
- } else if (event.isActionAndStateCd(CldsEvent.ACTION_DISTRIBUTE, CldsEvent.ACTION_STATE_RECEIVED) ||
- event.isActionAndStateCd(CldsEvent.ACTION_UNDEPLOY, CldsEvent.ACTION_STATE_RECEIVED)) {
+ } else if (event.isActionAndStateCd(CldsEvent.ACTION_DISTRIBUTE, CldsEvent.ACTION_STATE_RECEIVED)
+ || event.isActionAndStateCd(CldsEvent.ACTION_UNDEPLOY, CldsEvent.ACTION_STATE_RECEIVED)) {
status = STATUS_DISTRIBUTED;
} else if (event.isActionAndStateCd(CldsEvent.ACTION_DELETE, CldsEvent.ACTION_STATE_SENT)) {
status = STATUS_DELETING;
- } else if (event.isActionAndStateCd(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_STATE_RECEIVED) ||
- event.isActionAndStateCd(CldsEvent.ACTION_RESTART, CldsEvent.ACTION_STATE_ANY) ||
- event.isActionAndStateCd(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STATE_ANY)) {
+ } else if (event.isActionAndStateCd(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_STATE_RECEIVED)
+ || event.isActionAndStateCd(CldsEvent.ACTION_RESTART, CldsEvent.ACTION_STATE_ANY)
+ || event.isActionAndStateCd(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STATE_ANY)
+ || event.isActionAndStateCd(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_STATE_ANY)) {
status = STATUS_ACTIVE;
} else if (event.isActionAndStateCd(CldsEvent.ACTION_STOP, CldsEvent.ACTION_STATE_ANY)) {
status = STATUS_STOPPED;
}
/**
- * Get the actionCd from current event. If none, default value is CldsEvent.ACTION_CREATE
+ * Get the actionCd from current event. If none, default value is
+ * CldsEvent.ACTION_CREATE
*
* @return
*/
}
/**
- * Get the actionStateCd from current event. If none, default value is CldsEvent.ACTION_STATE_COMPLETED
+ * Get the actionStateCd from current event. If none, default value is
+ * CldsEvent.ACTION_STATE_COMPLETED
*
* @return
*/
}
/**
- * Determine permittedActionCd list using the actionCd from the current event.
+ * Determine permittedActionCd list using the actionCd from the current
+ * event.
*/
private void determinePermittedActionCd() {
String actionCd = getCurrentActionCd();
switch (actionCd) {
case CldsEvent.ACTION_CREATE:
- permittedActionCd = Arrays.asList(CldsEvent.ACTION_SUBMIT);
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_SUBMIT, CldsEvent.ACTION_TEST);
break;
case CldsEvent.ACTION_SUBMIT:
case CldsEvent.ACTION_RESUBMIT:
- // for 1702 delete is not currently implemented (and resubmit requires manually deleting artifact from asdc
+ // for 1702 delete is not currently implemented (and resubmit
+ // requires manually deleting artifact from sdc
permittedActionCd = Arrays.asList(CldsEvent.ACTION_RESUBMIT);
break;
case CldsEvent.ACTION_DISTRIBUTE:
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_DEPLOY, CldsEvent.ACTION_RESUBMIT);
+ break;
case CldsEvent.ACTION_UNDEPLOY:
- permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE);
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_DEPLOY);
break;
case CldsEvent.ACTION_DEPLOY:
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_UNDEPLOY, CldsEvent.ACTION_UPDATE,
+ CldsEvent.ACTION_STOP);
+ break;
case CldsEvent.ACTION_RESTART:
case CldsEvent.ACTION_UPDATE:
// for 1702 delete is not currently implemented
- permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STOP);
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_STOP,
+ CldsEvent.ACTION_UNDEPLOY);
break;
case CldsEvent.ACTION_DELETE:
if (getCurrentActionStateCd().equals(CldsEvent.ACTION_STATE_SENT)) {
break;
case CldsEvent.ACTION_STOP:
// for 1702 delete is not currently implemented
- permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_RESTART);
+ permittedActionCd = Arrays.asList(CldsEvent.ACTION_UPDATE, CldsEvent.ACTION_RESTART,
+ CldsEvent.ACTION_UNDEPLOY);
break;
default:
logger.warn("Invalid current actionCd: " + actionCd);
}
/**
- * Validate requestedActionCd - determine permittedActionCd and then check if contained in permittedActionCd
- * Throw IllegalArgumentException if requested actionCd is not permitted.
+ * Validate requestedActionCd - determine permittedActionCd and then check
+ * if contained in permittedActionCd Throw IllegalArgumentException if
+ * requested actionCd is not permitted.
*
* @param requestedActionCd
*/
public void validateAction(String requestedActionCd) {
determinePermittedActionCd();
if (!permittedActionCd.contains(requestedActionCd)) {
- throw new IllegalArgumentException("Invalid requestedActionCd: " + requestedActionCd + ". Given current actionCd: " + getCurrentActionCd() + ", the permittedActionCd: " + permittedActionCd);
+ throw new IllegalArgumentException(
+ "Invalid requestedActionCd: " + requestedActionCd + ". Given current actionCd: "
+ + getCurrentActionCd() + ", the permittedActionCd: " + permittedActionCd);
}
}
/**
- * Extract the UUID portion of a given full control name (controlNamePrefix + controlNameUuid).
- * No fields are populated other than controlNamePrefix and controlNameUuid.
- * Throws BadRequestException if length of given control name is less than UUID_LENGTH.
+ * Extract the UUID portion of a given full control name (controlNamePrefix
+ * + controlNameUuid). No fields are populated other than controlNamePrefix
+ * and controlNameUuid. Throws BadRequestException if length of given
+ * control name is less than UUID_LENGTH.
*
* @param fullControlName
* @return
len = fullControlName.length();
}
if (len < UUID_LENGTH) {
- throw new BadRequestException("closed loop id / control name length, " + len + ", less than the minimum of: " + UUID_LENGTH);
+ throw new BadRequestException(
+ "closed loop id / control name length, " + len + ", less than the minimum of: " + UUID_LENGTH);
}
CldsModel model = new CldsModel();
model.setControlNamePrefix(fullControlName.substring(0, len - UUID_LENGTH));
CldsModel cldsModel = createUsingControlName(controlName);
cldsModel = cldsDao.getModelByUuid(cldsModel.getControlNameUuid());
cldsModel.determineStatus();
- if (dcaeEvent.getCldsActionCd().equals(CldsEvent.ACTION_UNDEPLOY) ||
- (dcaeEvent.getCldsActionCd().equals(CldsEvent.ACTION_DEPLOY) && (cldsModel.getStatus().equals(STATUS_DISTRIBUTED) || cldsModel.getStatus().equals(STATUS_DESIGN)))) {
- CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userid, dcaeEvent.getCldsActionCd(), CldsEvent.ACTION_STATE_RECEIVED, null);
+ if (dcaeEvent.getCldsActionCd().equals(CldsEvent.ACTION_UNDEPLOY) || (dcaeEvent.getCldsActionCd()
+ .equals(CldsEvent.ACTION_DEPLOY)
+ && (cldsModel.getStatus().equals(STATUS_DISTRIBUTED) || cldsModel.getStatus().equals(STATUS_DESIGN)))) {
+ CldsEvent.insEvent(cldsDao, dcaeEvent.getControlName(), userid, dcaeEvent.getCldsActionCd(),
+ CldsEvent.ACTION_STATE_RECEIVED, null);
}
cldsDao.insModelInstance(cldsModel, dcaeEvent.getInstances());
return cldsModel;
}
/**
- * To remove modelInstance from the database
- * This method is defunct - DCAE Proxy will not undeploy individual instances. It will send an empty list of
- * deployed instances to indicate all have been removed. Or it will send an updated list to indicate those that
- * are still deployed with any not on the list considered undeployed.
+ * To remove modelInstance from the database This method is defunct - DCAE
+ * Proxy will not undeploy individual instances. It will send an empty list
+ * of deployed instances to indicate all have been removed. Or it will send
+ * an updated list to indicate those that are still deployed with any not on
+ * the list considered undeployed.
*
* @param cldsDao
* @param dcaeEvent
@SuppressWarnings("unused")
private static CldsModel removeModelInstance(CldsDao cldsDao, DcaeEvent dcaeEvent) {
String controlName = dcaeEvent.getControlName();
- //cldsModel = cldsDao.delModelInstance(cldsModel.getControlNameUuid(), dcaeEvent.getInstances() );
+ // cldsModel = cldsDao.delModelInstance(cldsModel.getControlNameUuid(),
+ // dcaeEvent.getInstances() );
return createUsingControlName(controlName);
}
}
/**
- * @param name the name to set
+ * @param name
+ * the name to set
*/
public void setName(String name) {
this.name = name;
}
+ /**
+ * @return the typeName
+ */
+ public String getTypeName() {
+ return typeName;
+ }
+
+ /**
+ * @param name
+ * the typeName to set
+ */
+ public void setTypeName(String typeName) {
+ this.typeName = typeName;
+ }
+
public String getTemplateId() {
return templateId;
}
}
/**
- * @param controlNamePrefix the controlNamePrefix to set
+ * @param controlNamePrefix
+ * the controlNamePrefix to set
*/
public void setControlNamePrefix(String controlNamePrefix) {
this.controlNamePrefix = controlNamePrefix;
}
/**
- * @param controlNameUuid the controlNameUuid to set
+ * @param controlNameUuid
+ * the controlNameUuid to set
*/
public void setControlNameUuid(String controlNameUuid) {
this.controlNameUuid = controlNameUuid;
}
-
/**
* @return the propUserid
*/
}
/**
- * @param propUserid the propUserid to set
+ * @param propUserid
+ * the propUserid to set
*/
public void setPropUserid(String propUserid) {
this.propUserid = propUserid;
}
/**
- * @param propText the propText to set
+ * @param propText
+ * the propText to set
*/
public void setPropText(String propText) {
this.propText = propText;
}
/**
- * @param event the event to set
+ * @param event
+ * the event to set
*/
public void setEvent(CldsEvent event) {
this.event = event;
}
/**
- * @param status the status to set
+ * @param status
+ * the status to set
*/
public void setStatus(String status) {
this.status = status;
}
/**
- * @param permittedActionCd the permittedActionCd to set
+ * @param permittedActionCd
+ * the permittedActionCd to set
*/
public void setPermittedActionCd(List<String> permittedActionCd) {
this.permittedActionCd = permittedActionCd;
this.docText = docText;
}
+ public String getTypeId() {
+ return typeId;
+ }
+
+ public void setTypeId(String typeId) {
+ this.typeId = typeId;
+ }
+
public List<CldsModelInstance> getCldsModelInstanceList() {
if (cldsModelInstanceList == null) {
cldsModelInstanceList = new ArrayList<>();
this.cldsModelInstanceList = cldsModelInstanceList;
}
+ public void setDispatcherResponse(String dispatcherResponse) {
+ this.dispatcherResponse = dispatcherResponse;
+
+ }
+
+ public String getDispatcherResponse() {
+ return this.dispatcherResponse;
+ }
+
+ public String getDeploymentId() {
+ return deploymentId;
+ }
+
+ public void setDeploymentId(String deploymentId) {
+ this.deploymentId = deploymentId;
+ }
+
+ public boolean isUserAuthorizedToUpdate() {
+ return userAuthorizedToUpdate;
+ }
+
+ public void setUserAuthorizedToUpdate(boolean userAuthorizedToUpdate) {
+ this.userAuthorizedToUpdate = userAuthorizedToUpdate;
+ }
}
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
package org.onap.clamp.clds.model;
-import org.onap.clamp.clds.dao.CldsDao;
-import org.onap.clamp.clds.service.CldsService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import javax.ws.rs.NotAuthorizedException;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
+import javax.ws.rs.NotAuthorizedException;
+
+import org.onap.clamp.clds.dao.CldsDao;
+import org.onap.clamp.clds.service.CldsService;
+
+import com.att.eelf.configuration.EELFLogger;
+import com.att.eelf.configuration.EELFManager;
+
public class CldsServiceData implements Serializable {
- private static final Logger logger = LoggerFactory.getLogger(CldsServiceData.class);
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -9153372664377279423L;
+
+ protected static final EELFLogger logger = EELFManager.getInstance().getLogger(CldsServiceData.class);
+ protected static final EELFLogger auditLogger = EELFManager.getInstance().getAuditLogger();
- private String serviceInvariantUUID;
- private String serviceUUID;
- private Long ageOfRecord;
- private List<CldsVfData> cldsVfs;
+ private String serviceInvariantUUID;
+ private String serviceUUID;
+ private Long ageOfRecord;
+ private List<CldsVfData> cldsVfs;
public String getServiceInvariantUUID() {
return serviceInvariantUUID;
}
/**
- * Filter out any VFs that the user is not authorized for.
- * Use the CldsService to determine if the user is authorized for a VF.
+ * Filter out any VFs that the user is not authorized for. Use the
+ * CldsService to determine if the user is authorized for a VF.
*
* @param svc
*/
logger.debug("cldsVfs == null");
} else {
for (CldsVfData vf : cldsVfs) {
- // if user is authorized for the VF then add it to the filtered list
+ // if user is authorized for the VF then add it to the filtered
+ // list
try {
if (svc.isAuthorizedForVf(vf.getVfInvariantResourceUUID())) {
filteredCldsVfs.add(vf);
}
} catch (NotAuthorizedException e) {
logger.debug("user not authorized for {}", vf.getVfInvariantResourceUUID());
- // when not NotAuthorizedException - don't add to filteredCldsVfs list
+ // when not NotAuthorizedException - don't add to
+ // filteredCldsVfs list
}
}
}
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
package org.onap.clamp.clds.model;
-import org.onap.clamp.clds.dao.CldsDao;
-
import javax.ws.rs.NotFoundException;
+import org.onap.clamp.clds.dao.CldsDao;
+
/**
* Represent a CLDS Model.
*/
public class CldsTemplate {
- public static final String STATUS_DESIGN = "DESIGN";
- public static final String STATUS_ACTIVE = "ACTIVE";
- public static final String STATUS_STOPPED = "STOPPED";
+ public static final String STATUS_DESIGN = "DESIGN";
+ public static final String STATUS_ACTIVE = "ACTIVE";
+ public static final String STATUS_STOPPED = "STOPPED";
public static final String STATUS_DELETING = "DELETING";
- public static final String STATUS_ERROR = "ERROR"; // manual intervention required
- public static final String STATUS_UNKNOWN = "UNKNOWN";
-
- private String id;
- private String name;
- private String controlNamePrefix;
- private String controlNameUuid;
- private String bpmnId;
- private String bpmnUserid;
- private String bpmnText;
- private String imageId;
- private String imageUserid;
- private String imageText;
- private String propId;
- private String propUserid;
- private String propText;
+ public static final String STATUS_ERROR = "ERROR"; // manual
+ // intervention
+ // required
+ public static final String STATUS_UNKNOWN = "UNKNOWN";
+
+ private String id;
+ private String name;
+ private String controlNamePrefix;
+ private String controlNameUuid;
+ private String bpmnId;
+ private String bpmnUserid;
+ private String bpmnText;
+ private String imageId;
+ private String imageUserid;
+ private String imageText;
+ private String propId;
+ private String propUserid;
+ private String propText;
+
+ private boolean userAuthorizedToUpdate;
/**
* Save template to DB.
this.imageId = imageId;
}
+ public boolean isUserAuthorizedToUpdate() {
+ return userAuthorizedToUpdate;
+ }
+
+ public void setUserAuthorizedToUpdate(boolean userAuthorizedToUpdate) {
+ this.userAuthorizedToUpdate = userAuthorizedToUpdate;
+ }
}
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
public class CldsVfData implements Serializable {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = -5069670140274203606L;
+ private String vfName;
+ private String vfInvariantResourceUUID;
+ private List<CldsVfcData> cldsVfcs;
- private String vfName;
- private String vfInvariantResourceUUID;
- private List<CldsVfcData> cldsVfcs;
+ private List<CldsVfKPIData> cldsKPIList;
+
+ public List<CldsVfKPIData> getCldsKPIList() {
+ return cldsKPIList;
+ }
+
+ public void setCldsKPIList(List<CldsVfKPIData> cldsKPIList) {
+ this.cldsKPIList = cldsKPIList;
+ }
public String getVfName() {
return vfName;
public class CldsVfcData implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private String vfcName;
- private String vfcInvariantResourceUUID;
+ private static final long serialVersionUID = 406993878174183557L;
+ private String vfcName;
+ private String vfcInvariantResourceUUID;
private List<CldsAlarmCondition> cldsAlarmConditions;
public String getVfcName() {
* Copyright (C) 2017 AT&T Intellectual Property. All rights
* reserved.
* ================================================================================
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
+ * 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
+ *
+ * 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.
* ============LICENSE_END============================================
* ===================================================================
package org.onap.clamp.clds.model;
-import org.jboss.resteasy.spi.BadRequestException;
-
import java.util.List;
+import org.jboss.resteasy.spi.BadRequestException;
+
/**
* Represent a DCAE Event.
*/
public class DcaeEvent {
- public static final String EVENT_CREATED = "created"; // this is an event we (clds) sends to dcae
- public static final String EVENT_DISTRIBUTION = "distribution";
- public static final String EVENT_DEPLOYMENT = "deployment";
- public static final String EVENT_UNDEPLOYMENT = "undeployment";
- public static final String ARTIFACT_NAME_SUFFIX = ".yml";
-
- private String event;
- private String serviceUUID;
- private String resourceUUID;
- private String artifactName; // controlName.yml
+ // this is an event we (clds) sends to dcae
+ public static final String EVENT_CREATED = "created";
+ public static final String EVENT_DISTRIBUTION = "distribute";
+ public static final String EVENT_DEPLOYMENT = "deployment";
+ public static final String EVENT_UNDEPLOYMENT = "undeployment";
+ public static final String ARTIFACT_NAME_SUFFIX = ".yml";
+
+ private String event;
+ private String serviceUUID;
+ private String resourceUUID;
+ private String artifactName; // controlName.yml
private List<CldsModelInstance> instances;
/**
public String getCldsActionCd() {
if (event == null || event.length() == 0) {
throw new BadRequestException("action null or empty");
- } else if (event.equals(EVENT_CREATED)) {
+ } else if (event.equalsIgnoreCase(EVENT_CREATED)) {
return CldsEvent.ACTION_CREATE;
- } else if (event.equals(EVENT_DISTRIBUTION)) {
+ } else if (event.equalsIgnoreCase(EVENT_DISTRIBUTION)) {
return CldsEvent.ACTION_DISTRIBUTE;
- } else if (event.equals(EVENT_DEPLOYMENT) &&
- (instances == null || instances.size() == 0)) {
- return CldsEvent.ACTION_UNDEPLOY;
- } else if (event.equals(EVENT_DEPLOYMENT)) {
+ } else if (event.equalsIgnoreCase(EVENT_DEPLOYMENT) && (instances == null || instances.size() == 0)) {
+ return CldsEvent.ACTION_DEPLOY;
+ } else if (event.equalsIgnoreCase(EVENT_DEPLOYMENT)) {
return CldsEvent.ACTION_DEPLOY;
- // EVENT_UNDEPLOYMENT is defunct - DCAE Proxy will not undeploy individual instances. It will send an empty list of
- // deployed instances to indicate all have been removed. Or it will send an updated list to indicate those that
- // are still deployed with any not on the list considered undeployed.
- //} else if ( event.equals(EVENT_UNDEPLOYMENT) ) {
- // return CldsEvent.ACTION_UNDEPLOY;
+ // EVENT_UNDEPLOYMENT is defunct - DCAE Proxy will not undeploy
+ // individual instances. It will send an empty list of
+ // deployed instances to indicate all have been removed. Or it will
+ // send an updated list to indicate those that
+ // are still deployed with any not on the list considered
+ // undeployed.
+ } else if (event.equals(EVENT_UNDEPLOYMENT)) {
+ return CldsEvent.ACTION_UNDEPLOY;
}
+
throw new BadRequestException("event value not valid: " + event);
}
if (artifactName != null && artifactName.endsWith(ARTIFACT_NAME_SUFFIX)) {
return artifactName.substring(0, artifactName.length() - ARTIFACT_NAME_SUFFIX.length());
} else {
- throw new BadRequestException("artifactName value not valid (expecting it to end with " + ARTIFACT_NAME_SUFFIX + "): " + artifactName);
+ throw new BadRequestException("artifactName value not valid (expecting it to end with "
+ + ARTIFACT_NAME_SUFFIX + "): " + artifactName);
}
}
}
/**
- * @param event the event to set
+ * @param event
+ * the event to set
*/
public void setEvent(String event) {
this.event = event;
}
/**
- * @param serviceUUID the serviceUUID to set
+ * @param serviceUUID
+ * the serviceUUID to set
*/
public void setServiceUUID(String serviceUUID) {
this.serviceUUID = serviceUUID;
}
/**
- * @param resourceUUID the resourceUUID to set
+ * @param resourceUUID
+ * the resourceUUID to set
*/
public void setResourceUUID(String resourceUUID) {
this.resourceUUID = resourceUUID;
}
/**
- * @param artifactName the artifactName to set
+ * @param artifactName
+ * the artifactName to set
*/
public void setArtifactName(String artifactName) {
this.artifactName = artifactName;
}
/**
- * @param value the value to set
+ * @param value
+ * the value to set
*/
public void setValue(String value) {
this.value = value;
Code Review / clamp.git / commitdiff