commit 024798622baa17e4d8b3911da1041f8ed0314659
author Ray Milkey <ray@onlab.us> Tue Feb 17 17:02:19 2015 -0800
committer Ray Milkey <ray@onlab.us> Wed Feb 18 19:09:03 2015 +0000
tree 9a40067dd4eb7faa643b5fc6c0c48527376ff297
parent 9c17a6d72a3e6dbd1b85f3494db0358c88dc070c

ONOS-1058 - Add application Id to intent withdraw command

Change-Id: I6f660f2e115e4acc9d3c7d1ab2e2115caaf1822f

core/api/src/main/java/org/onosproject/core/CoreService.java

diff --git a/core/api/src/main/java/org/onosproject/core/CoreService.java b/core/api/src/main/java/org/onosproject/core/CoreService.java
index 4b13c38..7366df5 100644
--- a/core/api/src/main/java/org/onosproject/core/CoreService.java
+++ b/core/api/src/main/java/org/onosproject/core/CoreService.java
@@ -49,6 +49,13 @@
     ApplicationId getAppId(Short id);
 
     /**
+     * Returns an existing application id from a given id.
+     * @param name the name portion of the ID to look up
+     * @return an application id
+     */
+    ApplicationId getAppId(String name);
+
+    /**
      * Registers a new application by its name, which is expected
      * to follow the reverse DNS convention, e.g.
      * {@code org.flying.circus.app}

core/api/src/test/java/org/onosproject/core/CoreServiceAdapter.java

diff --git a/core/api/src/test/java/org/onosproject/core/CoreServiceAdapter.java b/core/api/src/test/java/org/onosproject/core/CoreServiceAdapter.java
index cd9db3f..0f6abd6 100644
--- a/core/api/src/test/java/org/onosproject/core/CoreServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/core/CoreServiceAdapter.java
@@ -38,6 +38,11 @@
     }
 
     @Override
+    public ApplicationId getAppId(String name) {
+        return null;
+    }
+
+    @Override
     public ApplicationId registerApplication(String identifier) {
         return null;
     }

core/net/src/main/java/org/onosproject/core/impl/CoreManager.java

diff --git a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
index e3484ec..a592801 100644
--- a/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
+++ b/core/net/src/main/java/org/onosproject/core/impl/CoreManager.java
@@ -74,6 +74,12 @@
     }
 
     @Override
+    public ApplicationId getAppId(String name) {
+        return applicationIdStore.getAppId(name);
+    }
+
+
+    @Override
     public ApplicationId registerApplication(String name) {
         checkNotNull(name, "Application ID cannot be null");
         return applicationIdStore.registerApplication(name);

core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java

diff --git a/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java b/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
index 2a5d5ff..1b4765c 100644
--- a/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
+++ b/core/net/src/test/java/org/onosproject/core/impl/TestCoreManager.java
@@ -34,7 +34,12 @@
     }
 
     @Override
-    public ApplicationId getAppId(Short id) {
+     public ApplicationId getAppId(Short id) {
+        return null;
+    }
+
+    @Override
+    public ApplicationId getAppId(String name) {
         return null;
     }
 

core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java

diff --git a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
index fbda6cd..f7d7287 100644
--- a/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
+++ b/core/net/src/test/java/org/onosproject/net/flow/impl/FlowRuleManagerTest.java
@@ -600,6 +600,11 @@
         }
 
         @Override
+        public ApplicationId getAppId(String name) {
+            return null;
+        }
+
+        @Override
         public ApplicationId registerApplication(String identifier) {
             return null;
         }