summaryrefslogtreecommitdiffstats
path: root/appc-adapters/appc-ansible-adapter
diff options
context:
space:
mode:
authorPatrick Brady <patrick.brady@att.com>2019-02-22 13:37:19 -0800
committerPatrick Brady <patrick.brady@att.com>2019-02-25 22:33:05 +0000
commit13c0353d0f637ec88ca4cdbeb64c4de3917e6a2b (patch)
treea9d1561322f2f66556aa7c8a6e3ddae592a23d08 /appc-adapters/appc-ansible-adapter
parent356dba9fb407b1df3fe89a4c8f082a09aa564d36 (diff)
Changes for new odl version
Changes required to update to latest opendaylight version. Some powermock tests have been temporarily removed due to an powermock incompatibility. They will be fixed and re-added. Change-Id: I418d44913fcd42423d2d9bd37b189f6301eaab81 Signed-off-by: Patrick Brady <patrick.brady@att.com> Issue-ID: APPC-1370
Diffstat (limited to 'appc-adapters/appc-ansible-adapter')
-rw-r--r--appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/AnsibleActivatorTest.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/AnsibleActivatorTest.java b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/AnsibleActivatorTest.java
index 7fd2f4d8a..83a803156 100644
--- a/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/AnsibleActivatorTest.java
+++ b/appc-adapters/appc-ansible-adapter/appc-ansible-adapter-bundle/src/test/java/org/onap/appc/adapter/ansible/AnsibleActivatorTest.java
@@ -2,7 +2,7 @@
* ============LICENSE_START=======================================================
* ONAP : APPC
* ================================================================================
- * Copyright (C) 2018 AT&T Intellectual Property. All rights reserved.
+ * Copyright (C) 2018-2019 AT&T Intellectual Property. All rights reserved.
* =============================================================================
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -43,7 +43,7 @@ import org.osgi.framework.ServiceRegistration;
public class AnsibleActivatorTest {
@Mock
- private ServiceRegistration<AnsibleAdapter> serviceRegistration;
+ private ServiceRegistration serviceRegistration;
@Mock
private BundleContext bundleContext;