ONOS-3931: move DeviceKey manager and store implementations from incubator to core
Change-Id: I2c26d7a4106be5b8f631b010cc7a167de957c9d2
Showing
6 changed files
with
7 additions
and
7 deletions
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.incubator.net.key.impl; | 17 | +package org.onosproject.net.key.impl; |
| 18 | 18 | ||
| 19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; |
| 20 | import org.apache.felix.scr.annotations.Component; | 20 | import org.apache.felix.scr.annotations.Component; | ... | ... |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.incubator.net.key.impl; | 17 | +package org.onosproject.net.key.impl; |
| 18 | 18 | ||
| 19 | import com.google.common.collect.Lists; | 19 | import com.google.common.collect.Lists; |
| 20 | import org.junit.After; | 20 | import org.junit.After; |
| ... | @@ -29,7 +29,7 @@ import org.onosproject.net.key.DeviceKeyEvent; | ... | @@ -29,7 +29,7 @@ import org.onosproject.net.key.DeviceKeyEvent; |
| 29 | import org.onosproject.net.key.DeviceKeyId; | 29 | import org.onosproject.net.key.DeviceKeyId; |
| 30 | import org.onosproject.net.key.DeviceKeyListener; | 30 | import org.onosproject.net.key.DeviceKeyListener; |
| 31 | import org.onosproject.net.key.DeviceKeyService; | 31 | import org.onosproject.net.key.DeviceKeyService; |
| 32 | -import org.onosproject.incubator.store.key.impl.DistributedDeviceKeyStore; | 32 | +import org.onosproject.store.key.impl.DistributedDeviceKeyStore; |
| 33 | import org.onosproject.net.NetTestTools; | 33 | import org.onosproject.net.NetTestTools; |
| 34 | import org.onosproject.store.service.TestStorageService; | 34 | import org.onosproject.store.service.TestStorageService; |
| 35 | 35 | ... | ... |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.incubator.store.key.impl; | 17 | +package org.onosproject.store.key.impl; |
| 18 | 18 | ||
| 19 | import org.apache.felix.scr.annotations.Activate; | 19 | import org.apache.felix.scr.annotations.Activate; |
| 20 | import org.apache.felix.scr.annotations.Component; | 20 | import org.apache.felix.scr.annotations.Component; | ... | ... |
| ... | @@ -18,4 +18,4 @@ | ... | @@ -18,4 +18,4 @@ |
| 18 | * A distributed device key store implementation that stores device key | 18 | * A distributed device key store implementation that stores device key |
| 19 | * data consistently across the cluster. | 19 | * data consistently across the cluster. |
| 20 | */ | 20 | */ |
| 21 | -package org.onosproject.incubator.store.key.impl; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file |
| 21 | +package org.onosproject.store.key.impl; | ||
| ... | \ No newline at end of file | ... | \ No newline at end of file | ... | ... |
| ... | @@ -14,7 +14,7 @@ | ... | @@ -14,7 +14,7 @@ |
| 14 | * limitations under the License. | 14 | * limitations under the License. |
| 15 | */ | 15 | */ |
| 16 | 16 | ||
| 17 | -package org.onosproject.incubator.store.key.impl; | 17 | +package org.onosproject.store.key.impl; |
| 18 | 18 | ||
| 19 | import org.junit.After; | 19 | import org.junit.After; |
| 20 | import org.junit.Before; | 20 | import org.junit.Before; | ... | ... |
-
Please register or login to post a comment