Fix Typo in RPC Name

This is a simple typo, make sure we have a sane interface.

JIRA: AAA-186
Change-Id: I1ecceff4c860792664b6dbd17c8309b8bb43dbaf
Signed-off-by: Venkatrangan Govindarajan <vgovindarajan@luminanetworks.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/api/ICertificateManager.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/api/ICertificateManager.java
index 8ee00a313cb7e3bbe2c9c4ab11b2ef1aeeb3d45b..ff4480f492add9856d7f550c2f4bec762598cd67 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/api/ICertificateManager.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/api/ICertificateManager.java
@@ -12,7 +12,7 @@ import javax.net.ssl.SSLContext;
 import org.eclipse.jdt.annotation.NonNull;
 
 /**
- * ICertifcateManager defines the basic functions that are consumed by other bundles to establish the SSLContext.
+ * ICertificateManager defines the basic functions that are consumed by other bundles to establish the SSLContext.
  *
  * @author mserngawy
  *

diff --git a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
index 437fc6b215636ae6a7901b4507fef33b426c7e89..b662b1d416e10fc4ff871e69d77a0e4691d736d7 100644 (file)
--- a/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
+++ b/aaa-cert/src/main/java/org/opendaylight/aaa/cert/impl/AaaCertRpcServiceImpl.java
@@ -15,21 +15,22 @@ import org.opendaylight.aaa.encrypt.AAAEncryptionService;
 import org.opendaylight.mdsal.binding.api.DataBroker;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.AaaCertRpcService;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertificateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertificateOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateOutputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateReqInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateReqOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateReqOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertifcateOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertifcateOutputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertifcateOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertifcateOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertificateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertificateOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateOutputBuilder;
+import org.opendaylight.yangtools.yang.common.RpcError;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
 import org.slf4j.Logger;
@@ -73,26 +74,29 @@ public class AaaCertRpcServiceImpl implements AaaCertRpcService {
     }
 
     @Override
-    public ListenableFuture<RpcResult<GetNodeCertifcateOutput>> getNodeCertifcate(final GetNodeCertifcateInput input) {
-        final SettableFuture<RpcResult<GetNodeCertifcateOutput>> futureResult = SettableFuture.create();
+    public ListenableFuture<RpcResult<GetNodeCertificateOutput>> getNodeCertificate(
+           final GetNodeCertificateInput input) {
+        final SettableFuture<RpcResult<GetNodeCertificateOutput>> futureResult = SettableFuture.create();
         final String cert = aaaCertProvider.getCertificateTrustStore(input.getNodeAlias(), false);
         if (!Strings.isNullOrEmpty(cert)) {
-            final GetNodeCertifcateOutput nodeCertOutput = new GetNodeCertifcateOutputBuilder().setNodeCert(cert)
+            final GetNodeCertificateOutput nodeCertOutput = new GetNodeCertificateOutputBuilder().setNodeCert(cert)
                     .build();
             futureResult.set(RpcResultBuilder.success(nodeCertOutput).build());
         } else {
-            futureResult.set(RpcResultBuilder.<GetNodeCertifcateOutput>failed().build());
+            String errorMsg = "getNodeCertificate does not fetch certificate for the alias " + input.getNodeAlias();
+            futureResult.set(RpcResultBuilder.<GetNodeCertificateOutput>failed().withRpcError(RpcResultBuilder
+                .newError(RpcError.ErrorType.APPLICATION, "", errorMsg)).build());
         }
         return futureResult;
     }
 
     @Override
-    public ListenableFuture<RpcResult<SetODLCertifcateOutput>> setODLCertifcate(final SetODLCertifcateInput input) {
-        final SettableFuture<RpcResult<SetODLCertifcateOutput>> futureResult = SettableFuture.create();
+    public ListenableFuture<RpcResult<SetODLCertificateOutput>> setODLCertificate(final SetODLCertificateInput input) {
+        final SettableFuture<RpcResult<SetODLCertificateOutput>> futureResult = SettableFuture.create();
         if (aaaCertProvider.addCertificateODLKeyStore(input.getOdlCertAlias(), input.getOdlCert())) {
-            futureResult.set(RpcResultBuilder.success(new SetODLCertifcateOutputBuilder().build()).build());
+            futureResult.set(RpcResultBuilder.success(new SetODLCertificateOutputBuilder().build()).build());
         } else {
-            futureResult.set(RpcResultBuilder.<SetODLCertifcateOutput>failed().build());
+            futureResult.set(RpcResultBuilder.<SetODLCertificateOutput>failed().build());
             LOG.info("Error while adding ODL certificate");
         }
         return futureResult;
@@ -127,12 +131,13 @@ public class AaaCertRpcServiceImpl implements AaaCertRpcService {
     }
 
     @Override
-    public ListenableFuture<RpcResult<SetNodeCertifcateOutput>> setNodeCertifcate(final SetNodeCertifcateInput input) {
-        final SettableFuture<RpcResult<SetNodeCertifcateOutput>> futureResult = SettableFuture.create();
+    public ListenableFuture<RpcResult<SetNodeCertificateOutput>> setNodeCertificate(
+           final SetNodeCertificateInput input) {
+        final SettableFuture<RpcResult<SetNodeCertificateOutput>> futureResult = SettableFuture.create();
         if (aaaCertProvider.addCertificateTrustStore(input.getNodeAlias(), input.getNodeCert())) {
-            futureResult.set(RpcResultBuilder.success(new SetNodeCertifcateOutputBuilder().build()).build());
+            futureResult.set(RpcResultBuilder.success(new SetNodeCertificateOutputBuilder().build()).build());
         } else {
-            futureResult.set(RpcResultBuilder.<SetNodeCertifcateOutput>failed().build());
+            futureResult.set(RpcResultBuilder.<SetNodeCertificateOutput>failed().build());
             LOG.info("Error while adding the Node certificate");
         }
         return futureResult;

diff --git a/aaa-cert/src/main/yang/aaa-cert-rpc.yang b/aaa-cert/src/main/yang/aaa-cert-rpc.yang
index f250188adf4c4bcd261df0e924f48255b121acbd..35e8b037cbac24cbd8f812769ae31e74c2db0a64 100644 (file)
--- a/aaa-cert/src/main/yang/aaa-cert-rpc.yang
+++ b/aaa-cert/src/main/yang/aaa-cert-rpc.yang
@@ -42,11 +42,11 @@ module aaa-cert-rpc {
         }
     }
 
-    rpc setODLCertifcate {
+    rpc setODLCertificate {
         description
-            "The certifcate should be generated based on
-            a certifcate request generated from the ctl.jks
-            keystore otherwise the certifcated will not be added to ctl keystore";
+            "The certificate should be generated based on
+            a certificate request generated from the ctl.jks
+            keystore otherwise the certificate will not be added to ctl keystore";
         input {
             leaf odl-cert-alias {
                 type string;
@@ -57,9 +57,9 @@ module aaa-cert-rpc {
         }
     }
 
-    rpc setNodeCertifcate {
+    rpc setNodeCertificate {
         description
-            "Set the certifcate of the network node that will communicate with opendaylight through TLS connection";
+            "Set the certificate of the network node that will communicate with opendaylight through TLS connection";
         input {
            leaf node-alias {
                type string;
@@ -70,7 +70,7 @@ module aaa-cert-rpc {
         }
     }
 
-    rpc getNodeCertifcate {
+    rpc getNodeCertificate {
         description
             "Get the network node certificate based on node alias";
         input {
@@ -84,4 +84,4 @@ module aaa-cert-rpc {
             }
         }
     }
-}
\ No newline at end of file
+}

diff --git a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertRpcServiceImplTest.java b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertRpcServiceImplTest.java
index b305ab97d999c748f9adcd9c9d9465add6de69d6..47ca24939ed9e0a5a75293835ae216861c3ca758 100644 (file)
--- a/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertRpcServiceImplTest.java
+++ b/aaa-cert/src/test/java/org/opendaylight/aaa/cert/test/AaaCertRpcServiceImplTest.java
@@ -36,16 +36,16 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev1603
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.ssl.data.OdlKeystoreBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.mdsal.rev160321.ssl.data.TrustKeystore;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rev151126.AaaCertServiceConfig;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertifcateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetNodeCertificateOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateOutput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateReqInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.GetODLCertificateReqOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertifcateOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertifcateInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertifcateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetNodeCertificateOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.yang.aaa.cert.rpc.rev151215.SetODLCertificateOutput;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 
 public class AaaCertRpcServiceImplTest {
@@ -120,10 +120,10 @@ public class AaaCertRpcServiceImplTest {
     }
 
     @Test
-    public void getNodeCertifcateTest() throws Exception {
-        final GetNodeCertifcateInput nodeCertifcateInput = mock(GetNodeCertifcateInput.class);
-        when(nodeCertifcateInput.getNodeAlias()).thenReturn(ALIAS);
-        Future<RpcResult<GetNodeCertifcateOutput>> result = aaaCertRpcService.getNodeCertifcate(nodeCertifcateInput);
+    public void getNodeCertificateTest() throws Exception {
+        final GetNodeCertificateInput nodeCertificateInput = mock(GetNodeCertificateInput.class);
+        when(nodeCertificateInput.getNodeAlias()).thenReturn(ALIAS);
+        Future<RpcResult<GetNodeCertificateOutput>> result = aaaCertRpcService.getNodeCertificate(nodeCertificateInput);
         assertTrue(result.get().isSuccessful());
         final String cert = result.get().getResult().getNodeCert();
         assertTrue(cert != null && !cert.isEmpty());
@@ -131,12 +131,12 @@ public class AaaCertRpcServiceImplTest {
     }
 
     @Test
-    public void setODLCertifcateTest() throws Exception {
-        final SetODLCertifcateInput input = mock(SetODLCertifcateInput.class);
+    public void setODLCertificateTest() throws Exception {
+        final SetODLCertificateInput input = mock(SetODLCertificateInput.class);
         when(input.getOdlCertAlias()).thenReturn(ALIAS);
         when(input.getOdlCert()).thenReturn(CERTIFICATE);
-        Future<RpcResult<SetODLCertifcateOutput>> result = new AaaCertRpcServiceImpl(aaaCertServiceConfig,
-                mockDataBroker(unsignedSslData), aaaEncryptionService).setODLCertifcate(input);
+        Future<RpcResult<SetODLCertificateOutput>> result = new AaaCertRpcServiceImpl(aaaCertServiceConfig,
+                mockDataBroker(unsignedSslData), aaaEncryptionService).setODLCertificate(input);
         assertTrue(result.get().isSuccessful());
     }
 
@@ -161,12 +161,12 @@ public class AaaCertRpcServiceImplTest {
     }
 
     @Test
-    public void setNodeCertifcate() throws Exception {
-        final SetNodeCertifcateInput input = mock(SetNodeCertifcateInput.class);
+    public void setNodeCertificate() throws Exception {
+        final SetNodeCertificateInput input = mock(SetNodeCertificateInput.class);
         when(input.getNodeAlias()).thenReturn(ALIAS);
         when(input.getNodeCert()).thenReturn(CERTIFICATE);
-        Future<RpcResult<SetNodeCertifcateOutput>> result = new AaaCertRpcServiceImpl(aaaCertServiceConfig,
-                mockDataBroker(unsignedSslData), aaaEncryptionService).setNodeCertifcate(input);
+        Future<RpcResult<SetNodeCertificateOutput>> result = new AaaCertRpcServiceImpl(aaaCertServiceConfig,
+                mockDataBroker(unsignedSslData), aaaEncryptionService).setNodeCertificate(input);
         assertTrue(result.get().isSuccessful());
     }
 }