fix repo locations

.gitignore

@@ -59,6 +59,3 @@ ChangeLog
 
 # Files created by releasenotes build
 releasenotes/build
-
-bindep.txt
-packages.txt

otc_metadata/__init__.py

@@ -9,13 +9,13 @@
 # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
 # License for the specific language governing permissions and limitations
 # under the License.
-__all__ = ["__version__", "Docs"]
+__all__ = ['__version__', 'Docs']
 
 import pbr.version
 
 from otc_metadata.services import Services  # flake8: noqa
 
-__version__ = pbr.version.VersionInfo("otc-metadata").version_string()
+__version__ = pbr.version.VersionInfo('otc-metadata').version_string()
 _service_manager = None
 
 

otc_metadata/data/__init__.py

@@ -12,45 +12,30 @@
 # limitations under the License.
 
 import os
-import pathlib
 import yaml
 
-__all__ = ["read_data"]
+__all__ = ['read_data']
 
 DATA_DIR = os.path.dirname(__file__)
 
 
 def read_data(filename):
-    """Return data that is shipped inside the Python package."""
+    """Return data that is shipped inside the Python package.
+
+    """
 
     filepath = os.path.join(DATA_DIR, filename)
-    with open(filepath, "r") as fd:
+    with open(filepath, 'r') as fd:
-        data = yaml.safe_load(fd)
+        return yaml.safe_load(fd)
-        # Merge data found in individual element files
-        data.setdefault("documents", list())
-        data.setdefault("services", list())
-        data.setdefault("service_categories", list())
-        for item in pathlib.Path(DATA_DIR, "documents").glob("*.yaml"):
-            with open(item, "r") as fp:
-                data["documents"].append(yaml.safe_load(fp))
-        for item in pathlib.Path(DATA_DIR, "services").glob("*.yaml"):
-            with open(item, "r") as fp:
-                data["services"].append(yaml.safe_load(fp))
-        for item in pathlib.Path(DATA_DIR, "service_categories").glob(
-            "*.yaml"
-        ):
-            with open(item, "r") as fp:
-                data["service_categories"].append(yaml.safe_load(fp))
-
-        return data
 
 
 def rewrite_data(filename, data):
-    """Rewrites data formatting it"""
+    """Rewrites data formatting it
-    from ruamel.yaml import YAML
 
+    """
+    from ruamel.yaml import YAML
     _yaml = YAML()
     _yaml.indent(mapping=2, sequence=4, offset=2)
     filepath = os.path.join(DATA_DIR, filename)
-    with open(filepath, "w") as fd:
+    with open(filepath, 'w') as fd:
         _yaml.dump(data, fd)

otc_metadata/data/documents/aom-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/aom
-html_location: docs/aom/api-ref
-link: /application-operations-management/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: aom
-title: API Reference
-type: api-ref

otc_metadata/data/documents/aom-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/aom
-html_location: docs/aom/umn
-link: /application-operations-management/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: aom
-title: User Guide
-type: umn

otc_metadata/data/documents/as-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/as
-html_location: docs/as/api-ref
-link: /auto-scaling/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: as
-title: API Reference
-type: api-ref

otc_metadata/data/documents/as-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/as
-html_location: docs/as/umn
-link: /auto-scaling/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: as
-title: User Guide
-type: umn

otc_metadata/data/documents/cbr-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/cbr
-html_location: docs/cbr/api-ref
-link: /cloud-backup-recovery/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: cbr
-title: API Reference
-type: api-ref

otc_metadata/data/documents/cbr-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/cbr
-html_location: docs/cbr/umn
-link: /cloud-backup-recovery/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: cbr
-title: User Guide
-type: umn

otc_metadata/data/documents/cce-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api2/cce
-html_location: docs/cce/api-ref
-link: /cloud-container-engine/api-ref/
-pdf_enabled: false
-pdf_environment: public
-rst_location: api-ref/source
-service_type: cce
-title: API Reference
-type: api-ref

otc_metadata/data/documents/cce-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual2/cce
-html_location: docs/cce/umn
-link: /cloud-container-engine/umn/
-pdf_enabled: false
-pdf_environment: public
-rst_location: umn/source
-service_type: cce
-title: User Guide
-type: umn

otc_metadata/data/documents/ces-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/ces
-html_location: docs/ces/api-ref
-link: /cloud-eye/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: ces
-title: API Reference
-type: api-ref

otc_metadata/data/documents/ces-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/ces
-html_location: docs/ces/umn
-link: /cloud-eye/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: ces
-title: User Guide
-type: umn

otc_metadata/data/documents/cts-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/cts
-html_location: docs/cts/api-ref
-link: /cloud-trace-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: cts
-title: API Reference
-type: api-ref

otc_metadata/data/documents/cts-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/cts
-html_location: docs/cts/umn
-link: /cloud-trace-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: cts
-title: User Guide
-type: umn

otc_metadata/data/documents/dc-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/dc
-html_location: docs/dc/api-ref
-link: /direct-connect/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: dc
-title: API Reference
-type: api-ref

otc_metadata/data/documents/dc-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/dc
-html_location: docs/dc/umn
-link: /direct-connect/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: dc
-title: User Guide
-type: umn

otc_metadata/data/documents/deh-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/deh
-html_location: docs/deh/api-ref
-link: /dedicated-host/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: deh
-title: API Reference
-type: api-ref

otc_metadata/data/documents/deh-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/deh
-html_location: docs/deh/umn
-link: /dedicated-host/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: deh
-title: User Guide
-type: umn

otc_metadata/data/documents/dns-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/dns
-html_location: docs/dns/api-ref
-link: /domain-name-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: dns
-title: API Reference
-type: api-ref

otc_metadata/data/documents/dns-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/dns
-html_location: docs/dns/umn
-link: /domain-name-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: dns
-title: User Guide
-type: umn

otc_metadata/data/documents/ecs-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/ecs
-html_location: docs/ecs/api-ref
-link: /elastic-cloud-server/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: ecs
-title: API Reference
-type: api-ref

otc_metadata/data/documents/ecs-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/ecs
-html_location: docs/ecs/umn
-link: /elastic-cloud-server/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: ecs
-title: User Guide
-type: umn

otc_metadata/data/documents/eip-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/eip
-html_location: docs/eip/api-ref
-link: /elastic-ip/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: eip
-title: API Reference
-type: api-ref

otc_metadata/data/documents/eip-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/eip
-html_location: docs/eip/umn
-link: /elastic-ip/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: eip
-title: User Guide
-type: umn

otc_metadata/data/documents/elb-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/elb
-html_location: docs/elb/api-ref
-link: /elastic-load-balancing/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: elb
-title: API Reference
-type: api-ref

otc_metadata/data/documents/elb-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/elb
-html_location: docs/elb/umn
-link: /elastic-load-balancing/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: elb
-title: User Guide
-type: umn

otc_metadata/data/documents/evs-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/evs
-html_location: docs/evs/api-ref
-link: /elastic-volume-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: evs
-title: API Reference
-type: api-ref

otc_metadata/data/documents/evs-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/evs
-html_location: docs/evs/umn
-link: /elastic-volume-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: evs
-title: User Guide
-type: umn

otc_metadata/data/documents/iam-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/iam
-html_location: docs/iam/api-ref
-link: /identity-access-management/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: iam
-title: API Reference
-type: api-ref

otc_metadata/data/documents/iam-permissions.yaml

@@ -1,9 +0,0 @@
----
-html_location: docs/iam/permissions
-link: /identity-access-management/permissions/
-pdf_enabled: true
-pdf_environment: public
-rst_location: doc/permissions/source
-service_type: iam
-title: Permissions
-type: permissions

otc_metadata/data/documents/iam-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/iam
-html_location: docs/iam/umn
-link: /identity-access-management/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: iam
-title: User Guide
-type: umn

otc_metadata/data/documents/ims-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/ims
-html_location: docs/ims/api-ref
-link: /image-management-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: ims
-title: API Reference
-type: api-ref

otc_metadata/data/documents/ims-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/ims
-html_location: docs/ims/umn
-link: /image-management-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: ims
-title: User Guide
-type: umn

otc_metadata/data/documents/kms-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/kms
-html_location: docs/kms/api-ref
-link: /key-management-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: kms
-title: API Reference
-type: api-ref

otc_metadata/data/documents/kms-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/kms
-html_location: docs/kms/umn
-link: /key-management-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: kms
-title: User Guide
-type: umn

otc_metadata/data/documents/lts-api-ref.yaml

@@ -1,11 +0,0 @@
----
-environment: public
-hc_location: api/lts
-html_location: docs/lts/api-ref
-link: /log-tank-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: lts
-title: API Reference
-type: api-ref

otc_metadata/data/documents/lts-umn.yaml

@@ -1,11 +0,0 @@
----
-environment: public
-hc_location: usermanual/lts
-html_location: docs/lts/umn
-link: /log-tank-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: lts
-title: User Guide
-type: umn

otc_metadata/data/documents/natgw-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/nat
-html_location: docs/natgw/api-ref
-link: /nat-gateway/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: natgw
-title: API Reference
-type: api-ref

otc_metadata/data/documents/natgw-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/nat
-html_location: docs/natgw/umn
-link: /nat-gateway/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: natgw
-title: User Guide
-type: umn

otc_metadata/data/documents/obs-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/obs
-html_location: docs/obs/api-ref
-link: /object-storage-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: obs
-title: API Reference
-type: api-ref

otc_metadata/data/documents/obs-s3api.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api_obs/obs
-html_location: docs/obs/s3api
-link: /object-storage-service/s3api/
-pdf_enabled: true
-pdf_environment: public
-rst_location: doc/s3api/source
-service_type: obs
-title: S3 API Reference
-type: s3api

otc_metadata/data/documents/obs-tool-guide.yaml

@@ -1,10 +0,0 @@
----
-hc_location: browsertg/obs
-html_location: docs/obs/tool
-link: /object-storage-service/tool-guide/
-pdf_enabled: true
-pdf_environment: public
-rst_location: doc/tool/source
-service_type: obs
-title: Tool Guide (OBS Browser)
-type: tool-guide

otc_metadata/data/documents/obs-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/obs
-html_location: docs/obs/umn
-link: /object-storage-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: obs
-title: User Guide
-type: umn

otc_metadata/data/documents/rds-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/rds
-html_location: docs/rds/api-ref
-link: /relational-database-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: rds
-title: API Reference
-type: api-ref

otc_metadata/data/documents/rds-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/rds
-html_location: docs/rds/umn
-link: /relational-database-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: rds
-title: User Guide
-type: umn

otc_metadata/data/documents/sd-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/sd
-html_location: docs/sd/umn
-link: /status-dashboard/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: sd
-title: User Guide
-type: umn

otc_metadata/data/documents/sdrs-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/sdrs
-html_location: docs/sdrs/api-ref
-link: /storage-disaster-recovery-service/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: sdrs
-title: API Reference
-type: api-ref

otc_metadata/data/documents/sdrs-umn.yaml

@@ -1,10 +0,0 @@
----
-hc_location: usermanual/sdrs
-html_location: docs/sdrs/umn
-link: /storage-disaster-recovery-service/umn/
-pdf_enabled: true
-pdf_environment: public
-rst_location: umn/source
-service_type: sdrs
-title: User Guide
-type: umn

otc_metadata/data/documents/smn-api-ref.yaml

@@ -1,10 +0,0 @@
----
-hc_location: api/smn
-html_location: docs/smn/api-ref
-link: /simple-message-notification/api-ref/
-pdf_enabled: true
-pdf_environment: public
-rst_location: api-ref/source
-service_type: smn
-title: API Reference
-type: api-ref