commit e4b2c681011ac26bb59eee4dff57aa28926e8342
author Andrea Campanella <andrea@opennetworking.org> Fri Aug 23 15:42:55 2019 +0200
committer Andrea Campanella <andrea@opennetworking.org> Wed Aug 28 22:57:26 2019 +0000
tree 8e8b7e61f56403aabd9553e0169455cfbcd30d27
parent 1edc0bd3fdc82d26da619c8ba6cb4c90d57d87f0

Optical Intent compiler fix and ADVA OLS testing derived adjustments

Change-Id: I986431b751e3ba060cf81f357938b34f3a68f5aa

drivers/odtn-driver/src/test/java/org/onosproject/drivers/odtn/tapi/TapiFlowRuleProgrammableTest.java

diff --git a/drivers/odtn-driver/src/test/java/org/onosproject/drivers/odtn/tapi/TapiFlowRuleProgrammableTest.java b/drivers/odtn-driver/src/test/java/org/onosproject/drivers/odtn/tapi/TapiFlowRuleProgrammableTest.java
index a3128af..c0fdff4 100644
--- a/drivers/odtn-driver/src/test/java/org/onosproject/drivers/odtn/tapi/TapiFlowRuleProgrammableTest.java
+++ b/drivers/odtn-driver/src/test/java/org/onosproject/drivers/odtn/tapi/TapiFlowRuleProgrammableTest.java
@@ -113,16 +113,16 @@
 
     private static final String CONNECTIVITY_REQUEST = "{\"tapi-connectivity:connectivity-service\":" +
             "[{\"uuid\":\"" + CONNECTION_UUID + "\",\"service-layer\":\"PHOTONIC_MEDIA\",\"service-type\"" +
-            ":\"POINT_TO_POINT_CONNECTIVITY\",\"end-point\":[{\"local-id\":\"" + END_POINT_1_UUID + "\"," +
+            ":\"POINT_TO_POINT_CONNECTIVITY\",\"end-point\":[{\"local-id\":\"" + 1 + "\"," +
             "\"layer-protocol-name\":" + "\"PHOTONIC_MEDIA\",\"layer-protocol-qualifier\":" +
             "\"tapi-photonic-media:PHOTONIC_LAYER_QUALIFIER_NMC\"," + "\"service-interface-point\":" +
             "{\"service-interface-point-uuid\":\"" + END_POINT_1_UUID + "\"}}," +
-            "{\"local-id\":\"" + END_POINT_2_UUID + "\",\"layer-protocol-name\":\"PHOTONIC_MEDIA\"," +
+            "{\"local-id\":\"" + 2 + "\",\"layer-protocol-name\":\"PHOTONIC_MEDIA\"," +
             "\"layer-protocol-qualifier\":" + "\"tapi-photonic-media:PHOTONIC_LAYER_QUALIFIER_NMC\"," +
             "\"service-interface-point\":{" + "\"service-interface-point-uuid\":\"" + END_POINT_2_UUID + "\"}}]}]}";
 
-    private static final String GET_CONNECTIVITY_REQUEST_REPLY = "{\"tapi-connectivity:connectivity-service\" : " +
-            "[{\"uuid\" : \"" + CONNECTION_UUID + "\"}]}";
+    private static final String GET_CONNECTIVITY_REQUEST_REPLY = "{\"tapi-connectivity:connectivity-context\": " +
+            "{\"connectivity-service\" : [{\"uuid\" : \"" + CONNECTION_UUID + "\"}]}}}";
 
     private static final Set<String> CONNECTION_UUIDS = ImmutableSet.of(CONNECTION_UUID);
 
@@ -144,10 +144,9 @@
 
     @Test
     public void parseConnReply() throws IOException {
-        TapiFlowRuleProgrammable tapiFrp = new TapiFlowRuleProgrammable();
         ObjectMapper mapper = new ObjectMapper();
         JsonNode jsonReply = mapper.readTree(GET_CONNECTIVITY_REQUEST_REPLY);
-        Set<String> output = tapiFrp.parseTapiGetConnectivityRequest(jsonReply);
+        Set<String> output = TapiDeviceHelper.parseTapiGetConnectivityRequest(jsonReply);
         assertEquals("Wrong Tapi UUIDS", CONNECTION_UUIDS, output);
     }