Change sal bundle yang model

- Put messages to message container

Change-Id: Ie86d70bf070ca16659f02ba536655c6e6f1682af
Signed-off-by: miroslav.macko <miroslav.macko@pantheon.tech>
Signed-off-by: Jozef Bacigal <jozef.bacigal@pantheon.tech>

diff --git a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImpl.java b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImpl.java
index 5fe73deeb7b2aec0af60f3af3cb8dff93bd715d7..85dca7e738a24eb9761b68623ec30175ff47773b 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImpl.java
+++ b/extension/openflowplugin-extension-onf/src/main/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImpl.java
@@ -23,6 +23,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.ControlBundleInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.SalBundleService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.Messages;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.Message;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.send.experimenter.input.experimenter.message.of.choice.BundleAddMessageSalBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.send.experimenter.input.experimenter.message.of.choice.BundleControlSalBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.send.experimenter.input.experimenter.message.of.choice.bundle.add.message.sal.SalAddMessageDataBuilder;
@@ -68,7 +69,7 @@ public class SalBundleServiceImpl implements SalBundleService {
         dataBuilder.setBundleId(input.getBundleId());
         dataBuilder.setFlags(input.getFlags());
         dataBuilder.setBundleProperty(input.getBundleProperty());
-        for (Messages message : input.getMessages()) {
+        for (Message message : input.getMessages().getMessage()) {
             dataBuilder.setBundleInnerMessage(message.getBundleInnerMessage());
             experimenterInputBuilder.setExperimenterMessageOfChoice(bundleAddMessageBuilder
                     .setSalAddMessageData(dataBuilder.build()).build());

diff --git a/extension/openflowplugin-extension-onf/src/main/yang/sal-bundle.yang b/extension/openflowplugin-extension-onf/src/main/yang/sal-bundle.yang
index cdf243b00a9117d06138586365aeab09704c2a66..514f407700ca4d12829e7743b353723aabc6ee4f 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/main/yang/sal-bundle.yang
+++ b/extension/openflowplugin-extension-onf/src/main/yang/sal-bundle.yang
@@ -81,8 +81,10 @@ module sal-bundle {
         input {
             uses inv:node-context-ref;
             uses onf-ext:bundle-common-grouping;
-            list messages {
-                uses bundle-inner-message-grouping;
+            container messages {
+                list message {
+                    uses bundle-inner-message-grouping;
+                }
             }
         }
     }

diff --git a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImplTest.java b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImplTest.java
index 21bc2d6d2742eab72635df4de9641dc92fe8d66e..f87022ab3acdd454eecb3fcec59899ccb3be0e54 100644 (file)
--- a/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImplTest.java
+++ b/extension/openflowplugin-extension-onf/src/test/java/org/opendaylight/openflowplugin/extension/onf/service/SalBundleServiceImplTest.java
@@ -32,6 +32,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.on
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.SalBundleService;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.Messages;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.MessagesBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.Message;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.add.bundle.messages.input.messages.MessageBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleAddFlowCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleAddGroupCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.onf.bundle.service.rev170124.bundle.inner.message.grouping.bundle.inner.message.BundleRemoveFlowCaseBuilder;
@@ -91,13 +93,14 @@ public class SalBundleServiceImplTest {
 
     @Test
     public void testAddBundleMessages() throws Exception {
-        final List<Messages> innerMessages = createMessages();
+        final List<Message> innerMessages = createMessages();
+        final Messages messages = new MessagesBuilder().setMessage(innerMessages).build();
         final AddBundleMessagesInput input = new AddBundleMessagesInputBuilder()
                 .setNode(NODE_REF)
                 .setBundleId(BUNDLE_ID)
                 .setFlags(BUNDLE_FLAGS)
                 .setBundleProperty(properties)
-                .setMessages(innerMessages)
+                .setMessages(messages)
                 .build();
         final SalAddMessageDataBuilder dataBuilder = new SalAddMessageDataBuilder();
         dataBuilder.setBundleId(BUNDLE_ID).setFlags(BUNDLE_FLAGS).setBundleProperty(properties);
@@ -107,7 +110,7 @@ public class SalBundleServiceImplTest {
                 .setNode(NODE_REF);
         Mockito.when(experimenterMessageService.sendExperimenter(Matchers.any())).thenReturn(SettableFuture.create());
         service.addBundleMessages(input);
-        for (Messages msg : innerMessages) {
+        for (Message msg : innerMessages) {
             Mockito.verify(experimenterMessageService)
                     .sendExperimenter(
                             experimenterBuilder.setExperimenterMessageOfChoice(
@@ -120,15 +123,15 @@ public class SalBundleServiceImplTest {
         }
     }
 
-    private static List<Messages> createMessages() {
-        List<Messages> messages  = new ArrayList<>();
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleAddFlowCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdateFlowCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleRemoveFlowCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleAddGroupCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdateGroupCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleRemoveGroupCaseBuilder().build()).build());
-        messages.add(new MessagesBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdatePortCaseBuilder().build()).build());
+    private static List<Message> createMessages() {
+        List<Message> messages  = new ArrayList<>();
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleAddFlowCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdateFlowCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleRemoveFlowCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleAddGroupCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdateGroupCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleRemoveGroupCaseBuilder().build()).build());
+        messages.add(new MessageBuilder().setNode(NODE_REF).setBundleInnerMessage(new BundleUpdatePortCaseBuilder().build()).build());
         return messages;
     }