ios-xe-renderer version reporting

Change-Id: Ie46febd2c870d22dc748436c09ab8a33884ae719
Signed-off-by: Matej Perina <matej.perina@pantheon.sk>
Signed-off-by: Vladimir Lavor <vlavor@cisco.com>

diff --git a/renderers/ios-xe/src/main/config/default-config.xml b/renderers/ios-xe/src/main/config/default-config.xml
index ec77ae96610d2f4849e22ae08aafa6a2cb42a079..218d476e506e5f613c893c8f538f6a7168b1a531 100755 (executable)
--- a/renderers/ios-xe/src/main/config/default-config.xml
+++ b/renderers/ios-xe/src/main/config/default-config.xml
@@ -34,7 +34,7 @@
                         <name>policy-validator-registry</name>
                     </policy-validator-registry>
 
-                    <renderer-name>ios-xe</renderer-name>
+                    <renderer-name>ios-xe-renderer</renderer-name>
                 </module>
             </modules>
         </data>

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/manager/PolicyManager.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/manager/PolicyManager.java
index 7774d8c5d859468cc1f83330064ff1b8b01ed956..71109ad7fd01d2e90687b97963548a05de798dcf 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/manager/PolicyManager.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/api/manager/PolicyManager.java
@@ -8,9 +8,10 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager;
 
-import com.google.common.util.concurrent.ListenableFuture;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
 
+import com.google.common.util.concurrent.ListenableFuture;
+
 /**
  * Purpose: general policy manager prescription
  */
@@ -20,8 +21,9 @@ public interface PolicyManager extends AutoCloseable {
      * synchronize given configuration with device
      *  @param dataBefore
      * @param dataAfter
+     * @param version version needed to by apply
      */
-    ListenableFuture<Boolean> syncPolicy(Configuration dataBefore, Configuration dataAfter);
+    ListenableFuture<Boolean> syncPolicy(Configuration dataBefore, Configuration dataAfter, long version);
 
     @Override
     void close();

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java
index de2de6009efa06036c29868a762815aa988a9b2a..6daf50d81ccf19a2d6f98c1ab06fbf98497e79e7 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImpl.java
@@ -9,8 +9,6 @@
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.listener;
 
 import com.google.common.base.Preconditions;
-import java.util.Collection;
-import javax.annotation.Nonnull;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener;
@@ -23,11 +21,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.r
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.Renderer;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.RendererKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicy;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.annotation.Nonnull;
+import java.util.Collection;
+import java.util.Optional;
+
 /**
  * Purpose: process changes of configured renderer policies
  */
@@ -59,15 +62,20 @@ public class RendererConfigurationListenerImpl implements DataTreeChangeListener
 
             final RendererPolicy dataBefore = rootNode.getDataBefore();
             final RendererPolicy dataAfter = rootNode.getDataAfter();
-            if (dataAfter != null && dataBefore == null) {
-                policyManager.syncPolicy(dataAfter.getConfiguration(), null);
-            }
-            else if (dataAfter == null && dataBefore != null) {
-                policyManager.syncPolicy(null, dataBefore.getConfiguration());
+            // Policy configuration
+            Configuration oldConfig = null;
+            Configuration newConfig = null;
+            long version = 0;
+            if (dataBefore != null) {
+                oldConfig = dataBefore.getConfiguration();
             }
-            else if (dataAfter != null) {
-                policyManager.syncPolicy(dataAfter.getConfiguration(), dataBefore.getConfiguration());
+            if (dataAfter != null) {
+                newConfig = dataAfter.getConfiguration();
+                if (dataAfter.getVersion() != null) {
+                    version = dataAfter.getVersion();
+                }
             }
+            policyManager.syncPolicy(newConfig, oldConfig, version);
         }
     }
 

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java
index 18988617cce56a3742d47067d16220ee215ce482..5ac029711ae3f3691137ffdef91571a1b4a4d3ed 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImpl.java
@@ -8,13 +8,24 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager;
 
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
+import static org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl.DsAction.Create;
+import static org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl.DsAction.Delete;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager.PolicyManager;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.util.PolicyManagerUtil;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.writer.PolicyWriter;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.Renderers;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.Renderer;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.RendererKey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicy;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.RendererPolicyBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.endpoints.AddressEndpointWithLocation;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.configuration.renderer.endpoints.RendererEndpoint;
@@ -25,12 +36,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import static org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl.DsAction.Create;
-import static org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager.PolicyManagerImpl.DsAction.Delete;
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
 
 public class PolicyManagerImpl implements PolicyManager {
 
@@ -46,17 +54,19 @@ public class PolicyManagerImpl implements PolicyManager {
     }
 
     @Override
-    public ListenableFuture<Boolean> syncPolicy(final Configuration dataAfter, final Configuration dataBefore) {
+    public ListenableFuture<Boolean> syncPolicy(final Configuration dataAfter, final Configuration dataBefore,
+            long version) {
+        ListenableFuture<Boolean> result = Futures.immediateFuture(false);
         if (dataBefore == null && dataAfter != null) {
-            return createPolicy(dataAfter);
-        }
-        if (dataBefore != null && dataAfter != null) {
-            return updatePolicy(dataAfter, dataBefore);
+            result = syncPolicy(dataAfter, Create);
+        } else if (dataBefore != null && dataAfter != null) {
+            // TODO implement
+            return Futures.immediateFuture(false);
+        } else if (dataBefore != null) {
+            result = syncPolicy(dataBefore, Delete);
         }
-        if (dataBefore != null) {
-            return deletePolicy(dataBefore);
-        }
-        return Futures.immediateFuture(false);
+        reportVersion(version);
+        return result;
     }
 
     private ListenableFuture<Boolean> syncPolicy(final Configuration dataAfter, DsAction action) {
@@ -119,17 +129,13 @@ public class PolicyManagerImpl implements PolicyManager {
         return Futures.immediateFuture(false);
     }
 
-    private ListenableFuture<Boolean> createPolicy(Configuration data) {
-        return syncPolicy(data, Create);
-    }
-
-    private ListenableFuture<Boolean> deletePolicy(Configuration data) {
-        return syncPolicy(data, Delete);
-    }
-
-    private ListenableFuture<Boolean> updatePolicy(Configuration dataAfter, Configuration dataBefore) {
-        // TODO implement
-        return null;
+    private void reportVersion(long version) {
+        WriteTransaction wtx = dataBroker.newWriteOnlyTransaction();
+        InstanceIdentifier<RendererPolicy> iid = InstanceIdentifier.create(Renderers.class)
+                .child(Renderer.class, new RendererKey(NodeManager.iosXeRenderer))
+                .child(RendererPolicy.class);
+        wtx.merge(LogicalDatastoreType.OPERATIONAL, iid, new RendererPolicyBuilder().setVersion(version).build());
+        wtx.submit();
     }
 
     @Override

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImpl.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImpl.java
index 5e4e066f2974e9c61f0a8ad1087332514e94a6d6..7700831232f427a82d0d5514dedbfc1a985e04e1 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImpl.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImpl.java
@@ -8,24 +8,26 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager;
 
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import com.google.common.util.concurrent.ThreadFactoryBuilder;
 import java.util.concurrent.Callable;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.function.BinaryOperator;
+
 import org.apache.commons.lang3.tuple.MutablePair;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager.PolicyManager;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.base.Preconditions;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import com.google.common.util.concurrent.ListeningExecutorService;
+import com.google.common.util.concurrent.MoreExecutors;
+import com.google.common.util.concurrent.ThreadFactoryBuilder;
+
 /**
  * Purpose: wrap {@link PolicyManager} with state compression mechanism
  */
@@ -72,7 +74,7 @@ public class PolicyManagerZipImpl implements PolicyManager {
     }
 
     @Override
-    public ListenableFuture<Boolean> syncPolicy(final Configuration dataBefore, final Configuration dataAfter) {
+    public ListenableFuture<Boolean> syncPolicy(final Configuration dataBefore, final Configuration dataAfter, final long version) {
         LOG.trace("firing configuration zip");
         // add config to zipping storage
         final ConfigPairBox configPair = new ConfigPairBox(dataBefore, dataAfter);
@@ -86,7 +88,7 @@ public class PolicyManagerZipImpl implements PolicyManager {
                 public ListenableFuture<Boolean> call() throws Exception {
                     final ConfigPairBox configPairBox = configPairKeeper.getAndSet(null);
                     LOG.debug("delegating policy configuration");
-                    return delegate.syncPolicy(configPairBox.getLeft(), configPair.getRight());
+                    return delegate.syncPolicy(configPairBox.getLeft(), configPair.getRight(), version);
                 }
             }));
         } else {

diff --git a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/writer/PolicyWriter.java b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/writer/PolicyWriter.java
index bf7bb2a74e243b2ee92859884f3b1141574f3415..c92209beb911a64c838ca210de80fa8d948c356a 100644 (file)
--- a/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/writer/PolicyWriter.java
+++ b/renderers/ios-xe/src/main/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/writer/PolicyWriter.java
@@ -42,6 +42,8 @@ import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 
 public class PolicyWriter {
 
@@ -140,12 +142,15 @@ public class PolicyWriter {
             }
         }
 
+        CheckedFuture<Void, TransactionCommitFailedException> submitFuture = null;
         try {
-            CheckedFuture<Void, TransactionCommitFailedException> submitFuture = wtx.submit();
-            submitFuture.checkedGet();
-            // Clear cache
+            submitFuture = wtx.submit();
+            submitFuture.checkedGet(2, TimeUnit.SECONDS);
+            LOG.trace("configuration pushed to device: {}", submitFuture);
         } catch (TransactionCommitFailedException e) {
             LOG.error("Write transaction failed to {}", e.getMessage());
+        } catch (TimeoutException e) {
+            LOG.warn("Write transaction timed out: {}", submitFuture, e);
         } catch (Exception e) {
             LOG.error("Failed to .. {}", e.getMessage());
         }
@@ -197,11 +202,14 @@ public class PolicyWriter {
             LOG.info("Local forwarder removed from node {}", nodeId.getValue());
         }
 
+        CheckedFuture<Void, TransactionCommitFailedException> submitFuture = null;
         try {
-            CheckedFuture<Void, TransactionCommitFailedException> submitFuture = wtx.submit();
-            submitFuture.checkedGet();
+            submitFuture = wtx.submit();
+            submitFuture.checkedGet(2, TimeUnit.SECONDS);
         } catch (TransactionCommitFailedException e) {
             LOG.error("Write transaction failed to {}", e.getMessage());
+        } catch (TimeoutException e) {
+            LOG.warn("Write transaction timed out: {}", submitFuture, e);
         } catch (Exception e) {
             LOG.error("Failed to .. {}", e.getMessage());
         }

diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java
index 3337b078867576dd986a35fd52e92eadd5d2ab68..303bc8c55e448109f66d9f8429266a03bef705f0 100644 (file)
--- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java
+++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/listener/RendererConfigurationListenerImplTest.java
@@ -9,6 +9,7 @@
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.listener;
 
 import java.util.Collections;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -66,6 +67,13 @@ public class RendererConfigurationListenerImplTest {
                                         .build()))
                                 .build())
                         .build())
+                .setVersion((long) order)
+                .build();
+    }
+
+    private RendererPolicy createVersion(final int order) {
+        return new RendererPolicyBuilder()
+                .setVersion((long) order)
                 .build();
     }
 
@@ -93,7 +101,7 @@ public class RendererConfigurationListenerImplTest {
         Mockito.when(dataTreeModification.getRootNode()).thenReturn(rootNode);
 
         listener.onDataTreeChanged(Collections.singleton(dataTreeModification));
-        Mockito.verify(policyManager).syncPolicy(policy1.getConfiguration(), null);
+        Mockito.verify(policyManager).syncPolicy(policy1.getConfiguration(), null, 0);
     }
 
     @Test
@@ -104,18 +112,18 @@ public class RendererConfigurationListenerImplTest {
         Mockito.when(dataTreeModification.getRootNode()).thenReturn(rootNode);
 
         listener.onDataTreeChanged(Collections.singleton(dataTreeModification));
-        Mockito.verify(policyManager).syncPolicy(policy2.getConfiguration(), policy1.getConfiguration());
+        Mockito.verify(policyManager).syncPolicy(policy2.getConfiguration(), policy1.getConfiguration(), 1);
     }
 
     @Test
     public void testOnDataTreeChanged_remove() throws Exception {
         Mockito.when(rootNode.getDataBefore()).thenReturn(policy2);
-        Mockito.when(rootNode.getDataAfter()).thenReturn(null);
+        Mockito.when(rootNode.getDataAfter()).thenReturn(createVersion(1));
         Mockito.when(rootNode.getModificationType()).thenReturn(DataObjectModification.ModificationType.WRITE);
         Mockito.when(dataTreeModification.getRootNode()).thenReturn(rootNode);
 
         listener.onDataTreeChanged(Collections.singleton(dataTreeModification));
-        Mockito.verify(policyManager).syncPolicy(null, policy2.getConfiguration());
+        Mockito.verify(policyManager).syncPolicy(null, policy2.getConfiguration(), 1);
     }
 
     @Test

diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
index 2ed3dc096ff2360008567331109d6f09bf1861a5..e643335b31d5a2a7da4c5b11120c771c9876eeb0 100644 (file)
--- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
+++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerImplTest.java
@@ -1,17 +1,25 @@
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager;
 
-import com.google.common.util.concurrent.ListenableFuture;
+import static org.junit.Assert.assertTrue;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+import static org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.HasDirection.Direction.Out;
+import static org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.EndpointPolicyParticipation.PROVIDER;
+import static org.powermock.api.support.membermodification.MemberMatcher.method;
+import static org.powermock.api.support.membermodification.MemberModifier.stub;
+
+import java.util.Collections;
+import java.util.List;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Captor;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.util.PolicyManagerUtil;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.util.RendererPolicyUtil;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.util.ServiceChainingUtil;
-import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.writer.PolicyWriter;
 import org.opendaylight.sfc.provider.api.SfcProviderServiceForwarderAPI;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.RspName;
 import org.opendaylight.yang.gen.v1.urn.cisco.params.xml.ns.yang.sfc.common.rev151017.SfName;
@@ -79,17 +87,7 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.powermock.core.classloader.annotations.PrepareForTest;
 import org.powermock.modules.junit4.PowerMockRunner;
 
-import java.util.Collections;
-import java.util.List;
-
-import static org.junit.Assert.assertTrue;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
-import static org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.HasDirection.Direction.Out;
-import static org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.EndpointPolicyParticipation.PROVIDER;
-import static org.powermock.api.support.membermodification.MemberMatcher.method;
-import static org.powermock.api.support.membermodification.MemberModifier.stub;
+import com.google.common.util.concurrent.ListenableFuture;
 
 @RunWith(PowerMockRunner.class)
 @PrepareForTest({RendererPolicyUtil.class, PolicyManagerUtil.class, SfcProviderServiceForwarderAPI.class})
@@ -130,7 +128,7 @@ public class PolicyManagerImplTest {
     @Test
     public void testSyncPolicy_emptyConfiguration() throws Exception {
         Configuration policyConfiguration = createTestConfiguration(null, null, null, null);
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -139,7 +137,7 @@ public class PolicyManagerImplTest {
         RendererEndpoint rendererEndpoint = createRendererEndpoint(contextId_1, contextId_2, null);
         Configuration policyConfiguration = createTestConfiguration(null, Collections.singletonList(rendererEndpoint),
                 null, null);
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -155,7 +153,7 @@ public class PolicyManagerImplTest {
         stub(method(RendererPolicyUtil.class, "lookupEndpoint")).toReturn(lookupEndpoint);
         when(nodeManager.getNodeMountPoint(eq(createMountpointIid()))).thenReturn(null);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -173,7 +171,7 @@ public class PolicyManagerImplTest {
         when(nodeManager.getNodeIdByMountpointIid(eq(createMountpointIid()))).thenReturn(nodeId);
         when(nodeManager.getNodeManagementIpByMountPointIid(eq(createMountpointIid()))).thenReturn(ipAddress);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -195,7 +193,7 @@ public class PolicyManagerImplTest {
         when(nodeManager.getNodeIdByMountpointIid(eq(createMountpointIid()))).thenReturn(nodeId);
         when(nodeManager.getNodeManagementIpByMountPointIid(eq(createMountpointIid()))).thenReturn(ipAddress);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -218,7 +216,7 @@ public class PolicyManagerImplTest {
         when(nodeManager.getNodeIdByMountpointIid(eq(createMountpointIid()))).thenReturn(nodeId);
         when(nodeManager.getNodeManagementIpByMountPointIid(eq(createMountpointIid()))).thenReturn(ipAddress);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -241,7 +239,7 @@ public class PolicyManagerImplTest {
         when(nodeManager.getNodeIdByMountpointIid(eq(createMountpointIid()))).thenReturn(nodeId);
         when(nodeManager.getNodeManagementIpByMountPointIid(eq(createMountpointIid()))).thenReturn(ipAddress);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 
@@ -271,7 +269,7 @@ public class PolicyManagerImplTest {
         stub(method(SfcProviderServiceForwarderAPI.class, "readServiceFunctionForwarder"))
                 .toReturn(serviceFunctionForwarder);
 
-        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null);
+        ListenableFuture result = policyManager.syncPolicy(policyConfiguration, null, 0);
         assertTrue((boolean) result.get());
     }
 

diff --git a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImplTest.java b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImplTest.java
index aac65c819f0d80a4d27dc1c4bbfe3119af8a8446..7dd6b67ee31602e10afe44cac6e1673eec1e4384 100644 (file)
--- a/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImplTest.java
+++ b/renderers/ios-xe/src/test/java/org/opendaylight/groupbasedpolicy/renderer/ios_xe_provider/impl/manager/PolicyManagerZipImplTest.java
@@ -8,12 +8,11 @@
 
 package org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.impl.manager;
 
-import com.google.common.util.concurrent.Futures;
-import com.google.common.util.concurrent.ListenableFuture;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
+
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -26,11 +25,15 @@ import org.mockito.invocation.InvocationOnMock;
 import org.mockito.runners.MockitoJUnitRunner;
 import org.mockito.stubbing.Answer;
 import org.opendaylight.groupbasedpolicy.renderer.ios_xe_provider.api.manager.PolicyManager;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.policy.rev140421.Matcher;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.Configuration;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.renderer.rev151103.renderers.renderer.renderer.policy.ConfigurationBuilder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+
 /**
  * Test for {@link PolicyManagerZipImpl}.
  */
@@ -60,23 +63,23 @@ public class PolicyManagerZipImplTest {
 
     @Test
     public void testSyncPolicy_add() throws Exception {
-        policyManager.syncPolicy(null, configAfter);
+        policyManager.syncPolicy(null, configAfter, 0);
         policyManager.close();
-        Mockito.verify(delegate).syncPolicy(null, configAfter);
+        Mockito.verify(delegate).syncPolicy(null, configAfter, 0);
     }
 
     @Test
     public void testSyncPolicy_update() throws Exception {
-        policyManager.syncPolicy(configBefore, configAfter);
+        policyManager.syncPolicy(configBefore, configAfter, 0);
         policyManager.close();
-        Mockito.verify(delegate).syncPolicy(configBefore, configAfter);
+        Mockito.verify(delegate).syncPolicy(configBefore, configAfter, 0);
     }
 
     @Test
     public void testSyncPolicy_remove() throws Exception {
-        policyManager.syncPolicy(configBefore, null);
+        policyManager.syncPolicy(configBefore, null, 0);
         policyManager.close();
-        Mockito.verify(delegate).syncPolicy(configBefore, null);
+        Mockito.verify(delegate).syncPolicy(configBefore, null, 0);
     }
 
     @Test
@@ -91,7 +94,7 @@ public class PolicyManagerZipImplTest {
         final CountDownLatch latchForFirst = new CountDownLatch(1);
         final CountDownLatch latchForOthers = new CountDownLatch(1);
 
-        Mockito.when(delegate.syncPolicy(Matchers.<Configuration>any(), Matchers.<Configuration>any()))
+        Mockito.when(delegate.syncPolicy(Matchers.<Configuration>any(), Matchers.<Configuration>any(), Matchers.anyLong()))
                 .thenAnswer(new Answer<ListenableFuture<Boolean>>() {
                     @Override
                     public ListenableFuture<Boolean> answer(final InvocationOnMock invocationOnMock) throws Throwable {
@@ -105,19 +108,19 @@ public class PolicyManagerZipImplTest {
                 .thenReturn(Futures.immediateFuture(true));
 
         final List<ListenableFuture<Boolean>> allResults = new ArrayList<>();
-        allResults.add(policyManager.syncPolicy(null, configBefore));
+        allResults.add(policyManager.syncPolicy(null, configBefore, 0));
 
         latchForOthers.await(1, TimeUnit.SECONDS);
-        allResults.add(policyManager.syncPolicy(configBefore, configAfter));
-        allResults.add(policyManager.syncPolicy(configAfter, null));
-        allResults.add(policyManager.syncPolicy(null, configAfter2));
+        allResults.add(policyManager.syncPolicy(configBefore, configAfter, 0));
+        allResults.add(policyManager.syncPolicy(configAfter, null, 0));
+        allResults.add(policyManager.syncPolicy(null, configAfter2, 0));
         latchForFirst.countDown();
 
         Futures.allAsList(allResults).get(1, TimeUnit.SECONDS);
         LOG.info("all configs finished");
         policyManager.close();
         final InOrder inOrder = Mockito.inOrder(delegate);
-        inOrder.verify(delegate).syncPolicy(null, configBefore);
-        inOrder.verify(delegate).syncPolicy(configBefore, configAfter2);
+        inOrder.verify(delegate).syncPolicy(null, configBefore, 0);
+        inOrder.verify(delegate).syncPolicy(configBefore, configAfter2, 0);
     }
 }
\ No newline at end of file