Commit 3 for Create Optimized Sched API

Multiple commits required due to commit size limitation.

Change-Id: I458d29619f98825b1a1ed645110d8e6ecad12175
Issue-ID: OPTFRA-458
Signed-off-by: Jerry Flood <jflood@att.com>

6 files changed, 353 insertions, 357 deletions

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
index 832acb7..c5ff7f0 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/CmHelpers.java
@@ -1,27 +1,27 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -33,12 +33,13 @@ package org.onap.optf.cmso.common;
 

 import java.util.List;

 import org.onap.optf.cmso.model.DomainData;

+import org.onap.optf.cmso.model.ElementData;

 import org.onap.optf.cmso.model.Schedule;

 import org.onap.optf.cmso.service.rs.models.CmDomainDataEnum;

 

 /**

  * Collection of commann static helper methods for CHangeManagement

- * 

+ *

  * @author jf9860

  *

  */

@@ -56,4 +57,16 @@ public class CmHelpers {
         return null;

     }

 

+  public static String getEventData(Schedule schedule, CmDomainDataEnum key) {

+      return getDomainData(schedule.getDomainData(), key);

+  }

+

+  public static String getElementData(List<ElementData> eventData, CmDomainDataEnum key) {

+      for (ElementData map : eventData) {

+          if (map.getName().equals(key.toString()))

+              return map.getValue();

+      }

+      return null;

+  }

+

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
index efb4dd0..3fd6cc8 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/common/LogMessages.java
@@ -1,237 +1,315 @@
 /*

- * Copyright © 2017-2019 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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

+ * Copyright © 2017-2019 AT&T Intellectual Property. Modifications Copyright © 2018 IBM.

+ *

+ * 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.

+ *

+ *

+ * Unless otherwise specified, all documentation contained herein is licensed under the Creative

+ * Commons License, Attribution 4.0 Intl. (the "License"); you may not use this documentation except

+ * in compliance with the License. You may obtain a copy of the License at

+ *

+ * https://creativecommons.org/licenses/by/4.0/

+ *

+ * Unless required by applicable law or agreed to in writing, documentation 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

+ */

 

 package org.onap.optf.cmso.common;

 

+import com.att.eelf.configuration.EELFManager;

+import com.att.eelf.i18n.EELFResourceManager;

 import java.io.IOException;

 import java.nio.file.Files;

 import java.nio.file.Paths;

-

 import javax.ws.rs.core.Response.Status;

-

 import org.apache.log4j.Level;

 import org.onap.observations.ObservationInterface;

 

-import com.att.eelf.configuration.EELFManager;

-import com.att.eelf.i18n.EELFResourceManager;

-

+/**

+ * The Enum LogMessages.

+ */

 public enum LogMessages implements ObservationInterface {

 

-	SEARCH_SCHEDULE_REQUEST_DETAILS("Search Schedule Request Details {0} from {1}: {2}", Status.OK, Level.INFO),

-	SEARCH_SCHEDULE_REQUEST("Search Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	CREATE_SCHEDULE_REQUEST("Create Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	DELETE_SCHEDULE_REQUEST("Delete Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	GET_SCHEDULE_REQUEST_INFO("Get Schedule Request Info {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	PROCESS_OPTIMIZER_CALLBACK("Change management optimizer callback {0} from {1}: {2} ", Status.OK, Level.INFO),

-	APPROVE_SCHEDULE_REQUEST("Approve Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

-	SCHEDULE_ALREADY_EXISTS("Schedule already exists domain={0} schedule id={1}", Status.OK, Level.INFO),

-	SCHEDULE_NOT_FOUND("Schedule not found domain={0} schedule id={1}", Status.BAD_REQUEST, Level.INFO),

-	INVALID_ATTRIBUTE("Invalid attribute {0}={1}", Status.BAD_REQUEST, Level.INFO),

-	MISSING_REQUIRED_ATTRIBUTE("Missing required attribute '{0}'", Status.BAD_REQUEST, Level.INFO),

-	INVALID_REQUEST("The input data structure is incorrect", Status.BAD_REQUEST, Level.INFO),

-	REQUEST_TIMED_OUT("Request timed out.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNEXPECTED_EXCEPTION("Unexpected exception encountered during processing. Please contact support : {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNDEFINED_DOMAIN_DATA_ATTRIBUTE("Domain data attribute not defined domain={0} name={1} value={2}", Status.BAD_REQUEST, Level.INFO),

-	UNDEFINED_FILTER_ATTRIBUTE("Undefined filter attribute {0}", Status.BAD_REQUEST, Level.INFO),

-	INVALID_DATE_FILTER("Invalid date filter provided {0}=(1}", Status.BAD_REQUEST, Level.INFO),

-	OPTIMIZER_QUARTZ_JOB("Quartz scheduling of OptimizerQuartzJob: {0}", Status.OK, Level.INFO),

-	OPTIMIZER_EXCEPTION("Exception making client call to optimizer {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	OPTIMIZER_CALLBACK_STATE_ERROR("Optimizer callback on schedule in invalid state. Should be {0} but was {1}.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	CHANGE_MANAGEMENT_GROUP_NOT_FOUND("ChangeManagementGroup not found on optimizer callback scheduleId={0} groupId={1}", Status.NOT_FOUND, Level.INFO),

-	INCOMING_MESSAGE("Incoming message method={0} path={1}", Status.OK, Level.INFO, true, false),

-	INCOMING_MESSAGE_RESPONSE("Message response method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

-	OUTGOING_MESSAGE("Outgoing message method={0} path={1}", Status.OK, Level.INFO, true, false),

-	OUTGOING_MESSAGE_RETURNED("Outgoing message returned method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

-

-    // TODO: Review the status and level of the remaining enums	

-	UNABLE_TO_ALLOCATE_VNF_TIMESLOTS("Unable to allocate VNF timeslots with Optimizer results startTime={0}, latestStartTime={1}, totalDuration={2}, concurrency={3} nvfs={4}", Status.OK, Level.INFO),

-	UNABLE_TO_LOCATE_SCHEDULE_DETAIL("Unable to locate ChangeManagementSchedule for VNF. scheduleId={0}, groupId={1}, vnfName={2}", Status.OK, Level.INFO),

-	CM_JOB("Quartz scheduling of CmJob: {0}", Status.OK, Level.INFO),

-	CM_QUARTZ_JOB("Quartz scheduling of CmQuartzJob: {0}", Status.OK, Level.INFO),

-	NOT_PENDING_APPROVAL("Approval request received for schedule that is not in Pending Approval state: domain={0} scheduleId={1} state={3}", Status.OK, Level.INFO),

-	SCHEDULE_PAST_DUE("Attempt to dispatch an event that is Past due scheduleId={0}, vnf={1}, now={2}, startTime={3}", Status.OK, Level.INFO),

-	MSO_POLLING_MISSING_SCHEDULE("Attempt to poll MSO for request id {1} for missing ChangeManagementSchedule id={0}", Status.OK, Level.INFO),

-	MSO_STATUS_JOB("Polling MSO {0} for requestId={1} for id={2}", Status.OK, Level.INFO),

-	UNEXPECTED_RESPONSE("Unexpected response from {0} HTTP Status={1} : {2}", Status.OK, Level.INFO),

-	SCHEDULE_STATUS_JOB("Quartz scheduling of ScheduleStatusJob: {0}", Status.OK, Level.INFO),

-	CM_TICKET_NOT_APPROVED("Attempt to dispatch a change management event that has no TM Ticket approved. scheduleId={0} VNF Name={1} TM ChangeId={2} Status={3} Approval Status={4}", Status.OK, Level.INFO),

-	MULTIPLE_GROUPS_NOT_SUPPORTED("Multiple groups not supported on immediate requests", Status.OK, Level.INFO),

-	TM_CREATE_CHANGE_RECORD("TM Create Change Record:{0} : Schedule ID: {1}", Status.OK, Level.INFO),

-	TM_LIST("TM list:{0} : URL : {1}", Status.OK, Level.INFO),

-	TM_API("TM API Call: URL : {0}", Status.OK, Level.INFO),

-	UNABLE_TO_CREATE_CHANGE_TICKET("Unable to create change ticket in TM: Schedule ID: {0} : Reason : {1}", Status.OK, Level.INFO),

-	TM_UPDATE_CHECKLIST("TM Fetch Checklist:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK, Level.INFO),

-	OPTIMIZER_REQUEST("Optimi Request:{0} : Schedule ID: {1} : URL : {2}", Status.OK, Level.INFO),

-	TM_CLOSE_CHANGE_RECORD("TM Close Change Record:{0} : Schedule ID: {1} : Change Id : {2}", Status.OK, Level.INFO),

-	UNABLE_TO_CLOSE_CHANGE_TICKET("Unable to close change ticket in TM:  Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK, Level.INFO),

-	CANNOT_CANCEL_IN_PROGRESS("Cannot delete/cancel a schedule with events in progress.", Status.OK, Level.INFO),

-	UNABLE_TO_PARSE_SCHEDULING_INFO("Cannot parse scheduling info.", Status.OK, Level.INFO),

-	UNABLE_TO_LOCATE_CHANGE_RECORD("Unable to locate TM change record {2} to check status before displacth of {1} for schedulId={0}", Status.OK, Level.INFO),

-	INVALID_CHANGE_WINDOW("Change window end time {1} must be after start time {0}", Status.OK, Level.INFO),

-	NODE_LIST_CONTAINS_EMTPY_NODE("vnfDetails node list contains at least one empty node.", Status.OK, Level.INFO),

-	SO_API("SO Poll Request {0}", Status.OK, Level.INFO),

-	EXPECTED_EXCEPTION("Expected exception encountered during processing. {0}", Status.OK, Level.INFO),

-	TM_UPDATE_CHANGE_RECORD("TM Update Change Record:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK, Level.INFO),

-	UNABLE_TO_UPDATE_CHANGE_TICKET("Unable to update change ticket in TM: Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK, Level.INFO),

-	UNAUTHORIZED("Authorization failed.", Status.FORBIDDEN, Level.INFO),

-	UNAUTHENTICATED("Authentication failed.", Status.UNAUTHORIZED, Level.INFO), 

-	UNRECOGNIZED_MSO_STATUS("Unrecognized status returned by MSO {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	UNABLE_TO_PARSE_MSO_RESPONSE("Unable to parse status message from MSO {0} : {1}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

-	;

-	private final String defaultId;

-	private final String defaultMessage;

-	private final String defaultResolution;

-	private final String defaultAction;

-

-	private final Status status;

-	private final Level level;

-	private final Boolean audit;

-	private final Boolean metric;

-

-	

-	private LogMessages(String message, Status code, Level l)

-	{

-		defaultMessage = message;

-		level=l;

-		status = code;

-		this.defaultId = this.name();

-		this.defaultResolution = "No resolution needed";

-		this.defaultAction = "No action is required";

-		this.audit = false;

-		this.metric = false;

-	}

-

-	private LogMessages(String message, Status code, Level l, Boolean audit, Boolean metric)

-	{

-		defaultMessage = message;

-		level=l;

-		status = code;

-		this.audit = audit;

-		this.metric = metric;

-		this.defaultId = this.name();

-		this.defaultResolution = "No resolution needed";

-		this.defaultAction = "No action is required";

-	}

-	

-	private LogMessages(String message, Status code, Level l, String id, String resolution, String action)

-	{

-		level=l;

-		status = code;

-		defaultMessage = message;

-		this.defaultId = id;

-		this.defaultResolution = resolution;

-		this.defaultAction = action;

-		this.audit = false;

-		this.metric = false;

-	}

-	

-	static {

-		EELFResourceManager.loadMessageBundle("logmessages");

-	}

-	

-	public String genProperties()

-	{

-		// Use this to regenerate properties file. The desire to change messages without updating code is

-		// well understood, but the developer should be able to code the defaults without having to update 2 different files and 

-		// get it wrong. 

-		StringBuilder sb = new StringBuilder();

-		sb.append("# Generated from ").append(this.getClass().getName()).append("\n");

-		for (LogMessages lm : values())

-		{

-			sb.append(lm.name());

-			sb.append(" ").append(lm.defaultId);

-			sb.append("|").append(lm.defaultMessage);

-			sb.append("|").append(lm.defaultResolution);

-			sb.append("|").append(lm.defaultAction);

-			sb.append("\n");

-		}

-		return sb.toString();

-	}

-

-	

-	// interface methods

-	@Override

-	public Level getLevel() {return level;}

-	@Override

-	public String getMessage() {return defaultMessage;}

-	@Override

-	public Status getStatus() {return status;}

-	@Override

-	public Enum<?> getValue() {return this;}

-	@Override

-	public String getDomain() {return this.getClass().getSimpleName();}

-	@Override

-	public Boolean getAudit() { return audit; }

-	@Override

-	public Boolean getMetric() { return metric; }

-	

-	public static void main(String argv[])

-	{

-		System.out.println(LogMessages.UNEXPECTED_EXCEPTION.genProperties());

-		try 

-		{

-			Files.write(Paths.get("src/main/resources/logmessages.properties"), LogMessages.UNEXPECTED_EXCEPTION.genProperties().getBytes());

-		} 

-		catch (IOException e) 

-		{

-			EELFManager.getInstance().getDebugLogger().debug("Failed to update properties file.", e);

-

-		}

-		StringBuilder sb = new StringBuilder();

-		sb.append("<html><body><h1>Cell Site Selection Scheduler mS Observations</h1>\n<table border=\"1\">\n<tr>");

-		sb.append("<td>Code</td> ");

-		sb.append("<td>Log Level</td> ");

-		sb.append("<td>Message</td> ");

-		sb.append("</tr>\n");

-		for (LogMessages m : LogMessages.values())

-		{

-			if (m.level == Level.ERROR || m.level == Level.WARN || m.level == Level.FATAL)

-			{

-				sb.append("<tr>");

-				sb.append("<td>").append(m.name()).append("</td> ");

-				sb.append("<td>").append(m.level).append("</td> ");

-				sb.append("<td>").append(m.defaultMessage).append("</td> ");

-				sb.append("</tr>\n");

-			}

-		}

-		try 

-		{

-			Files.write(Paths.get("logmessages.html"), sb.toString().getBytes());

-		} 

-		catch (IOException e) 

-		{

-			EELFManager.getInstance().getDebugLogger().debug("Failed to update properties html file.", e);

-

-		}

-				

-	}

+    SEARCH_SCHEDULE_REQUEST_DETAILS("Search Schedule Request Details {0} from {1}: {2}", Status.OK, Level.INFO),

+    SEARCH_SCHEDULE_REQUEST("Search Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    CREATE_SCHEDULE_REQUEST("Create Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    DELETE_SCHEDULE_REQUEST("Delete Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    GET_SCHEDULE_REQUEST_INFO("Get Schedule Request Info {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    PROCESS_OPTIMIZER_CALLBACK("Change management optimizer callback {0} from {1}: {2} ", Status.OK, Level.INFO),

+    APPROVE_SCHEDULE_REQUEST("Approve Schedule Request {0} from {1}: {2} : {3}", Status.OK, Level.INFO),

+    SCHEDULE_ALREADY_EXISTS("Schedule already exists domain={0} schedule id={1}", Status.OK, Level.INFO),

+    SCHEDULE_NOT_FOUND("Schedule not found domain={0} schedule id={1}", Status.BAD_REQUEST, Level.INFO),

+    INVALID_ATTRIBUTE("Invalid attribute {0}={1}", Status.BAD_REQUEST, Level.INFO),

+    MISSING_REQUIRED_ATTRIBUTE("Missing required attribute '{0}'", Status.BAD_REQUEST, Level.INFO),

+    INVALID_REQUEST("The input data structure is incorrect", Status.BAD_REQUEST, Level.INFO),

+    REQUEST_TIMED_OUT("Request timed out.", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNEXPECTED_EXCEPTION("Unexpected exception encountered during processing. Please contact support : {0}",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNDEFINED_DOMAIN_DATA_ATTRIBUTE("Domain data attribute not defined domain={0} name={1} value={2}",

+                    Status.BAD_REQUEST, Level.INFO),

+    UNDEFINED_FILTER_ATTRIBUTE("Undefined filter attribute {0}", Status.BAD_REQUEST, Level.INFO),

+    INVALID_DATE_FILTER("Invalid date filter provided {0}=(1}", Status.BAD_REQUEST, Level.INFO),

+    OPTIMIZER_QUARTZ_JOB("Quartz scheduling of OptimizerQuartzJob: {0}", Status.OK, Level.INFO),

+    OPTIMIZER_EXCEPTION("Exception making client call to optimizer {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    OPTIMIZER_CALLBACK_STATE_ERROR("Optimizer callback on schedule in invalid state. Should be {0} but was {1}.",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    CHANGE_MANAGEMENT_GROUP_NOT_FOUND(

+                    "ChangeManagementGroup not found on optimizer callback scheduleId={0} groupId={1}",

+                    Status.NOT_FOUND, Level.INFO),

+    INCOMING_MESSAGE("Incoming message method={0} path={1}", Status.OK, Level.INFO, true, false),

+    INCOMING_MESSAGE_RESPONSE("Message response method={0} path={1} status={2}", Status.OK, Level.INFO, true, false),

+    OUTGOING_MESSAGE("Outgoing message method={0} path={1}", Status.OK, Level.INFO, true, false),

+    OUTGOING_MESSAGE_RETURNED("Outgoing message returned method={0} path={1} status={2}", Status.OK, Level.INFO, true,

+                    false),

+

+    // TODO: Review the status and level of the remaining enums

+    UNABLE_TO_ALLOCATE_VNF_TIMESLOTS(

+                    "Unable to allocate VNF timeslots with Optimizer results startTime={0},"

+                    + " latestStartTime={1}, totalDuration={2}, concurrency={3} nvfs={4}",

+                    Status.OK, Level.INFO),

+    UNABLE_TO_LOCATE_SCHEDULE_DETAIL(

+                    "Unable to locate ChangeManagementSchedule for VNF. scheduleId={0}, groupId={1}, vnfName={2}",

+                    Status.OK, Level.INFO),

+    CM_JOB("Quartz scheduling of CmJob: {0}", Status.OK, Level.INFO),

+    CM_QUARTZ_JOB("Quartz scheduling of CmQuartzJob: {0}", Status.OK, Level.INFO),

+    NOT_PENDING_APPROVAL(

+                    "Approval request received for schedule that is not in Pending Approval state:"

+                    + " domain={0} scheduleId={1} state={3}",

+                    Status.OK, Level.INFO),

+    SCHEDULE_PAST_DUE("Attempt to dispatch an event that is Past due scheduleId={0}, vnf={1}, now={2}, startTime={3}",

+                    Status.OK, Level.INFO),

+    MSO_POLLING_MISSING_SCHEDULE("Attempt to poll MSO for request id {1} for missing ChangeManagementSchedule id={0}",

+                    Status.OK, Level.INFO),

+    MSO_STATUS_JOB("Polling MSO {0} for requestId={1} for id={2}", Status.OK, Level.INFO),

+    UNEXPECTED_RESPONSE("Unexpected response from {0} HTTP Status={1} : {2}", Status.OK, Level.INFO),

+    SCHEDULE_STATUS_JOB("Quartz scheduling of ScheduleStatusJob: {0}", Status.OK, Level.INFO),

+    CM_TICKET_NOT_APPROVED(

+                    "Attempt to dispatch a change management event that has no TM Ticket approved."

+                    + "scheduleId={0} VNF Name={1} TM ChangeId={2} Status={3} Approval Status={4}",

+                    Status.OK, Level.INFO),

+    MULTIPLE_GROUPS_NOT_SUPPORTED("Multiple groups not supported on immediate requests", Status.OK, Level.INFO),

+    TM_CREATE_CHANGE_RECORD("TM Create Change Record:{0} : Schedule ID: {1}", Status.OK, Level.INFO),

+    TM_LIST("TM list:{0} : URL : {1}", Status.OK, Level.INFO),

+    TM_API("TM API Call: URL : {0}", Status.OK, Level.INFO),

+    UNABLE_TO_CREATE_CHANGE_TICKET("Unable to create change ticket in TM: Schedule ID: {0} : Reason : {1}", Status.OK,

+                    Level.INFO),

+    TM_UPDATE_CHECKLIST("TM Fetch Checklist:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK,

+                    Level.INFO),

+    OPTIMIZER_REQUEST("Optimi Request:{0} : Schedule ID: {1} : URL : {2}", Status.OK, Level.INFO),

+    TM_CLOSE_CHANGE_RECORD("TM Close Change Record:{0} : Schedule ID: {1} : Change Id : {2}", Status.OK, Level.INFO),

+    UNABLE_TO_CLOSE_CHANGE_TICKET(

+                    "Unable to close change ticket in TM:  Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK,

+                    Level.INFO),

+    CANNOT_CANCEL_IN_PROGRESS("Cannot delete/cancel a schedule with events in progress.", Status.OK, Level.INFO),

+    UNABLE_TO_PARSE_SCHEDULING_INFO("Cannot parse scheduling info.", Status.OK, Level.INFO),

+    UNABLE_TO_LOCATE_CHANGE_RECORD(

+                    "Unable to locate TM change record {2} to check status before displacth of {1} for schedulId={0}",

+                    Status.OK, Level.INFO),

+    INVALID_CHANGE_WINDOW("Change window end time {1} must be after start time {0}", Status.OK, Level.INFO),

+    NODE_LIST_CONTAINS_EMTPY_NODE("vnfDetails node list contains at least one empty node.", Status.OK, Level.INFO),

+    SO_API("SO Poll Request {0}", Status.OK, Level.INFO),

+    EXPECTED_EXCEPTION("Expected exception encountered during processing. {0}", Status.OK, Level.INFO),

+    TM_UPDATE_CHANGE_RECORD("TM Update Change Record:{0} : Schedule ID: {1} : Change Id : {2} : URL : {3}", Status.OK,

+                    Level.INFO),

+    UNABLE_TO_UPDATE_CHANGE_TICKET(

+                    "Unable to update change ticket in TM: Schedule ID: {0} : changeid: {1} :  Reason: {2}", Status.OK,

+                    Level.INFO),

+    UNAUTHORIZED("Authorization failed.", Status.FORBIDDEN, Level.INFO),

+    UNAUTHENTICATED("Authentication failed.", Status.UNAUTHORIZED, Level.INFO),

+    UNRECOGNIZED_MSO_STATUS("Unrecognized status returned by MSO {0}", Status.INTERNAL_SERVER_ERROR, Level.ERROR),

+    UNABLE_TO_PARSE_MSO_RESPONSE("Unable to parse status message from MSO {0} : {1}", Status.INTERNAL_SERVER_ERROR,

+                    Level.ERROR),

+    MISSING_VALID_GROUP_FOR_ELEMENT("Element {0} returned by optimizer has invalid group id",

+                    Status.INTERNAL_SERVER_ERROR, Level.ERROR),;

+    private final String defaultId;

+    private final String defaultMessage;

+    private final String defaultResolution;

+    private final String defaultAction;

+

+    private final Status status;

+    private final Level level;

+    private final Boolean audit;

+    private final Boolean metric;

+

+

+    private LogMessages(String message, Status code, Level lev) {

+        defaultMessage         = message;

+        level                  = lev;

+        status                 = code;

+        this.defaultId         = this.name();

+        this.defaultResolution = "No resolution needed";

+        this.defaultAction     = "No action is required";

+        this.audit             = false;

+        this.metric            = false;

+    }

+

+    private LogMessages(String message, Status code, Level lev, Boolean audit, Boolean metric) {

+        defaultMessage         = message;

+        level                  = lev;

+        status                 = code;

+        this.audit             = audit;

+        this.metric            = metric;

+        this.defaultId         = this.name();

+        this.defaultResolution = "No resolution needed";

+        this.defaultAction     = "No action is required";

+    }

+

+    private LogMessages(String message, Status code, Level lev, String id, String resolution, String action) {

+        level                  = lev;

+        status                 = code;

+        defaultMessage         = message;

+        this.defaultId         = id;

+        this.defaultResolution = resolution;

+        this.defaultAction     = action;

+        this.audit             = false;

+        this.metric            = false;

+    }

+

+    static {

+        EELFResourceManager.loadMessageBundle("logmessages");

+    }

+

+    /**

+     * Gen properties.

+     *

+     * @return the string

+     */

+    public String genProperties() {

+        // Use this to regenerate properties file. The desire to change messages without updating code is

+        // well understood, but the developer should be able to code the defaults without having to update 2

+        // different files and

+        // get it wrong.

+        StringBuilder sb = new StringBuilder();

+        sb.append("# Generated from ").append(this.getClass().getName()).append("\n");

+        for (LogMessages lm : values()) {

+            sb.append(lm.name());

+            sb.append(" ").append(lm.defaultId);

+            sb.append("|").append(lm.defaultMessage);

+            sb.append("|").append(lm.defaultResolution);

+            sb.append("|").append(lm.defaultAction);

+            sb.append("\n");

+        }

+        return sb.toString();

+    }

+

+

+    /**

+     * Gets the level.

+     *

+     * @return the level

+     */

+    // interface methods

+    @Override

+    public Level getLevel() {

+        return level;

+    }

+

+    /**

+     * Gets the message.

+     *

+     * @return the message

+     */

+    @Override

+    public String getMessage() {

+        return defaultMessage;

+    }

+

+    /**

+     * Gets the status.

+     *

+     * @return the status

+     */

+    @Override

+    public Status getStatus() {

+        return status;

+    }

+

+    /**

+     * Gets the value.

+     *

+     * @return the value

+     */

+    @Override

+    public Enum<?> getValue() {

+        return this;

+    }

+

+    /**

+     * Gets the domain.

+     *

+     * @return the domain

+     */

+    @Override

+    public String getDomain() {

+        return this.getClass().getSimpleName();

+    }

+

+    /**

+     * Gets the audit.

+     *

+     * @return the audit

+     */

+    @Override

+    public Boolean getAudit() {

+        return audit;

+    }

+

+    /**

+     * Gets the metric.

+     *

+     * @return the metric

+     */

+    @Override

+    public Boolean getMetric() {

+        return metric;

+    }

+

+    /**

+     * The main method.

+     *

+     * @param argv the arguments

+     */

+    public static void main(String[] argv) {

+        System.out.println(LogMessages.UNEXPECTED_EXCEPTION.genProperties());

+        try {

+            Files.write(Paths.get("src/main/resources/logmessages.properties"),

+                            LogMessages.UNEXPECTED_EXCEPTION.genProperties().getBytes());

+        } catch (IOException e) {

+            EELFManager.getInstance().getDebugLogger().debug("Failed to update properties file.", e);

+

+        }

+        StringBuilder sb = new StringBuilder();

+        sb.append("<html><body><h1>Cell Site Selection Scheduler mS Observations</h1>\n<table border=\"1\">\n<tr>");

+        sb.append("<td>Code</td> ");

+        sb.append("<td>Log Level</td> ");

+        sb.append("<td>Message</td> ");

+        sb.append("</tr>\n");

+        for (LogMessages m : LogMessages.values()) {

+            if (m.level == Level.ERROR || m.level == Level.WARN || m.level == Level.FATAL) {

+                sb.append("<tr>");

+                sb.append("<td>").append(m.name()).append("</td> ");

+                sb.append("<td>").append(m.level).append("</td> ");

+                sb.append("<td>").append(m.defaultMessage).append("</td> ");

+                sb.append("</tr>\n");

+            }

+        }

+        try {

+            Files.write(Paths.get("logmessages.html"), sb.toString().getBytes());

+        } catch (IOException e) {

+            EELFManager.getInstance().getDebugLogger().debug("Failed to update properties html file.", e);

+

+        }

+

+    }

 

 }

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
index 19927ad..d726107 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CMSOClient.java
@@ -1,27 +1,27 @@
 /*

- * Copyright © 2017-2018 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

+ * Copyright © 2017-2018 AT&T Intellectual Property.

+ * Modifications Copyright © 2018 IBM.

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -31,6 +31,10 @@
 

 package org.onap.optf.cmso.dispatcher;

 

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

+import com.fasterxml.jackson.databind.JsonNode;

+import com.fasterxml.jackson.databind.ObjectMapper;

 import javax.ws.rs.ProcessingException;

 import javax.ws.rs.client.Client;

 import javax.ws.rs.client.ClientBuilder;

@@ -42,16 +46,14 @@ import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;

 import org.onap.optf.cmso.common.BasicAuthenticatorFilter;

 import org.onap.optf.cmso.common.CMSStatusEnum;

-import org.onap.optf.cmso.common.CmHelpers;

 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.common.PropertiesManagement;

-import org.onap.optf.cmso.filters.CMSOClientFilters;

+import org.onap.optf.cmso.filters.CmsoClientFilters;

 import org.onap.optf.cmso.model.ChangeManagementSchedule;

 import org.onap.optf.cmso.model.Schedule;

 import org.onap.optf.cmso.model.dao.ChangeManagementGroupDAO;

 import org.onap.optf.cmso.model.dao.ChangeManagementScheduleDAO;

 import org.onap.optf.cmso.model.dao.ScheduleDAO;

-import org.onap.optf.cmso.service.rs.models.CmDomainDataEnum;

 import org.onap.optf.cmso.ticketmgt.TmClient;

 import org.onap.optf.cmso.wf.bean.WfChangeManagementResponse;

 import org.onap.optf.cmso.wf.bean.WfVidCmResponse;

@@ -60,10 +62,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;

 import org.springframework.stereotype.Component;

 import org.springframework.transaction.annotation.Transactional;

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-import com.fasterxml.jackson.databind.JsonNode;

-import com.fasterxml.jackson.databind.ObjectMapper;

 

 @Component

 public class CMSOClient {

@@ -81,6 +79,7 @@ public class CMSOClient {
     @Autowired

     ScheduleDAO scheduleDAO;

 

+

     @Autowired

     Environment env;

 

@@ -97,13 +96,13 @@ public class CMSOClient {
             if (!url.endsWith("/"))

                 url += "/";

             url = url + "schedule/" + cmSchedule.getVnfName();

-            String callbackData = CmHelpers.getDomainData(schedule, CmDomainDataEnum.CallbackData);

+            String callbackData = cmSchedule.getRequest();

             String user = env.getProperty("so.user", "");

             String pass = pm.getProperty("so.pass", "");

             Client client = ClientBuilder.newClient();

             if (!user.equals(""))

                 client.register(new BasicAuthenticatorFilter(user, pass));

-            client.register(new CMSOClientFilters());

+            client.register(new CmsoClientFilters());

             WebTarget target = client.target(url);

             ObjectMapper om = new ObjectMapper();

             JsonNode jsonEntity = om.readTree(callbackData);

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
index f29d6c6..8766eee 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/CmJob.java
@@ -46,7 +46,7 @@ import org.onap.optf.cmso.common.BasicAuthenticatorFilter;
 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.common.PropertiesManagement;

 import org.onap.optf.cmso.eventq.DispatchedEventList;

-import org.onap.optf.cmso.filters.CMSOClientFilters;

+import org.onap.optf.cmso.filters.CmsoClientFilters;

 import org.onap.optf.cmso.model.dao.ChangeManagementGroupDAO;

 import org.onap.optf.cmso.model.dao.ChangeManagementScheduleDAO;

 import org.onap.optf.cmso.model.dao.ScheduleDAO;

@@ -126,7 +126,7 @@ public class CmJob implements Job {
             String pass = pm.getProperty("mechid.pass", "");

             Client client = ClientBuilder.newClient();

             client.register(new BasicAuthenticatorFilter(user, pass));

-			client.register(new CMSOClientFilters());

+			client.register(new CmsoClientFilters());

             WebTarget target = client.target(url);

             Invocation.Builder invocationBuilder = target.request(MediaType.APPLICATION_JSON);

             Response response = null;

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
index feea350..92bb3f3 100644
--- a/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
+++ b/cmso-service/src/main/java/org/onap/optf/cmso/dispatcher/rs/DispatcherServiceImpl.java
@@ -1,27 +1,27 @@
 /*

  * Copyright © 2017-2019 AT&T Intellectual Property.

  * Modifications Copyright © 2018 IBM.

- * 

+ *

  * 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.

- * 

- * 

+ *

+ *

  * Unless otherwise specified, all documentation contained herein is licensed

  * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

  * you may not use this documentation except in compliance with the License.

  * You may obtain a copy of the License at

- * 

+ *

  *         https://creativecommons.org/licenses/by/4.0/

- * 

+ *

  * Unless required by applicable law or agreed to in writing, documentation

  * distributed under the License is distributed on an "AS IS" BASIS,

  * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

@@ -31,24 +31,21 @@
 

 package org.onap.optf.cmso.dispatcher.rs;

 

+import com.att.eelf.configuration.EELFLogger;

+import com.att.eelf.configuration.EELFManager;

 import java.util.UUID;

-

 import javax.servlet.http.HttpServletRequest;

 import javax.ws.rs.core.Response;

 import javax.ws.rs.core.UriInfo;

-

 import org.onap.optf.cmso.common.LogMessages;

 import org.onap.optf.cmso.dispatcher.DispatchJob;

-import org.onap.optf.cmso.optimizer.CMSOptimizerClient;

+import org.onap.optf.cmso.optimizer.CmsoOptimizerClient;

 import org.onap.optf.cmso.sostatus.MsoStatusClient;

 import org.onap.optf.cmso.ticketmgt.TmStatusClient;

 import org.springframework.beans.factory.annotation.Autowired;

 import org.springframework.stereotype.Controller;

 import org.springframework.transaction.annotation.Transactional;

 

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-

 @Controller

 public class DispatcherServiceImpl implements DispacherService {

     private static EELFLogger log = EELFManager.getInstance().getLogger(DispatcherServiceImpl.class);

@@ -60,7 +57,7 @@ public class DispatcherServiceImpl implements DispacherService {
     DispatchJob dispatchJob;

 

     @Autowired

-    CMSOptimizerClient optimizerClient;

+    CmsoOptimizerClient optimizerClient;

 

     @Autowired

     TmStatusClient tmStatusClient;

@@ -95,7 +92,7 @@ public class DispatcherServiceImpl implements DispacherService {
             debug.error(e.getMessage(), e);

         }

         Response response = Response.ok().build();

-        audit.info("dispatchSNIRO");

+        audit.info("dispatchOptimizer");

         return response;

     }

 

diff --git a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java b/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java
deleted file mode 100644
index 5e29607..0000000
--- a/cmso-service/src/main/java/org/onap/optf/cmso/filters/CMSOClientFilters.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*

- * Copyright © 2017-2019 AT&T Intellectual Property.

- * Modifications Copyright © 2018 IBM.

- * 

- * 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.

- * 

- * 

- * Unless otherwise specified, all documentation contained herein is licensed

- * under the Creative Commons License, Attribution 4.0 Intl. (the "License");

- * you may not use this documentation except in compliance with the License.

- * You may obtain a copy of the License at

- * 

- *         https://creativecommons.org/licenses/by/4.0/

- * 

- * Unless required by applicable law or agreed to in writing, documentation

- * 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.

-*/

-

-package org.onap.optf.cmso.filters;

-

-import static com.att.eelf.configuration.Configuration.MDC_KEY_REQUEST_ID;

-

-import java.io.IOException;

-

-import javax.ws.rs.client.ClientRequestContext;

-import javax.ws.rs.client.ClientRequestFilter;

-import javax.ws.rs.client.ClientResponseContext;

-import javax.ws.rs.client.ClientResponseFilter;

-import javax.ws.rs.core.MultivaluedMap;

-

-import org.onap.observations.Mdc;

-import org.onap.observations.Observation;

-import org.onap.optf.cmso.common.LogMessages;

-import org.onap.optf.cmso.filters.MessageHeaders.HeadersEnum;

-import org.onap.optf.cmso.service.rs.CMSOServiceImpl;

-import org.slf4j.MDC;

-import org.springframework.stereotype.Component;

-

-import com.att.eelf.configuration.EELFLogger;

-import com.att.eelf.configuration.EELFManager;

-

-// @SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")

-@Component

-public class CMSOClientFilters implements ClientRequestFilter, ClientResponseFilter {

-

-    private static EELFLogger log = EELFManager.getInstance().getLogger(CMSOServiceImpl.class);

-    private static String appId = "cmso";

-

-    @Override

-    public void filter(ClientRequestContext requestContext, ClientResponseContext responseContext) throws IOException {

-		// On the way back

-		Mdc.metricEnd(responseContext);

-		Mdc.setCaller(17);

-		Observation.report(LogMessages.OUTGOING_MESSAGE_RETURNED, 

-				requestContext.getMethod(),

-				requestContext.getUri().getPath().toString(),

-				responseContext.getStatusInfo().toString());

-    }

-

-    @Override

-    public void filter(ClientRequestContext requestContext) throws IOException {

-		// On the way out 

-		Mdc.metricStart(requestContext);

-		Mdc.setCaller(17);

-		Observation.report(LogMessages.OUTGOING_MESSAGE, 

-				requestContext.getMethod(),

-				requestContext.getUri().getPath().toString());

-        MultivaluedMap<String, Object> headers = requestContext.getHeaders();

-

-        String transactionId = (String) headers.getFirst(MessageHeaders.HeadersEnum.TransactionID.toString());

-        String mdcId = MDC.get(MDC_KEY_REQUEST_ID);

-        if (transactionId == null || transactionId.equals(""))

-            if (mdcId != null)

-                headers.add(HeadersEnum.TransactionID.toString(), mdcId);

-        headers.add(HeadersEnum.FromAppID.toString(), appId);

-    }

-

-}