From 83e090e3201c7a03ef756da6d146d849d7f82d8c Mon Sep 17 00:00:00 2001 From: Thomas Vachuska Date: Wed, 22 Oct 2014 14:25:35 -0700 Subject: [PATCH] Adding intent operations batch abstraction. Adding copyright to intent and flows. --- .../net/{intent => flow}/BatchOperation.java | 22 ++++++++-- .../{intent => flow}/BatchOperationEntry.java | 22 ++++++++-- .../onos/net/flow/BatchOperationResult.java | 18 +++++++++ .../onos/net/flow/BatchOperationTarget.java | 26 ++++++++++++ .../net/flow/CompletedBatchOperation.java | 18 +++++++++ .../onlab/onos/net/flow/DefaultFlowEntry.java | 18 +++++++++ .../onlab/onos/net/flow/DefaultFlowRule.java | 18 +++++++++ .../onos/net/flow/DefaultTrafficSelector.java | 18 +++++++++ .../net/flow/DefaultTrafficTreatment.java | 18 +++++++++ .../org/onlab/onos/net/flow/FlowEntry.java | 18 +++++++++ .../java/org/onlab/onos/net/flow/FlowId.java | 18 +++++++++ .../org/onlab/onos/net/flow/FlowRule.java | 19 ++++++++- .../onos/net/flow/FlowRuleBatchEntry.java | 19 ++++++++- .../onos/net/flow/FlowRuleBatchOperation.java | 20 +++++++++- .../onlab/onos/net/flow/FlowRuleEvent.java | 18 +++++++++ .../onlab/onos/net/flow/FlowRuleListener.java | 18 +++++++++ .../onlab/onos/net/flow/FlowRuleProvider.java | 19 ++++++++- .../net/flow/FlowRuleProviderRegistry.java | 18 +++++++++ .../net/flow/FlowRuleProviderService.java | 18 +++++++++ .../onlab/onos/net/flow/FlowRuleService.java | 18 +++++++++ .../onlab/onos/net/flow/FlowRuleStore.java | 18 +++++++++ .../onos/net/flow/FlowRuleStoreDelegate.java | 18 +++++++++ .../onlab/onos/net/flow/StoredFlowEntry.java | 18 +++++++++ .../onlab/onos/net/flow/TrafficSelector.java | 18 +++++++++ .../onlab/onos/net/flow/TrafficTreatment.java | 18 +++++++++ .../org/onlab/onos/net/flow/Treatment.java | 18 +++++++++ .../onos/net/flow/criteria/Criteria.java | 18 +++++++++ .../onos/net/flow/criteria/Criterion.java | 18 +++++++++ .../onos/net/flow/criteria/package-info.java | 19 +++++++++ .../net/flow/instructions/Instruction.java | 18 +++++++++ .../net/flow/instructions/Instructions.java | 18 +++++++++ .../L2ModificationInstruction.java | 18 +++++++++ .../L3ModificationInstruction.java | 18 +++++++++ .../net/flow/instructions/package-info.java | 19 +++++++++ .../org/onlab/onos/net/flow/package-info.java | 19 +++++++++ .../onos/net/intent/BatchOperationTarget.java | 10 ----- .../onos/net/intent/ConnectivityIntent.java | 18 +++++++++ .../onos/net/intent/HostToHostIntent.java | 18 +++++++++ .../org/onlab/onos/net/intent/Intent.java | 19 +++++++++ .../onos/net/intent/IntentBatchOperation.java | 40 ------------------- .../onlab/onos/net/intent/IntentCompiler.java | 18 +++++++++ .../onlab/onos/net/intent/IntentEvent.java | 18 +++++++++ .../onos/net/intent/IntentException.java | 18 +++++++++ .../net/intent/IntentExtensionService.java | 18 +++++++++ .../org/onlab/onos/net/intent/IntentId.java | 20 ++++++++++ .../onos/net/intent/IntentInstaller.java | 18 +++++++++ .../onlab/onos/net/intent/IntentListener.java | 18 +++++++++ .../onos/net/intent/IntentOperations.java | 25 +++++++++++- .../onlab/onos/net/intent/IntentService.java | 26 +++++++++++- .../onlab/onos/net/intent/IntentState.java | 18 +++++++++ .../onlab/onos/net/intent/IntentStore.java | 18 +++++++++ .../onos/net/intent/IntentStoreDelegate.java | 18 +++++++++ .../onos/net/intent/LinkCollectionIntent.java | 18 +++++++++ .../intent/MultiPointToSinglePointIntent.java | 18 +++++++++ .../org/onlab/onos/net/intent/PathIntent.java | 18 +++++++++ .../onos/net/intent/PointToPointIntent.java | 18 +++++++++ .../intent/SinglePointToMultiPointIntent.java | 18 +++++++++ .../onlab/onos/net/intent/package-info.java | 19 +++++++++ .../onos/net/intent/FakeIntentManager.java | 5 +++ .../onos/net/intent/impl/IntentManager.java | 6 +++ .../net/flow/impl/FlowRuleManagerTest.java | 2 +- .../of/flow/impl/OpenFlowRuleProvider.java | 2 +- 62 files changed, 1051 insertions(+), 65 deletions(-) rename core/api/src/main/java/org/onlab/onos/net/{intent => flow}/BatchOperation.java (74%) rename core/api/src/main/java/org/onlab/onos/net/{intent => flow}/BatchOperationEntry.java (67%) create mode 100644 core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java delete mode 100644 core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationTarget.java delete mode 100644 core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchOperation.java diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperation.java b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperation.java similarity index 74% rename from core/api/src/main/java/org/onlab/onos/net/intent/BatchOperation.java rename to core/api/src/main/java/org/onlab/onos/net/flow/BatchOperation.java index 7b577697b2..38f0211953 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperation.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperation.java @@ -1,5 +1,22 @@ -package org.onlab.onos.net.intent; -//TODO is this the right package? +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.onlab.onos.net.flow; import static com.google.common.base.Preconditions.checkNotNull; @@ -14,7 +31,6 @@ import java.util.List; * @param the enum of operators
* This enum must be defined in each sub-classes. */ -@Deprecated public abstract class BatchOperation> { private final List ops; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationEntry.java b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationEntry.java similarity index 67% rename from core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationEntry.java rename to core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationEntry.java index 1f0de83abd..2ea7053c14 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationEntry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationEntry.java @@ -1,5 +1,22 @@ -package org.onlab.onos.net.intent; -//TODO is this the right package? +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.onlab.onos.net.flow; import java.util.Objects; @@ -11,7 +28,6 @@ import com.google.common.base.MoreObjects; * This is the interface to classes which are maintained by BatchOperation as * its entries. */ -@Deprecated public class BatchOperationEntry, U extends BatchOperationTarget> { private final T operator; private final U target; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java index 43fd6943f3..6352b539c3 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationResult.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.List; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java new file mode 100644 index 0000000000..e73e3a8795 --- /dev/null +++ b/core/api/src/main/java/org/onlab/onos/net/flow/BatchOperationTarget.java @@ -0,0 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.onlab.onos.net.flow; + +/** + * An interface of the class which is assigned to BatchOperation. + */ +public interface BatchOperationTarget { + +} diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java b/core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java index e9889cdafb..841e948a34 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/CompletedBatchOperation.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.List; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java index cf448cb66b..59aed23718 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowEntry.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java index a6593a8718..53a94bbff8 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultFlowRule.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java index f175bd3558..abb29a6d34 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.HashMap; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java index 5e64c6422b..b4d8c3e009 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.LinkedList; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java index cdccaa95e1..1e6ce52dbb 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowEntry.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java index 52eac0a41a..142e352dcf 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowId.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import com.google.common.base.Objects; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java index 3ac277d2fe..718edfeda6 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRule.java @@ -1,7 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.net.DeviceId; -import org.onlab.onos.net.intent.BatchOperationTarget; /** * Represents a generalized match & action pair to be applied to diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java index d5a1472d33..ee85ea8311 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchEntry.java @@ -1,7 +1,24 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation; -import org.onlab.onos.net.intent.BatchOperationEntry; public class FlowRuleBatchEntry diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java index 74ef165e1b..f078fb9cbc 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleBatchOperation.java @@ -1,9 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.Collection; -import org.onlab.onos.net.intent.BatchOperation; - public class FlowRuleBatchOperation extends BatchOperation { diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java index 97efa5a21f..e511be69de 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleEvent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.event.AbstractEvent; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java index 114732b5a6..eddaf057fe 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleListener.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.event.EventListener; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java index 3592e394e1..0b2c3d8022 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProvider.java @@ -1,9 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.concurrent.Future; import org.onlab.onos.ApplicationId; -import org.onlab.onos.net.intent.BatchOperation; import org.onlab.onos.net.provider.Provider; /** diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java index 099d9f4095..25b00c4326 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderRegistry.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.net.provider.ProviderRegistry; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java index 8164579731..bacff0dbcd 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleProviderService.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.net.DeviceId; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java index 6d04810fde..0b6f6c79a6 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleService.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.concurrent.Future; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java index abb9a10b1c..63b7f77609 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStore.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.ApplicationId; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java index 119712bdaa..4e5ebf6dd1 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/FlowRuleStoreDelegate.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.store.StoreDelegate; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java b/core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java index e68ed68c3f..9ba53e9aa3 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/StoredFlowEntry.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java index 41bceb8991..b4d566c8a5 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficSelector.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.Set; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java index fe213283aa..a5761384bc 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/TrafficTreatment.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import java.util.List; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java b/core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java index 8318b66986..877da65c12 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/Treatment.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow; import org.onlab.onos.net.PortNumber; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java index ebd672c6e7..fb5fb97bb8 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criteria.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.criteria; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java index 567e10000f..53378523d4 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/Criterion.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.criteria; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java index 82eb210341..fabf82e867 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/criteria/package-info.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /** * Traffic selection criteria model. */ diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java index f05d238dee..084ffe467d 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instruction.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.instructions; /** diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java index b2ebdeeb9b..988c52f9fb 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/Instructions.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.instructions; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java index 2152532cfd..35acd16cc6 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L2ModificationInstruction.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.instructions; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java index 7ec8c8489f..8aff5df6a1 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/L3ModificationInstruction.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.flow.instructions; import static com.google.common.base.MoreObjects.toStringHelper; diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java index 01b68adfab..067cd012b2 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/instructions/package-info.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /** * Traffic treatment model. */ diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java b/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java index 76bee785b5..8fd6008df5 100644 --- a/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java +++ b/core/api/src/main/java/org/onlab/onos/net/flow/package-info.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /** * Flow rule model & related services API definitions. */ diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationTarget.java b/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationTarget.java deleted file mode 100644 index d2d04e7047..0000000000 --- a/core/api/src/main/java/org/onlab/onos/net/intent/BatchOperationTarget.java +++ /dev/null @@ -1,10 +0,0 @@ -package org.onlab.onos.net.intent; -//TODO is this the right package? - -/** - * An interface of the class which is assigned to BatchOperation. - */ -@Deprecated -public interface BatchOperationTarget { - -} diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java index 8d634a4f5d..710ae4e81c 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/ConnectivityIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.collect.ImmutableSet; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java index 2d42f58f49..795f681b70 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/HostToHostIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/Intent.java b/core/api/src/main/java/org/onlab/onos/net/intent/Intent.java index 4c11f5786c..b5fefb2872 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/Intent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/Intent.java @@ -1,7 +1,26 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import org.onlab.onos.ApplicationId; import org.onlab.onos.net.NetworkResource; +import org.onlab.onos.net.flow.BatchOperationTarget; import java.util.Collection; import java.util.Objects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchOperation.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchOperation.java deleted file mode 100644 index 75e240f102..0000000000 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentBatchOperation.java +++ /dev/null @@ -1,40 +0,0 @@ -package org.onlab.onos.net.intent; - -/** - * A list of intent operations. - */ -@Deprecated -public class IntentBatchOperation extends - BatchOperation> { - /** - * The intent operators. - */ - public enum Operator { - ADD, - REMOVE, - } - - /** - * Adds an add-intent operation. - * - * @param intent the intent to be added - * @return the IntentBatchOperation object if succeeded, null otherwise - */ - public IntentBatchOperation addAddIntentOperation(Intent intent) { - return (null == super.addOperation( - new BatchOperationEntry(Operator.ADD, intent))) - ? null : this; - } - - /** - * Adds a remove-intent operation. - * - * @param id the ID of intent to be removed - * @return the IntentBatchOperation object if succeeded, null otherwise - */ - public IntentBatchOperation addRemoveIntentOperation(IntentId id) { - return (null == super.addOperation( - new BatchOperationEntry(Operator.REMOVE, id))) - ? null : this; - } -} diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java index dbc3cc44ba..c54b601249 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentCompiler.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import java.util.List; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java index 742a590f82..22a24f928d 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentEvent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import org.onlab.onos.event.AbstractEvent; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java index fff55bed4b..55ca32e6f2 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentException.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; /** diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java index 50e803c744..31db2ec182 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentExtensionService.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import java.util.Map; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java index 08ab7fa1d6..8cfe6fdc46 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentId.java @@ -1,5 +1,25 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; +import org.onlab.onos.net.flow.BatchOperationTarget; + /** * Intent identifier suitable as an external key. *

diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java index c403846d28..22669e5afa 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentInstaller.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import java.util.List; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java index c00c1f6df7..aa1a4a054e 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentListener.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import org.onlab.onos.event.EventListener; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java index ee7389ae1e..32f0414285 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentOperations.java @@ -1,9 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.collect.ImmutableList; import java.util.List; +import static com.google.common.base.Preconditions.checkNotNull; import static org.onlab.onos.net.intent.IntentOperation.Type.REPLACE; import static org.onlab.onos.net.intent.IntentOperation.Type.SUBMIT; import static org.onlab.onos.net.intent.IntentOperation.Type.WITHDRAW; @@ -47,7 +66,7 @@ public final class IntentOperations { */ public static final class Builder { - ImmutableList.Builder builder = ImmutableList.builder(); + private final ImmutableList.Builder builder = ImmutableList.builder(); // Public construction is forbidden. private Builder() { @@ -60,6 +79,7 @@ public final class IntentOperations { * @return self */ public Builder addSubmitOperation(Intent intent) { + checkNotNull(intent, "Intent cannot be null"); builder.add(new IntentOperation(SUBMIT, intent.id(), intent)); return this; } @@ -72,6 +92,8 @@ public final class IntentOperations { * @return self */ public Builder addReplaceOperation(IntentId oldIntentId, Intent newIntent) { + checkNotNull(oldIntentId, "Intent ID cannot be null"); + checkNotNull(newIntent, "Intent cannot be null"); builder.add(new IntentOperation(REPLACE, oldIntentId, newIntent)); return this; } @@ -83,6 +105,7 @@ public final class IntentOperations { * @return self */ public Builder addWithdrawOperation(IntentId intentId) { + checkNotNull(intentId, "Intent ID cannot be null"); builder.add(new IntentOperation(WITHDRAW, intentId, null)); return this; } diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java index 8c098a3357..6b89a680f9 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentService.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; @@ -28,7 +46,13 @@ public interface IntentService { */ void withdraw(Intent intent); - // void replace(IntentId oldIntentId, Intent newIntent); + /** + * Replaces the specified intent with a new one. + * + * @param oldIntentId identifier of the old intent being replaced + * @param newIntent new intent replacing the old one + */ + void replace(IntentId oldIntentId, Intent newIntent); /** * Submits a batch of submit & withdraw operations. Such a batch is diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java index bd140af656..38662d20a9 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentState.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; /** diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java index c234b0ff1a..7a62d61dd4 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStore.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import org.onlab.onos.store.Store; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java index 6c37db82a7..ab117d2ed5 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/IntentStoreDelegate.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import org.onlab.onos.store.StoreDelegate; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java index 1b465aa492..65d1ba8e15 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/LinkCollectionIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java index 7c638aa194..13324d0ad8 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/MultiPointToSinglePointIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java index 1e41120b7b..d7996c9c4e 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/PathIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java index d170c2727c..7b91cdfe52 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/PointToPointIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java b/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java index 62e36e7d61..e5790d02a3 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/SinglePointToMultiPointIntent.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package org.onlab.onos.net.intent; import com.google.common.base.MoreObjects; diff --git a/core/api/src/main/java/org/onlab/onos/net/intent/package-info.java b/core/api/src/main/java/org/onlab/onos/net/intent/package-info.java index 3e5e46fdcf..d7efa521a0 100644 --- a/core/api/src/main/java/org/onlab/onos/net/intent/package-info.java +++ b/core/api/src/main/java/org/onlab/onos/net/intent/package-info.java @@ -1,3 +1,22 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ + /** * Set of abstractions for conveying high-level intents for treatment of * selected network traffic by allowing applications to express the diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java b/core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java index 4204f1ec4e..cb982ba6fe 100644 --- a/core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java +++ b/core/api/src/test/java/org/onlab/onos/net/intent/FakeIntentManager.java @@ -171,6 +171,11 @@ public class FakeIntentManager implements TestableIntentService { executeWithdraw(intent); } + @Override + public void replace(IntentId oldIntentId, Intent newIntent) { + // TODO: implement later + } + @Override public Future execute(IntentOperations operations) { // TODO: implement later diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java index 1a6ca38bfe..3a3d4764ba 100644 --- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java +++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java @@ -124,6 +124,12 @@ public class IntentManager executor.execute(new IntentTask(WITHDRAWING, intent)); } + // FIXME: implement this method + @Override + public void replace(IntentId oldIntentId, Intent newIntent) { + throw new UnsupportedOperationException("execute() is not implemented yet"); + } + // FIXME: implement this method @Override public Future execute(IntentOperations operations) { diff --git a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java index 2a7384bc31..577728519a 100644 --- a/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java +++ b/core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java @@ -45,7 +45,7 @@ import org.onlab.onos.net.flow.TrafficSelector; import org.onlab.onos.net.flow.TrafficTreatment; import org.onlab.onos.net.flow.criteria.Criterion; import org.onlab.onos.net.flow.instructions.Instruction; -import org.onlab.onos.net.intent.BatchOperation; +import org.onlab.onos.net.flow.BatchOperation; import org.onlab.onos.net.provider.AbstractProvider; import org.onlab.onos.net.provider.ProviderId; import org.onlab.onos.store.trivial.impl.SimpleFlowRuleStore; diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java index d18a72f919..03b9c7d8f2 100644 --- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java +++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/OpenFlowRuleProvider.java @@ -31,7 +31,7 @@ import org.onlab.onos.net.flow.FlowRuleBatchEntry.FlowRuleOperation; import org.onlab.onos.net.flow.FlowRuleProvider; import org.onlab.onos.net.flow.FlowRuleProviderRegistry; import org.onlab.onos.net.flow.FlowRuleProviderService; -import org.onlab.onos.net.intent.BatchOperation; +import org.onlab.onos.net.flow.BatchOperation; import org.onlab.onos.net.provider.AbstractProvider; import org.onlab.onos.net.provider.ProviderId; import org.onlab.onos.net.topology.TopologyService;