Madan Jampani

Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next

Showing 966 changed files with 1152 additions and 1413 deletions
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.calendar; 16 package org.onlab.onos.calendar;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" 17 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee"
21 xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" 18 xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.config; 16 package org.onlab.onos.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.config; 16 package org.onlab.onos.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.config; 16 package org.onlab.onos.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.foo; 16 package org.onlab.onos.foo;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <!-- 1 <!--
2 - ~ Licensed to the Apache Software Foundation (ASF) under one 2 + ~ Copyright 2014 Open Networking Laboratory
3 - ~ or more contributor license agreements. See the NOTICE file
4 - ~ distributed with this work for additional information
5 - ~ regarding copyright ownership. The ASF licenses this file
6 - ~ to you under the Apache License, Version 2.0 (the
7 - ~ "License"); you may not use this file except in compliance
8 - ~ with the License. You may obtain a copy of the License at
9 ~ 3 ~
10 - ~ http://www.apache.org/licenses/LICENSE-2.0 4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
11 ~ 7 ~
12 - ~ Unless required by applicable law or agreed to in writing, 8 + ~ http://www.apache.org/licenses/LICENSE-2.0
13 - ~ software distributed under the License is distributed on an 9 + ~
14 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + ~ Unless required by applicable law or agreed to in writing, software
15 - ~ KIND, either express or implied. See the License for the 11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
16 - ~ specific language governing permissions and limitations 12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - ~ under the License. 13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
18 --> 15 -->
19 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> 16 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
20 17
......
1 # 1 #
2 -# Licensed to the Apache Software Foundation (ASF) under one 2 +# Copyright 2014 Open Networking Laboratory
3 -# or more contributor license agreements. See the NOTICE file
4 -# distributed with this work for additional information
5 -# regarding copyright ownership. The ASF licenses this file
6 -# to you under the Apache License, Version 2.0 (the
7 -# "License"); you may not use this file except in compliance
8 -# with the License. You may obtain a copy of the License at
9 # 3 #
10 -# http://www.apache.org/licenses/LICENSE-2.0 4 +# Licensed under the Apache License, Version 2.0 (the "License");
5 +# you may not use this file except in compliance with the License.
6 +# You may obtain a copy of the License at
11 # 7 #
12 -# Unless required by applicable law or agreed to in writing, 8 +# http://www.apache.org/licenses/LICENSE-2.0
13 -# software distributed under the License is distributed on an 9 +#
14 -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 +# Unless required by applicable law or agreed to in writing, software
15 -# KIND, either express or implied. See the License for the 11 +# distributed under the License is distributed on an "AS IS" BASIS,
16 -# specific language governing permissions and limitations 12 +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 -# under the License. 13 +# See the License for the specific language governing permissions and
14 +# limitations under the License.
18 # 15 #
19 livetribe.slp.da.expired.services.purge.period=60 16 livetribe.slp.da.expired.services.purge.period=60
20 livetribe.slp.sa.client.connect.address=127.0.0.1 17 livetribe.slp.sa.client.connect.address=127.0.0.1
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.fwd; 16 package org.onlab.onos.fwd;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.ifwd; 16 package org.onlab.onos.ifwd;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.intent; 16 package org.onlab.onos.metrics.intent;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.intent; 16 package org.onlab.onos.metrics.intent;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.intent.cli; 16 package org.onlab.onos.metrics.intent.cli;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.intent.cli; 16 package org.onlab.onos.metrics.intent.cli;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <!-- 1 <!--
2 - ~ Licensed to the Apache Software Foundation (ASF) under one 2 + ~ Copyright 2014 Open Networking Laboratory
3 - ~ or more contributor license agreements. See the NOTICE file
4 - ~ distributed with this work for additional information
5 - ~ regarding copyright ownership. The ASF licenses this file
6 - ~ to you under the Apache License, Version 2.0 (the
7 - ~ "License"); you may not use this file except in compliance
8 - ~ with the License. You may obtain a copy of the License at
9 ~ 3 ~
10 - ~ http://www.apache.org/licenses/LICENSE-2.0 4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
11 ~ 7 ~
12 - ~ Unless required by applicable law or agreed to in writing, 8 + ~ http://www.apache.org/licenses/LICENSE-2.0
13 - ~ software distributed under the License is distributed on an 9 + ~
14 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + ~ Unless required by applicable law or agreed to in writing, software
15 - ~ KIND, either express or implied. See the License for the 11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
16 - ~ specific language governing permissions and limitations 12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - ~ under the License. 13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
18 --> 15 -->
19 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> 16 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
20 17
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.topology; 16 package org.onlab.onos.metrics.topology;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.topology; 16 package org.onlab.onos.metrics.topology;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.topology.cli; 16 package org.onlab.onos.metrics.topology.cli;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.metrics.topology.cli; 16 package org.onlab.onos.metrics.topology.cli;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <!-- 1 <!--
2 - ~ Licensed to the Apache Software Foundation (ASF) under one 2 + ~ Copyright 2014 Open Networking Laboratory
3 - ~ or more contributor license agreements. See the NOTICE file
4 - ~ distributed with this work for additional information
5 - ~ regarding copyright ownership. The ASF licenses this file
6 - ~ to you under the Apache License, Version 2.0 (the
7 - ~ "License"); you may not use this file except in compliance
8 - ~ with the License. You may obtain a copy of the License at
9 ~ 3 ~
10 - ~ http://www.apache.org/licenses/LICENSE-2.0 4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
11 ~ 7 ~
12 - ~ Unless required by applicable law or agreed to in writing, 8 + ~ http://www.apache.org/licenses/LICENSE-2.0
13 - ~ software distributed under the License is distributed on an 9 + ~
14 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + ~ Unless required by applicable law or agreed to in writing, software
15 - ~ KIND, either express or implied. See the License for the 11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
16 - ~ specific language governing permissions and limitations 12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - ~ under the License. 13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
18 --> 15 -->
19 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> 16 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
20 17
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.mobility; 16 package org.onlab.onos.mobility;
20 import static org.slf4j.LoggerFactory.getLogger; 17 import static org.slf4j.LoggerFactory.getLogger;
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.oecfg; 16 package org.onlab.onos.oecfg;
20 17
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
...@@ -76,7 +73,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro ...@@ -76,7 +73,7 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
76 73
77 // TODO: fix hard coded file path later. 74 // TODO: fix hard coded file path later.
78 private static final String DEFAULT_CONFIG_FILE = 75 private static final String DEFAULT_CONFIG_FILE =
79 - "/opt/onos/config/demo-3-roadm-2-ps.json"; 76 + "config/demo-3-roadm-2-ps.json";
80 private String configFileName = DEFAULT_CONFIG_FILE; 77 private String configFileName = DEFAULT_CONFIG_FILE;
81 78
82 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY) 79 @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
...@@ -375,4 +372,8 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro ...@@ -375,4 +372,8 @@ public class OpticalConfigProvider extends AbstractProvider implements DevicePro
375 // TODO Auto-generated method stub. 372 // TODO Auto-generated method stub.
376 } 373 }
377 374
375 + @Override
376 + public boolean isReachable(Device device) {
377 + return false;
378 + }
378 } 379 }
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.cfg; 16 package org.onlab.onos.optical.cfg;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.provisioner; 16 package org.onlab.onos.optical.provisioner;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.optical.testapp; 16 package org.onlab.onos.optical.testapp;
20 17
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.proxyarp; 16 package org.onlab.onos.proxyarp;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <?xml version="1.0" encoding="UTF-8"?> 1 <?xml version="1.0" encoding="UTF-8"?>
2 <!-- 2 <!--
3 - ~ Licensed to the Apache Software Foundation (ASF) under one 3 + ~ Copyright 2014 Open Networking Laboratory
4 - ~ or more contributor license agreements. See the NOTICE file
5 - ~ distributed with this work for additional information
6 - ~ regarding copyright ownership. The ASF licenses this file
7 - ~ to you under the Apache License, Version 2.0 (the
8 - ~ "License"); you may not use this file except in compliance
9 - ~ with the License. You may obtain a copy of the License at
10 ~ 4 ~
11 - ~ http://www.apache.org/licenses/LICENSE-2.0 5 + ~ Licensed under the Apache License, Version 2.0 (the "License");
6 + ~ you may not use this file except in compliance with the License.
7 + ~ You may obtain a copy of the License at
12 ~ 8 ~
13 - ~ Unless required by applicable law or agreed to in writing, 9 + ~ http://www.apache.org/licenses/LICENSE-2.0
14 - ~ software distributed under the License is distributed on an 10 + ~
15 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 11 + ~ Unless required by applicable law or agreed to in writing, software
16 - ~ KIND, either express or implied. See the License for the 12 + ~ distributed under the License is distributed on an "AS IS" BASIS,
17 - ~ specific language governing permissions and limitations 13 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
18 - ~ under the License. 14 + ~ See the License for the specific language governing permissions and
15 + ~ limitations under the License.
19 --> 16 -->
20 <project xmlns="http://maven.apache.org/POM/4.0.0" 17 <project xmlns="http://maven.apache.org/POM/4.0.0"
21 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 18 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
...@@ -49,6 +46,7 @@ import org.onlab.onos.net.host.HostListener; ...@@ -49,6 +46,7 @@ import org.onlab.onos.net.host.HostListener;
49 import org.onlab.onos.net.host.HostService; 46 import org.onlab.onos.net.host.HostService;
50 import org.onlab.onos.net.intent.Intent; 47 import org.onlab.onos.net.intent.Intent;
51 import org.onlab.onos.net.intent.IntentService; 48 import org.onlab.onos.net.intent.IntentService;
49 +import org.onlab.onos.net.intent.IntentState;
52 import org.onlab.onos.net.intent.MultiPointToSinglePointIntent; 50 import org.onlab.onos.net.intent.MultiPointToSinglePointIntent;
53 import org.onlab.onos.sdnip.config.BgpPeer; 51 import org.onlab.onos.sdnip.config.BgpPeer;
54 import org.onlab.onos.sdnip.config.Interface; 52 import org.onlab.onos.sdnip.config.Interface;
...@@ -148,11 +146,6 @@ public class Router implements RouteListener { ...@@ -148,11 +146,6 @@ public class Router implements RouteListener {
148 * Starts the Router. 146 * Starts the Router.
149 */ 147 */
150 public void start() { 148 public void start() {
151 -
152 - // TODO hack to enable SDN-IP now for testing
153 - isElectedLeader = true;
154 - isActivatedLeader = true;
155 -
156 bgpUpdatesExecutor.execute(new Runnable() { 149 bgpUpdatesExecutor.execute(new Runnable() {
157 @Override 150 @Override
158 public void run() { 151 public void run() {
...@@ -280,30 +273,21 @@ public class Router implements RouteListener { ...@@ -280,30 +273,21 @@ public class Router implements RouteListener {
280 // based on the matching prefix. 273 // based on the matching prefix.
281 // 274 //
282 for (Intent intent : intentService.getIntents()) { 275 for (Intent intent : intentService.getIntents()) {
283 - // 276 +
284 - // TODO: Ignore all intents that are not installed by 277 + if (!(intent instanceof MultiPointToSinglePointIntent)
285 - // the SDN-IP application. 278 + || !intent.appId().equals(appId)) {
286 - //
287 - if (!(intent instanceof MultiPointToSinglePointIntent)) {
288 continue; 279 continue;
289 } 280 }
290 MultiPointToSinglePointIntent mp2pIntent = 281 MultiPointToSinglePointIntent mp2pIntent =
291 (MultiPointToSinglePointIntent) intent; 282 (MultiPointToSinglePointIntent) intent;
292 - /*Match match = mp2pIntent.getMatch(); 283 +
293 - if (!(match instanceof PacketMatch)) { 284 + Criterion c = mp2pIntent.selector().getCriterion(Type.IPV4_DST);
294 - continue; 285 + if (c != null && c instanceof IPCriterion) {
295 - } 286 + IPCriterion ipCriterion = (IPCriterion) c;
296 - PacketMatch packetMatch = (PacketMatch) match; 287 + fetchedIntents.put(ipCriterion.ip(), mp2pIntent);
297 - Ip4Prefix prefix = packetMatch.getDstIpAddress(); 288 + } else {
298 - if (prefix == null) { 289 + log.warn("No IPV4_DST criterion found for intent {}",
299 - continue; 290 + mp2pIntent.id());
300 - }
301 - fetchedIntents.put(prefix, mp2pIntent);*/
302 - for (Criterion criterion : mp2pIntent.selector().criteria()) {
303 - if (criterion.type() == Type.IPV4_DST) {
304 - IPCriterion ipCriterion = (IPCriterion) criterion;
305 - fetchedIntents.put(ipCriterion.ip(), mp2pIntent);
306 - }
307 } 291 }
308 292
309 } 293 }
...@@ -347,6 +331,14 @@ public class Router implements RouteListener { ...@@ -347,6 +331,14 @@ public class Router implements RouteListener {
347 continue; 331 continue;
348 } 332 }
349 333
334 + IntentState state = intentService.getIntentState(fetchedIntent.id());
335 + if (state == IntentState.WITHDRAWING ||
336 + state == IntentState.WITHDRAWN) {
337 + // The intent has been withdrawn but according to our route
338 + // table it should be installed. We'll reinstall it.
339 + addIntents.add(Pair.of(prefix, inMemoryIntent));
340 + }
341 +
350 // 342 //
351 // If IN-MEMORY Intent is same as the FETCHED Intent, 343 // If IN-MEMORY Intent is same as the FETCHED Intent,
352 // store the FETCHED Intent in the local memory. 344 // store the FETCHED Intent in the local memory.
...@@ -437,20 +429,9 @@ public class Router implements RouteListener { ...@@ -437,20 +429,9 @@ public class Router implements RouteListener {
437 private boolean compareMultiPointToSinglePointIntents( 429 private boolean compareMultiPointToSinglePointIntents(
438 MultiPointToSinglePointIntent intent1, 430 MultiPointToSinglePointIntent intent1,
439 MultiPointToSinglePointIntent intent2) { 431 MultiPointToSinglePointIntent intent2) {
440 - /*Match match1 = intent1.getMatch(); 432 +
441 - Match match2 = intent2.getMatch(); 433 + return Objects.equal(intent1.appId(), intent2.appId()) &&
442 - Action action1 = intent1.getAction(); 434 + Objects.equal(intent1.selector(), intent2.selector()) &&
443 - Action action2 = intent2.getAction();
444 - Set<SwitchPort> ingressPorts1 = intent1.getIngressPorts();
445 - Set<SwitchPort> ingressPorts2 = intent2.getIngressPorts();
446 - SwitchPort egressPort1 = intent1.getEgressPort();
447 - SwitchPort egressPort2 = intent2.getEgressPort();
448 -
449 - return Objects.equal(match1, match2) &&
450 - Objects.equal(action1, action2) &&
451 - Objects.equal(egressPort1, egressPort2) &&
452 - Objects.equal(ingressPorts1, ingressPorts2);*/
453 - return Objects.equal(intent1.selector(), intent2.selector()) &&
454 Objects.equal(intent1.treatment(), intent2.treatment()) && 435 Objects.equal(intent1.treatment(), intent2.treatment()) &&
455 Objects.equal(intent1.ingressPoints(), intent2.ingressPoints()) && 436 Objects.equal(intent1.ingressPoints(), intent2.ingressPoints()) &&
456 Objects.equal(intent1.egressPoint(), intent2.egressPoint()); 437 Objects.equal(intent1.egressPoint(), intent2.egressPoint());
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
...@@ -80,6 +77,10 @@ public class SdnIp implements SdnIpService { ...@@ -80,6 +77,10 @@ public class SdnIp implements SdnIpService {
80 router = new Router(appId, intentService, hostService, config, interfaceService); 77 router = new Router(appId, intentService, hostService, config, interfaceService);
81 router.start(); 78 router.start();
82 79
80 + // Manually set the router as the leader to allow testing
81 + // TODO change this when we get a leader election
82 + router.leaderChanged(true);
83 +
83 bgpSessionManager = new BgpSessionManager(router); 84 bgpSessionManager = new BgpSessionManager(router);
84 bgpSessionManager.startUp(2000); // TODO 85 bgpSessionManager.startUp(2000); // TODO
85 86
...@@ -102,6 +103,11 @@ public class SdnIp implements SdnIpService { ...@@ -102,6 +103,11 @@ public class SdnIp implements SdnIpService {
102 return router.getRoutes(); 103 return router.getRoutes();
103 } 104 }
104 105
106 + @Override
107 + public void modifyPrimary(boolean isPrimary) {
108 + router.leaderChanged(isPrimary);
109 + }
110 +
105 static String dpidToUri(String dpid) { 111 static String dpidToUri(String dpid) {
106 return "of:" + dpid.replace(":", ""); 112 return "of:" + dpid.replace(":", "");
107 } 113 }
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
...@@ -39,4 +36,12 @@ public interface SdnIpService { ...@@ -39,4 +36,12 @@ public interface SdnIpService {
39 * @return the SDN-IP routes 36 * @return the SDN-IP routes
40 */ 37 */
41 public Collection<RouteEntry> getRoutes(); 38 public Collection<RouteEntry> getRoutes();
39 +
40 + /**
41 + * Changes whether this SDN-IP instance is the primary or not based on the
42 + * boolean parameter.
43 + *
44 + * @param isPrimary true if the instance is primary, false if it is not
45 + */
46 + public void modifyPrimary(boolean isPrimary);
42 } 47 }
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.bgp; 16 package org.onlab.onos.sdnip.bgp;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.bgp; 16 package org.onlab.onos.sdnip.bgp;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.bgp; 16 package org.onlab.onos.sdnip.bgp;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.bgp; 16 package org.onlab.onos.sdnip.bgp;
20 17
...@@ -1597,7 +1594,7 @@ public class BgpSession extends SimpleChannelHandler { ...@@ -1597,7 +1594,7 @@ public class BgpSession extends SimpleChannelHandler {
1597 // 1594 //
1598 // Parse the KEEPALIVE message: nothing to do 1595 // Parse the KEEPALIVE message: nothing to do
1599 // 1596 //
1600 - log.debug("BGP RX KEEPALIVE message from {}", remoteAddress); 1597 + log.trace("BGP RX KEEPALIVE message from {}", remoteAddress);
1601 1598
1602 // Start the Session Timeout timer 1599 // Start the Session Timeout timer
1603 restartSessionTimeoutTimer(ctx); 1600 restartSessionTimeoutTimer(ctx);
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.bgp; 16 package org.onlab.onos.sdnip.bgp;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.cli; 16 package org.onlab.onos.sdnip.cli;
20 17
......
1 +package org.onlab.onos.sdnip.cli;
2 +
3 +import org.apache.karaf.shell.commands.Argument;
4 +import org.apache.karaf.shell.commands.Command;
5 +import org.onlab.onos.cli.AbstractShellCommand;
6 +import org.onlab.onos.sdnip.SdnIpService;
7 +
8 +/**
9 + * Command to change whether this SDNIP instance is primary or not.
10 + */
11 +@Command(scope = "onos", name = "sdnip-set-primary",
12 + description = "Changes the primary status of this SDN-IP instance")
13 +public class PrimaryChangeCommand extends AbstractShellCommand {
14 +
15 + @Argument(index = 0, name = "isPrimary",
16 + description = "True if this instance should be primary, false if not",
17 + required = true, multiValued = false)
18 + boolean isPrimary = false;
19 +
20 + @Override
21 + protected void execute() {
22 + get(SdnIpService.class).modifyPrimary(isPrimary);
23 + }
24 +
25 +}
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.cli; 16 package org.onlab.onos.sdnip.cli;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip.config; 16 package org.onlab.onos.sdnip.config;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 16
20 /** 17 /**
......
1 <!-- 1 <!--
2 - ~ Licensed to the Apache Software Foundation (ASF) under one 2 + ~ Copyright 2014 Open Networking Laboratory
3 - ~ or more contributor license agreements. See the NOTICE file
4 - ~ distributed with this work for additional information
5 - ~ regarding copyright ownership. The ASF licenses this file
6 - ~ to you under the Apache License, Version 2.0 (the
7 - ~ "License"); you may not use this file except in compliance
8 - ~ with the License. You may obtain a copy of the License at
9 ~ 3 ~
10 - ~ http://www.apache.org/licenses/LICENSE-2.0 4 + ~ Licensed under the Apache License, Version 2.0 (the "License");
5 + ~ you may not use this file except in compliance with the License.
6 + ~ You may obtain a copy of the License at
11 ~ 7 ~
12 - ~ Unless required by applicable law or agreed to in writing, 8 + ~ http://www.apache.org/licenses/LICENSE-2.0
13 - ~ software distributed under the License is distributed on an 9 + ~
14 - ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + ~ Unless required by applicable law or agreed to in writing, software
15 - ~ KIND, either express or implied. See the License for the 11 + ~ distributed under the License is distributed on an "AS IS" BASIS,
16 - ~ specific language governing permissions and limitations 12 + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - ~ under the License. 13 + ~ See the License for the specific language governing permissions and
14 + ~ limitations under the License.
18 --> 15 -->
19 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> 16 <blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
20 17
...@@ -25,5 +22,8 @@ ...@@ -25,5 +22,8 @@
25 <command> 22 <command>
26 <action class="org.onlab.onos.sdnip.cli.RoutesListCommand"/> 23 <action class="org.onlab.onos.sdnip.cli.RoutesListCommand"/>
27 </command> 24 </command>
25 + <command>
26 + <action class="org.onlab.onos.sdnip.cli.PrimaryChangeCommand"/>
27 + </command>
28 </command-bundle> 28 </command-bundle>
29 </blueprint> 29 </blueprint>
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
1 /* 1 /*
2 - * Licensed to the Apache Software Foundation (ASF) under one 2 + * Copyright 2014 Open Networking Laboratory
3 - * or more contributor license agreements. See the NOTICE file
4 - * distributed with this work for additional information
5 - * regarding copyright ownership. The ASF licenses this file
6 - * to you under the Apache License, Version 2.0 (the
7 - * "License"); you may not use this file except in compliance
8 - * with the License. You may obtain a copy of the License at
9 * 3 *
10 - * http://www.apache.org/licenses/LICENSE-2.0 4 + * Licensed under the Apache License, Version 2.0 (the "License");
5 + * you may not use this file except in compliance with the License.
6 + * You may obtain a copy of the License at
11 * 7 *
12 - * Unless required by applicable law or agreed to in writing, 8 + * http://www.apache.org/licenses/LICENSE-2.0
13 - * software distributed under the License is distributed on an 9 + *
14 - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY 10 + * Unless required by applicable law or agreed to in writing, software
15 - * KIND, either express or implied. See the License for the 11 + * distributed under the License is distributed on an "AS IS" BASIS,
16 - * specific language governing permissions and limitations 12 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
17 - * under the License. 13 + * See the License for the specific language governing permissions and
14 + * limitations under the License.
18 */ 15 */
19 package org.onlab.onos.sdnip; 16 package org.onlab.onos.sdnip;
20 17
......
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.
This diff is collapsed. Click to expand it.