Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 4 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,9 @@ The easiest way to install NiPyApi is with pip::

# in bash
pip install nipyapi

# or with docker support for demos
pip install nipyapi[demo]

You can set the config for your endpoints in the central config file::

Expand Down Expand Up @@ -93,7 +96,7 @@ Background and Documentation
NiFi Version Support
--------------------

| Currently we are testing against NiFi versions 1.1.2 - 1.23.2, and NiFi-Registry versions 0.1.0 - 1.23.2.
| Currently we are testing against NiFi versions 1.1.2 - 1.27.0, and NiFi-Registry versions 0.1.0 - 1.27.0.
| If you find a version compatibility problem please raise an `issue <https://github.com/Chaffelson/nipyapi/issues>`_

Python Support
Expand Down
17 changes: 13 additions & 4 deletions nipyapi/demo/fdlc.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,19 @@
"""

from __future__ import absolute_import
from __future__ import print_function # For Python 2 and 3 compatibility
import logging
from time import sleep
import nipyapi
from nipyapi.utils import DockerContainer

try:
from nipyapi.utils import DockerContainer
except ImportError:
print("The 'docker' package is required for this demo. "
"Please install nipyapi with the 'demo' extra: "
"pip install nipyapi[demo]")
import sys
sys.exit(1)

log = logging.getLogger(__name__)
log.setLevel(logging.INFO)
Expand Down Expand Up @@ -38,14 +47,14 @@
DockerContainer(
name='nifi-dev',
image_name='apache/nifi',
image_tag='latest',
image_tag='1.27.0',
ports={str(dev_nifi_port) + '/tcp': dev_nifi_port},
env={'NIFI_WEB_HTTP_PORT': str(dev_nifi_port)}
),
DockerContainer(
name='nifi-prod',
image_name='apache/nifi',
image_tag='latest',
image_tag='1.27.0',
ports={str(prod_nifi_port) + '/tcp': prod_nifi_port},
env={'NIFI_WEB_HTTP_PORT': str(prod_nifi_port)}
),
Expand Down Expand Up @@ -289,7 +298,7 @@ def step_9_deploy_prod_flow_to_nifi():
identifier=prod_ver_flow_name
)
reg_client = nipyapi.versioning.get_registry_client(prod_reg_client_name)
nipyapi.versioning.deploy_flow_version(
nipyapi.versioning.deploy_flow_ver(
parent_id=nipyapi.canvas.get_root_pg_id(),
location=(0, 0),
bucket_id=bucket.identifier,
Expand Down
17 changes: 14 additions & 3 deletions nipyapi/demo/secure_connection.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,22 @@
"""

from __future__ import absolute_import
from __future__ import print_function # For Python 2 and 3 compatibility
import logging
from pprint import pprint
from os import path
import sys
import nipyapi
from nipyapi.utils import DockerContainer

try:
from nipyapi.utils import DockerContainer
DOCKER_AVAILABLE = True
except ImportError:
DOCKER_AVAILABLE = False
print("The 'docker' package is required for this demo. "
"Please install nipyapi with the 'demo' extra: "
"pip install nipyapi[demo]")
sys.exit(1)

log = logging.getLogger(__name__)
log.setLevel(logging.INFO)
Expand Down Expand Up @@ -74,7 +85,7 @@
DockerContainer(
name='secure-nifi',
image_name='apache/nifi',
image_tag='1.9.1',
image_tag='1.27.0',
ports={'8443/tcp': 8443},
env=ldap_env_vars,
volumes={
Expand All @@ -84,7 +95,7 @@
DockerContainer(
name='secure-registry',
image_name='apache/nifi-registry',
image_tag='0.3.0',
image_tag='1.27.0',
ports={'18443/tcp': 18443},
env=tls_env_vars,
volumes={
Expand Down
4 changes: 3 additions & 1 deletion nipyapi/nifi/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down Expand Up @@ -400,6 +400,8 @@
from .models.versioned_property_descriptor import VersionedPropertyDescriptor
from .models.versioned_remote_group_port import VersionedRemoteGroupPort
from .models.versioned_remote_process_group import VersionedRemoteProcessGroup
from .models.versioned_reporting_task import VersionedReportingTask
from .models.versioned_reporting_task_snapshot import VersionedReportingTaskSnapshot
from .models.versioned_resource_definition import VersionedResourceDefinition

# import apis into sdk package
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/api_client.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/access_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/connections_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/controller_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/controller_services_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/counters_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
2 changes: 1 addition & 1 deletion nipyapi/nifi/apis/data_transfer_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

The Rest API provides programmatic access to command and control a NiFi instance in real time. Start and stop processors, monitor queues, query provenance data, and more. Each endpoint below includes a description, definitions of the expected input and output, potential response codes, and the authorizations required to invoke each service.

OpenAPI spec version: 1.23.2
OpenAPI spec version: 1.27.0
Contact: [email protected]
Generated by: https://github.com/swagger-api/swagger-codegen.git
"""
Expand Down
Loading