diff options
author | Michal Cmarada <mcmarada@cisco.com> | 2019-02-27 13:17:34 +0100 |
---|---|---|
committer | Michal Cmarada <mcmarada@cisco.com> | 2019-02-28 09:57:45 +0100 |
commit | 1b0e8be823737a94e6e3dc0407fdb6734b06ebac (patch) | |
tree | 7e474e8a3aa6da795b8ce3c3966eb61089775c22 /ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java | |
parent | e4c3640eb7a140351cf804c48ff96ab5a650e1e6 (diff) |
fix ikev2 implementation in ipsec
Ikev2 was moved from core to plugins, which needed some refactoring
to be done in implementation of Ikev2 in ipsec.
Change-Id: Icc5d1e2a3e8babe0ceae84d4e12a22ceef6ccb43
Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java')
-rw-r--r-- | ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java index cf9e8b102..84ae9c7d6 100644 --- a/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java +++ b/ipsec/ipsec-impl/src/test/java/io/fd/hc2vpp/ipsec/write/Ikev2GlobalConfigurationCustomizerTest.java @@ -23,9 +23,11 @@ import static org.mockito.Mockito.when; import io.fd.hc2vpp.common.test.write.WriterCustomizerTest; import io.fd.hc2vpp.ipsec.helpers.SchemaContextTestHelper; import io.fd.honeycomb.translate.write.WriteFailedException; -import io.fd.vpp.jvpp.core.dto.Ikev2SetLocalKey; -import io.fd.vpp.jvpp.core.dto.Ikev2SetLocalKeyReply; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKey; +import io.fd.vpp.jvpp.ikev2.dto.Ikev2SetLocalKeyReply; +import io.fd.vpp.jvpp.ikev2.future.FutureJVppIkev2Facade; import org.junit.Test; +import org.mockito.Mock; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentation; import org.opendaylight.yang.gen.v1.http.fd.io.hc2vpp.yang.vpp.ipsec.rev181213.IpsecIkeGlobalConfAugmentationBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.ipsec.rev181214.Ikev2; @@ -39,11 +41,13 @@ public class Ikev2GlobalConfigurationCustomizerTest extends WriterCustomizerTest .child(IkeGlobalConfiguration.class); private Ikev2GlobalConfigurationCustomizer customizer; private static final String LOCAL_KEY_FILE = "/home/localadmin/certs/client-key.pem"; + @Mock + protected FutureJVppIkev2Facade ikev2api; @Override protected void setUpTest() throws Exception { - customizer = new Ikev2GlobalConfigurationCustomizer(api); - when(api.ikev2SetLocalKey(any())).thenReturn(future(new Ikev2SetLocalKeyReply())); + customizer = new Ikev2GlobalConfigurationCustomizer(ikev2api); + when(ikev2api.ikev2SetLocalKey(any())).thenReturn(future(new Ikev2SetLocalKeyReply())); } @Test @@ -55,6 +59,6 @@ public class Ikev2GlobalConfigurationCustomizerTest extends WriterCustomizerTest customizer.writeCurrentAttributes(IID, dataAfterBuilder.build(), writeContext); Ikev2SetLocalKey request = new Ikev2SetLocalKey(); request.keyFile = LOCAL_KEY_FILE.getBytes(); - verify(api).ikev2SetLocalKey(request); + verify(ikev2api).ikev2SetLocalKey(request); } } |