updated http notifier and sdf_rules
diff --git a/apps/fpcagent/BUCK b/apps/fpcagent/BUCK
index effa245..7be0276 100644
--- a/apps/fpcagent/BUCK
+++ b/apps/fpcagent/BUCK
@@ -5,6 +5,7 @@
'//lib:onos-yang-model',
'//lib:httpclient-osgi',
'//lib:httpcore-osgi',
+ '//lib:netty',
'//core/store/serializers:onos-core-serializers',
'//apps/restconf/utils:onos-apps-restconf-utils',
'//apps/config:onos-apps-config',
diff --git a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/HTTPNotifier.java b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/HTTPNotifier.java
index 8ef4c1e..926734a 100644
--- a/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/HTTPNotifier.java
+++ b/apps/fpcagent/src/main/java/org/onosproject/fpcagent/workers/HTTPNotifier.java
@@ -26,6 +26,7 @@
import org.apache.http.impl.client.BasicResponseHandler;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
+import org.apache.http.HttpVersion;
import org.json.JSONObject;
import org.onosproject.fpcagent.protocols.DpnNgicCommunicator;
import org.onosproject.restconf.utils.RestconfUtils;
@@ -92,6 +93,7 @@
httpPost.addHeader("User-Agent", "ONOS Notification Agent");
httpPost.addHeader("Charset", "utf-8");
httpPost.addHeader("Content-type", "application/json");
+ httpPost.setProtocolVersion(HttpVersion.HTTP_1_1);
ResourceData dataNode = modelConverter.createDataNode(
DefaultModelObjectData.builder()
diff --git a/scripts/test_rules/sdf_rules.py b/scripts/test_rules/sdf_rules.py
index a76ac2e..2fa4185 100755
--- a/scripts/test_rules/sdf_rules.py
+++ b/scripts/test_rules/sdf_rules.py
@@ -51,7 +51,6 @@
LOCAL_HIGH_LIMIT_PORT = 65535
REMOTE_LOW_LIMIT_PORT = 0
REMOTE_HIGH_LIMIT_PORT = 65535
- PRECEDENCE = 0
PROTOCOL = hex(0)
PROTOCOL_MASK = hex(0)
@@ -67,18 +66,10 @@
RULE_TYPE = int(parser.get(val, \
'RULE_TYPE'))
- if parser.has_option(val, 'RATING_GROUP'):
- RATING_GROUP = int(parser.get(val, \
- 'RATING_GROUP'))
-
if parser.has_option(val, 'DIRECTION'):
DIRECTION = str(parser.get(val, \
'DIRECTION'))
- if parser.has_option(val, 'PRECEDENCE'):
- PRECEDENCE = int(parser.get(val, \
- 'PRECEDENCE'))
-
if parser.has_option(val, 'LOCAL_IP'):
LOCAL_IP = str(parser.get(val, \
'LOCAL_IP'))
@@ -158,13 +149,14 @@
# TBD: Need to handle exception
# Pack the structure and send over the zmq socket to DP
- pub_socket.send("%s" % (struct.pack('!BBLLBI'+\
+ pub_socket.send("%s" % (struct.pack('!BBBI'+\
str(len(RULE_STRING))+'s',topicId, MSG_TYPE,\
- PCC_RULE_ID, PRECEDENCE, RULE_TYPE, \
+ RULE_TYPE, \
len(RULE_STRING), RULE_STRING)))
- time.sleep(1)
- print "\nSDF Rule Values for %s :: \nPCC_RULE_ID :%s \
- \nPRECEDENCE :%s \nRULE_TYPE :%s \nRULE_STRING :%s"\
- % (val, PCC_RULE_ID, PRECEDENCE, RULE_TYPE, RULE_STRING)
+
+ print "\nSDF Rule Values for %s :: \nRULE_ID :%s \
+ \nRULE_TYPE :%s \nRULE_STRING :%s"\
+ % (val, PCC_RULE_ID, RULE_TYPE, RULE_STRING)
print '\n ---># SDF Rule Successfully sent.. #<---\n'
parser.clear()
+