Move optical-model dependency to openflow-base

- move optical dependency from openflow meta app to openflow-base

Change-Id: Ibbfdb88b252dd77e103eec7d776f4fde9b33bcab

 APPS = [
-    'org.onosproject.optical-model',
     'org.onosproject.openflow-base',
     'org.onosproject.hostprovider',
     'org.onosproject.lldpprovider',

@@ -33,7 +33,6 @@
         <onos.app.title>OpenFlow Meta App</onos.app.title>
         <onos.app.category>Provider</onos.app.category>
         <onos.app.requires>
-            org.onosproject.optical-model,
             org.onosproject.openflow-base,
             org.onosproject.hostprovider,
             org.onosproject.lldpprovider

@@ -9,6 +9,10 @@ BUNDLES = [
     '//providers/openflow/meter:onos-providers-openflow-meter',
 ]
 
+APPS = [
+    'org.onosproject.optical-model',
+]
+
 onos_app (
     app_name = 'org.onosproject.openflow-base',
     title = 'OpenFlow Provider',
@@ -16,4 +20,5 @@ onos_app (
     url = 'http://onosproject.org',
     description = 'OpenFlow protocol southbound providers.',
     included_bundles = BUNDLES,
+    required_apps = APPS,
 )

@@ -17,7 +17,7 @@
 <app name="org.onosproject.openflow-base" origin="ON.Lab" version="${project.version}"
      category="Provider" url="http://onosproject.org" title="OpenFlow Provider"
      featuresRepo="mvn:${project.groupId}/${project.artifactId}/${project.version}/xml/features"
-     features="${project.artifactId}">
+     features="${project.artifactId}" apps="org.onosproject.optical-model">
     <description>${project.description}</description>
     <artifact>mvn:${project.groupId}/onos-of-api/${project.version}</artifact>
     <artifact>mvn:${project.groupId}/onos-of-ctl/${project.version}</artifact>