Merge branch 'hotfix/0.2.2'

No bugs, only license headers in files.
globocom · Sep 4, 2014 · 7736958 · 7736958
2 parents e6020e3 + 58732d5
commit 7736958
Show file tree

Hide file tree

Showing 44 changed files with 604 additions and 208 deletions.
diff --git a/networkapiclient/Ambiente.py b/networkapiclient/Ambiente.py
@@ -1,10 +1,18 @@
 # -*- coding:utf-8 -*-
-"""
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-
-"""
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.exception import InvalidParameterError

diff --git a/networkapiclient/AmbienteLogico.py b/networkapiclient/AmbienteLogico.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param

diff --git a/networkapiclient/BlockRule.py b/networkapiclient/BlockRule.py
@@ -1,4 +1,18 @@
 # -*- coding:utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 

diff --git a/networkapiclient/ClientFactory.py b/networkapiclient/ClientFactory.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.Ambiente import Ambiente
 from networkapiclient.Equipamento import Equipamento

diff --git a/networkapiclient/Config.py b/networkapiclient/Config.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: masilva / S2it
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 
 class IP_VERSION:

diff --git a/networkapiclient/DireitoGrupoEquipamento.py b/networkapiclient/DireitoGrupoEquipamento.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param

diff --git a/networkapiclient/DivisaoDc.py b/networkapiclient/DivisaoDc.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param

diff --git a/networkapiclient/EnvironmentVIP.py b/networkapiclient/EnvironmentVIP.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: s2it / masilva
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.exception import InvalidParameterError

diff --git a/networkapiclient/Equipamento.py b/networkapiclient/Equipamento.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 import urllib
 from networkapiclient.GenericClient import GenericClient

diff --git a/networkapiclient/EquipamentoAcesso.py b/networkapiclient/EquipamentoAcesso.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param

diff --git a/networkapiclient/EquipamentoAmbiente.py b/networkapiclient/EquipamentoAmbiente.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import is_valid_int_param

diff --git a/networkapiclient/EquipamentoRoteiro.py b/networkapiclient/EquipamentoRoteiro.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param

diff --git a/networkapiclient/EspecificacaoGrupoVirtual.py b/networkapiclient/EspecificacaoGrupoVirtual.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 
 class EspecificacaoGrupoVirtual(object):

diff --git a/networkapiclient/EventLog.py b/networkapiclient/EventLog.py
@@ -1,4 +1,18 @@
 # -*- coding:utf-8 -*-
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.exception import InvalidParameterError

diff --git a/networkapiclient/Filter.py b/networkapiclient/Filter.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: s2it / csilva
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.exception import InvalidParameterError

diff --git a/networkapiclient/GenericClient.py b/networkapiclient/GenericClient.py
@@ -1,10 +1,19 @@
 # -*- coding:utf-8 -*-
 
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.rest import RestRequest, RestError
 from networkapiclient.exception import ErrorHandler

diff --git a/networkapiclient/GrupoEquipamento.py b/networkapiclient/GrupoEquipamento.py
@@ -1,9 +1,18 @@
 # -*- coding:utf-8 -*-
-'''
-Title: Infrastructure NetworkAPI
-Author: globo.com / TQI
-Copyright: ( c )  2009 globo.com todos os direitos reservados.
-'''
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements.  See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 
 from networkapiclient.GenericClient import GenericClient
 from networkapiclient.utils import get_list_map, is_valid_int_param