[ONOS-6556] Implementation of PiPeconfService
Change-Id: I0b40f1808e459a4a7cb83cde50010f6d38b04771
diff --git a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
similarity index 98%
rename from core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java
rename to core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
index 1e66d7f..85d3fc3 100644
--- a/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfServiceImpl.java
+++ b/core/net/src/main/java/org/onosproject/net/pi/impl/PiPipeconfManager.java
@@ -19,6 +19,7 @@
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -64,7 +65,8 @@
*/
@Component(immediate = true)
@Service
-public class PiPipeconfServiceImpl implements PiPipeconfService {
+@Beta
+public class PiPipeconfManager implements PiPipeconfService {
private final Logger log = getLogger(getClass());
@@ -132,7 +134,7 @@
@Override
public Iterable<PiPipeconf> getPipeconfs() {
- throw new UnsupportedOperationException("Currently unsupported");
+ return piPipeconfs.values();
}
@Override
diff --git a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfServiceImplTest.java b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
similarity index 96%
rename from core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfServiceImplTest.java
rename to core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
index e9a91d3..a3f5cfb 100644
--- a/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfServiceImplTest.java
+++ b/core/net/src/test/java/org/onosproject/net/pi/impl/PiPipeconfManagerTest.java
@@ -63,9 +63,9 @@
/**
- * Unit Test Class for PiPipeconfServiceImpl.
+ * Unit Test Class for PiPipeconfManager.
*/
-public class PiPipeconfServiceImplTest {
+public class PiPipeconfManagerTest {
private static final DeviceId DEVICE_ID = DeviceId.deviceId("test:test");
private static final String BASE_DRIVER = "baseDriver";
@@ -84,20 +84,20 @@
private final Set<DriverProvider> providers = new HashSet<>();
private final PiPipeconfConfig piPipeconfConfig = new PiPipeconfConfig();
- private final InputStream jsonStream = PiPipeconfServiceImplTest.class
+ private final InputStream jsonStream = PiPipeconfManagerTest.class
.getResourceAsStream("/org/onosproject/net/pi/impl/piPipeconfId.json");
private final BasicDeviceConfig basicDeviceConfig = new BasicDeviceConfig();
- private final InputStream jsonStreamBasic = PiPipeconfServiceImplTest.class
+ private final InputStream jsonStreamBasic = PiPipeconfManagerTest.class
.getResourceAsStream("/org/onosproject/net/pi/impl/basic.json");
//Services
- private PiPipeconfServiceImpl piPipeconfService;
+ private PiPipeconfManager piPipeconfService;
private MockPipeconf piPipeconf;
@Before
public void setUp() throws IOException {
- piPipeconfService = new PiPipeconfServiceImpl();
+ piPipeconfService = new PiPipeconfManager();
piPipeconf = new MockPipeconf();
completeDriverName = BASE_DRIVER + ":" + piPipeconf.id();
piPipeconf.behaviours.put(Pipeliner.class, PipelinerAdapter.class);