added copyrights and prints
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/protocols/DpnNgicCommunicator.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/protocols/DpnNgicCommunicator.java
index 0332312..195bca3 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/protocols/DpnNgicCommunicator.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/protocols/DpnNgicCommunicator.java
@@ -210,7 +210,15 @@
.put(toUint32(client_id))
.put(toUint32(op_id.longValue()));
- log.debug("create_session: {}", bb.array());
+ log.info(
+ "create_session:\n" +
+ "\tTopic id {}\n\tType {}\n\tIMSI {}\n\tEBI {}\n\tUE IP {}\n\t" +
+ "S1u TeID {}\n\tS1u IP {}\n\tSession {}\n\tTopic {}\n\t" +
+ "Client {}\n\tOp {}", topic_id, s11MsgType.CREATE_SESSION, imsi,
+ default_ebi, ue_ipv4, s1u_sgw_teid, s1u_sgw_ipv4, session_id,
+ ZMQSBSubscriberManager.getInstance().getControllerTopic(),
+ client_id, op_id
+ );
ZMQSBPublisherManager.getInstance().send(bb);
}
@@ -249,7 +257,15 @@
.put(toUint32(client_id))
.put(toUint32(op_id.longValue()));
- log.debug("modify_bearer: {}", bb.array());
+ log.info(
+ "modify_bearer:\n" +
+ "\tTopic id {}\n\tType {}\n\tS1u SGW IP {}\n\tS1u enB TeID {}\n\t" +
+ "S1u enB IP {}\n\tSession {}\n\tTopic {}\n\t" +
+ "Client {}\n\tOp {}", topic_id, s11MsgType.UPDATE_MODIFY_BEARER,
+ s1u_sgw_ipv4, s1u_enodeb_teid, s1u_enodeb_ipv4, session_id,
+ ZMQSBSubscriberManager.getInstance().getControllerTopic(),
+ client_id, op_id
+ );
ZMQSBPublisherManager.getInstance().send(bb);
}
@@ -279,7 +295,13 @@
.put(toUint32(client_id))
.put(toUint32(op_id.longValue()));
- log.debug("delete_session: {}", bb.array());
+ log.info(
+ "delete_session:\n" +
+ "\tTopic id {}\n\tType {}\n\tSession {}\n\tTopic {}\n\t" +
+ "Client {}\n\tOp {}", topic_id, s11MsgType.DELETE_SESSION,
+ session_id, ZMQSBSubscriberManager.getInstance().getControllerTopic(),
+ client_id, op_id
+ );
ZMQSBPublisherManager.getInstance().send(bb);
}
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebApplication.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebApplication.java
index c745500..a224289 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebApplication.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebApplication.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.
+ */
+
package org.onosproject.fpcagent.rest;
import org.onlab.rest.AbstractWebApplication;
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebResource.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebResource.java
index 52f7be2..9ee87e2 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebResource.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/rest/FpcWebResource.java
@@ -1,5 +1,5 @@
/*
- * Copyright 2016-present Open Networking Foundation
+ * Copyright 2017-present Open Networking Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -135,7 +135,7 @@
*
* @param clientUri - URI of the FPC Client
*/
- public MyResponseConsumer(String clientUri) {
+ MyResponseConsumer(String clientUri) {
this.clientUri = clientUri;
}
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java
index 467575f..e67bad2 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/NBEventWorkerManager.java
@@ -1,10 +1,19 @@
/*
- * Copyright © 2016 - 2017 Copyright (c) Sprint, Inc. and others. All rights reserved.
+ * Copyright 2017-present Open Networking Foundation
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * 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.
*/
+
package org.onosproject.fpcagent.util.eventStream;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java
index 7e94ad4..7a2a559 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/ParseStream.java
@@ -1,10 +1,19 @@
/*
- * Copyright © 2016 - 2017 Copyright (c) Sprint, Inc. and others. All rights reserved.
+ * Copyright 2017-present Open Networking Foundation
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * 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.
*/
+
package org.onosproject.fpcagent.util.eventStream;
import org.apache.commons.lang.exception.ExceptionUtils;
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/SseManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/SseManager.java
index aa2dc53..ae161b5 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/SseManager.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/util/eventStream/SseManager.java
@@ -1,10 +1,19 @@
/*
- * Copyright © 2016 - 2017 Copyright (c) Sprint, Inc. and others. All rights reserved.
+ * Copyright 2017-present Open Networking Foundation
*
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 which accompanies this distribution,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
+ * 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.
*/
+
package org.onosproject.fpcagent.util.eventStream;
import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/ZMQSBSubscriberManager.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/ZMQSBSubscriberManager.java
index 9ab50aa..6dd5e42 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/ZMQSBSubscriberManager.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/ZMQSBSubscriberManager.java
@@ -214,7 +214,7 @@
byte[] contents = subscriber.recv();
byte topic = contents[0];
s11MsgType messageType = s11MsgType.getEnum(contents[1]);
- log.info("Received {}", messageType);
+ log.info("Received {}\nContents {}", messageType, contents);
switch (topic) {
case 1:
if (messageType.equals(s11MsgType.ASSIGN_CONFLICT) &&