encode IPv6 requirement into example scripts names (#102)

21 files changed, 37 insertions, 34 deletions

diff --git a/CHANGES.txt b/CHANGES.txt
index ca294ff2..ce71f098 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -8,6 +8,8 @@ Revision 4.4.2, released 2017-11-XX
   `append=False` parameter to let the caller adding more
   than 255 elements over the course of multiple calls
 - Added support for some more missing fields of SMIv2 MACRO types
+- Example scripts rearranged in a way that IPv6 requirement is
+  clearly encoded in the script's name
 - Fixed non-implied-OID encoding in SNMP table indices
 
 Revision 4.4.1, released 2017-10-23
diff --git a/devel-requirements.txt b/devel-requirements.txt
index bf42bcf2..e78c2eb4 100644
--- a/devel-requirements.txt
+++ b/devel-requirements.txt
@@ -1,2 +1,3 @@
 sphinx
 twisted
+trollius; python_version < '3.0'
diff --git a/docs/source/examples/hlapi/asyncio/manager/cmdgen/advanced-topics.rst b/docs/source/examples/hlapi/asyncio/manager/cmdgen/advanced-topics.rst
index 79824d3c..b75d6e5d 100644
--- a/docs/source/examples/hlapi/asyncio/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/hlapi/asyncio/manager/cmdgen/advanced-topics.rst
@@ -4,15 +4,15 @@
 Advanced Command Generator
 --------------------------
 
-.. include:: /../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries.py
+.. include:: /../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries.py
+.. literalinclude:: /../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries.py>` script.
+:download:`Download</../../examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py>` script.
 
 
 .. include:: /../../examples/hlapi/asyncio/manager/cmdgen/multiple-sequential-queries.py
diff --git a/docs/source/examples/hlapi/asyncore/manager/cmdgen/advanced-topics.rst b/docs/source/examples/hlapi/asyncore/manager/cmdgen/advanced-topics.rst
index 7ff9dfd2..17a01f97 100644
--- a/docs/source/examples/hlapi/asyncore/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/hlapi/asyncore/manager/cmdgen/advanced-topics.rst
@@ -4,37 +4,37 @@
 Advanced Command Generator
 --------------------------
 
-.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once.py
+.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once.py
+.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once.py>` script.
+:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py>` script.
 
 
-.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines.py
+.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines.py
+.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines.py>` script.
+:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py>` script.
 
 
-.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries.py
+.. include:: /../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries.py
+.. literalinclude:: /../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries.py>` script.
+:download:`Download</../../examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py>` script.
 
 
 See also: :doc:`library reference </docs/api-reference>`.
diff --git a/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/advanced-topics.rst b/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/advanced-topics.rst
index 34971dd4..9854bc52 100644
--- a/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/advanced-topics.rst
+++ b/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/advanced-topics.rst
@@ -70,15 +70,15 @@ Advanced Command Generator
 :download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/specific-v3-engine-id.py>` script.
 
 
-.. include:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
+.. include:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
+.. literalinclude:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py>` script.
+:download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads-over-ipv4-and-ipv6.py>` script.
 
 
 See also: :doc:`library reference </docs/api-reference>`.
diff --git a/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/table-operations.rst b/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/table-operations.rst
index 4f14e06e..7314acd1 100644
--- a/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/table-operations.rst
+++ b/docs/source/examples/hlapi/asyncore/sync/manager/cmdgen/table-operations.rst
@@ -25,15 +25,15 @@ Table operations
 :download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/get-table-object-by-multiple-indices.py>` script.
 
 
-.. include:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py
+.. include:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables-over-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py
+.. literalinclude:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables-over-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py>` script.
+:download:`Download</../../examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables-over-ipv6.py>` script.
 
 
 .. include:: /../../examples/hlapi/asyncore/sync/manager/cmdgen/pull-whole-snmp-table.py
diff --git a/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst b/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
index e3f50c7a..474bbb05 100644
--- a/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
+++ b/docs/source/examples/v1arch/asyncore/agent/cmdrsp/agent-side-mib-implementations.rst
@@ -4,15 +4,15 @@
 Agent-side MIB implementations
 ------------------------------
 
-.. include:: /../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
+.. include:: /../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
+.. literalinclude:: /../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py>` script.
+:download:`Download</../../examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py>` script.
 
 
 See also: :doc:`library reference </docs/api-reference>`.
diff --git a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
index 34e279bc..a9be8eda 100644
--- a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/advanced-topics.rst
@@ -4,15 +4,15 @@
 Advanced topics
 ---------------
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py>` script.
 
 
 .. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/regexp-community-name.py
diff --git a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
index 37f55d8e..ac8851d9 100644
--- a/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
+++ b/docs/source/examples/v3arch/asyncore/manager/ntfrcv/transport-tweaks.rst
@@ -15,15 +15,15 @@ Transport tweaks
 :download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-interfaces.py>` script.
 
 
-.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py
+.. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py
+.. literalinclude:: /../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py>` script.
 
 
 .. include:: /../../examples/v3arch/asyncore/manager/ntfrcv/determine-peer-network-address.py
diff --git a/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst b/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
index 7bd23812..b235998d 100644
--- a/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
+++ b/docs/source/examples/v3arch/asyncore/proxy/command/transport-conversion.rst
@@ -4,15 +4,15 @@
 Transport conversion
 --------------------
 
-.. include:: /../../examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py
+.. include:: /../../examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py
    :start-after: """
    :end-before: """#
 
-.. literalinclude:: /../../examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py
+.. literalinclude:: /../../examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py
    :start-after: """#
    :language: python
 
-:download:`Download</../../examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py>` script.
+:download:`Download</../../examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py>` script.
 
 
 See also: :doc:`library-reference </docs/api-reference>`.
diff --git a/examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries.py b/examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
index ad9c441b..ad9c441b 100644
--- a/examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries.py
+++ b/examples/hlapi/asyncio/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
diff --git a/examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries.py b/examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
index 2b4b0eb3..2b4b0eb3 100644
--- a/examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries.py
+++ b/examples/hlapi/asyncore/manager/cmdgen/multiple-concurrent-queries-over-ipv4-and-ipv6.py
diff --git a/examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once.py b/examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py
index d87d55c5..d87d55c5 100644
--- a/examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once.py
+++ b/examples/hlapi/asyncore/manager/cmdgen/pull-mibs-from-multiple-agents-at-once-over-ipv4-and-ipv6.py
diff --git a/examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines.py b/examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py
index 4a732041..4a732041 100644
--- a/examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines.py
+++ b/examples/hlapi/asyncore/manager/cmdgen/query-multiple-snmp-engines-over-ipv4-and-ipv6.py
diff --git a/examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py b/examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables-over-ipv6.py
index 499c9b02..499c9b02 100644
--- a/examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables.py
+++ b/examples/hlapi/asyncore/sync/manager/cmdgen/getbulk-fetch-scalar-and-table-variables-over-ipv6.py
diff --git a/examples/hlapi/asyncore/sync/manager/cmdgen/preload-pysnmp-mibs.py b/examples/hlapi/asyncore/sync/manager/cmdgen/preload-pysnmp-mibs.py
index 27186431..a9bb2bb3 100644
--- a/examples/hlapi/asyncore/sync/manager/cmdgen/preload-pysnmp-mibs.py
+++ b/examples/hlapi/asyncore/sync/manager/cmdgen/preload-pysnmp-mibs.py
@@ -5,14 +5,14 @@ Preload PySNMP MIBs
 Send a series of SNMP GETNEXT requests using the following options:
 
 * with SNMPv3 with user 'usr-md5-des', MD5 auth and DES privacy protocols
-* over IPv6/UDP
-* to an Agent at [::1]:161
+* over IPv4/UDP
+* to an Agent at demo.snmplabs.com:161
 * for all OIDs starting from 1.3.6
 * preload all Python MIB modules found in search path
 
 Functionally similar to:
 
-| $ snmpwalk -v3 -l authPriv -u usr-md5-des -A authkey1 -X privkey1 -m ALL udp6:[::1]:161 1.3.6
+| $ snmpwalk -v3 -l authPriv -u usr-md5-des -A authkey1 -X privkey1 -m ALL demo.snmplabs.com:161 1.3.6
 
 """#
 from pysnmp.hlapi import *
@@ -22,7 +22,7 @@ for (errorIndication,
      errorIndex,
      varBinds) in nextCmd(SnmpEngine(),
                           UsmUserData('usr-md5-des', 'authkey1', 'privkey1'),
-                          Udp6TransportTarget(('::1', 161)),
+                          UdpTransportTarget(('demo.snmplabs.com', 161)),
                           ContextData(),
                           ObjectType(ObjectIdentity('1.3.6').loadMibs())):
 
diff --git a/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py b/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads-over-ipv4-and-ipv6.py
index 16995ed8..16995ed8 100644
--- a/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads.py
+++ b/examples/hlapi/asyncore/sync/manager/cmdgen/query-agents-from-multuple-threads-over-ipv4-and-ipv6.py
diff --git a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py
index 328e5d28..328e5d28 100644
--- a/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects.py
+++ b/examples/v1arch/asyncore/agent/cmdrsp/implementing-scalar-mib-objects-over-ipv4-and-ipv6.py
diff --git a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py
index 994c73dd..994c73dd 100644
--- a/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports.py
+++ b/examples/v3arch/asyncore/manager/ntfrcv/multiple-network-transports-incl-ipv4-and-ipv6.py
diff --git a/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py b/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py
index 9f3a2c40..9f3a2c40 100644
--- a/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing.py
+++ b/examples/v3arch/asyncore/manager/ntfrcv/observe-request-processing-over-ipv4-and-ipv6.py
diff --git a/examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py b/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py
index 9e34fd0d..9e34fd0d 100644
--- a/examples/v3arch/asyncore/proxy/command/udp6-to-udp4-conversion.py
+++ b/examples/v3arch/asyncore/proxy/command/ipv6-to-ipv4-conversion.py