Re-organize intent related packages

- Delete classes under intent package except for ApplicaitonIntent,
  PacketConnectivityIntent, and OpticalConnectivityIntent
- Move PacketConnectivityIntent and OpticalConnectivityIntent under
  net.onrc.onos.api.newintent package
- Adapt BatchOperation related changes for Intent and IntentId class

This is for ONOS-1887.

Change-Id: I4d25a0f8cbba806e9dd6e00333b6c7157c854658
diff --git a/src/main/java/net/onrc/onos/api/newintent/OpticalConnectivityIntent.java b/src/main/java/net/onrc/onos/api/newintent/OpticalConnectivityIntent.java
new file mode 100644
index 0000000..174d8c0
--- /dev/null
+++ b/src/main/java/net/onrc/onos/api/newintent/OpticalConnectivityIntent.java
@@ -0,0 +1,49 @@
+package net.onrc.onos.api.newintent;
+
+import net.onrc.onos.core.util.SwitchPort;
+
+// TODO: consider if this intent should be sub-class of ConnectivityIntent
+/**
+ * An optical layer Intent for a connectivity from a transponder port to another
+ * transponder port.
+ * <p>
+ * This class doesn't accepts lambda specifier. This class computes path between
+ * ports and assign lambda automatically. The lambda can be specified using
+ * OpticalPathFlow class.
+ */
+public class OpticalConnectivityIntent extends AbstractIntent {
+    protected SwitchPort srcSwitchPort;
+    protected SwitchPort dstSwitchPort;
+
+    /**
+     * Constructor.
+     *
+     * @param id ID for this new Intent object.
+     * @param srcSwitchPort The source transponder port.
+     * @param dstSwitchPort The destination transponder port.
+     */
+    public OpticalConnectivityIntent(IntentId id,
+            SwitchPort srcSwitchPort, SwitchPort dstSwitchPort) {
+        super(id);
+        this.srcSwitchPort = srcSwitchPort;
+        this.dstSwitchPort = dstSwitchPort;
+    }
+
+    /**
+     * Gets source transponder port.
+     *
+     * @return The source transponder port.
+     */
+    public SwitchPort getSrcSwitchPort() {
+        return srcSwitchPort;
+    }
+
+    /**
+     * Gets destination transponder port.
+     *
+     * @return The source transponder port.
+     */
+    public SwitchPort getDstSwitchPort() {
+        return dstSwitchPort;
+    }
+}