From f57eb2fa4c98f4e02e96c63767303c8ba4e8f7f6 Mon Sep 17 00:00:00 2001 From: Tetiana Lashchova Date: Thu, 16 Jun 2016 20:49:00 +0300 Subject: [PATCH] Update namespaces for k8s applications Replace io.murano.apps with com.mirantis bp fix-fqn-usage Change-Id: I5bb6129a51beadffe124cd0fb289f41e05cd52c3 --- .../package/Classes/ApplicationPort.yaml | 2 +- .../package/Classes/DockerApplication.yaml | 2 +- .../package/Classes/DockerContainer.yaml | 2 +- .../package/Classes/DockerContainerHost.yaml | 2 +- .../package/Classes/DockerHelpers.yaml | 2 +- .../package/Classes/DockerHostVolume.yaml | 2 +- .../package/Classes/DockerTempVolume.yaml | 2 +- .../package/Classes/DockerVolume.yaml | 2 +- DockerInterfacesLibrary/package/manifest.yaml | 18 +++++++++--------- .../package/Classes/KubernetesCluster.yaml | 4 ++-- .../package/Classes/KubernetesGatewayNode.yaml | 2 +- .../package/Classes/KubernetesMasterNode.yaml | 2 +- .../package/Classes/KubernetesMinionNode.yaml | 2 +- .../package/Classes/KubernetesNode.yaml | 2 +- .../KubernetesCluster/package/UI/ui.yaml | 8 ++++---- .../KubernetesCluster/package/manifest.yaml | 14 +++++++------- .../package/Classes/Pod.yaml | 2 +- .../package/Classes/ReplicationController.yaml | 2 +- .../package/Classes/Service.yaml | 2 +- .../package/manifest.yaml | 10 +++++----- .../package/Classes/KubernetesPod.yaml | 4 ++-- Kubernetes/KubernetesPod/package/UI/ui.yaml | 4 ++-- Kubernetes/KubernetesPod/package/manifest.yaml | 8 ++++---- Kubernetes/README.rst | 2 +- 24 files changed, 51 insertions(+), 51 deletions(-) diff --git a/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml b/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml index fa817c2..1f29994 100644 --- a/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml +++ b/DockerInterfacesLibrary/package/Classes/ApplicationPort.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker std: io.murano Name: ApplicationPort diff --git a/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml b/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml index b5503e4..ae74c09 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerApplication.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker std: io.murano Name: DockerApplication diff --git a/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml b/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml index 77d4bfd..031dd6e 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerContainer.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker Name: DockerContainer diff --git a/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml b/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml index ad88d55..6ec12b0 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerContainerHost.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker std: io.murano Name: DockerContainerHost diff --git a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml index 106436c..c864959 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerHelpers.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker Name: DockerHelpers diff --git a/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml b/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml index 2dc9584..72dc22a 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerHostVolume.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker Name: DockerHostVolume diff --git a/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml b/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml index b02a28d..7f26304 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerTempVolume.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker Name: DockerTempVolume diff --git a/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml b/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml index 2396c2b..bf1c053 100644 --- a/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml +++ b/DockerInterfacesLibrary/package/Classes/DockerVolume.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker + =: com.mirantis.docker Name: DockerVolume diff --git a/DockerInterfacesLibrary/package/manifest.yaml b/DockerInterfacesLibrary/package/manifest.yaml index d0a3f2a..1afc04d 100644 --- a/DockerInterfacesLibrary/package/manifest.yaml +++ b/DockerInterfacesLibrary/package/manifest.yaml @@ -12,7 +12,7 @@ Format: 1.3 Type: Library -FullName: io.murano.apps.docker.Interfaces +FullName: com.mirantis.docker.Interfaces Name: Docker Interface Library Description: | The library provides all necessary interface for Docker @@ -21,11 +21,11 @@ Author: 'Mirantis, Inc' Tags: [Docker, Kubernetes] Classes: - io.murano.apps.docker.DockerApplication: DockerApplication.yaml - io.murano.apps.docker.DockerContainer: DockerContainer.yaml - io.murano.apps.docker.DockerContainerHost: DockerContainerHost.yaml - io.murano.apps.docker.DockerHelpers: DockerHelpers.yaml - io.murano.apps.docker.DockerHostVolume: DockerHostVolume.yaml - io.murano.apps.docker.DockerTempVolume: DockerTempVolume.yaml - io.murano.apps.docker.DockerVolume: DockerVolume.yaml - io.murano.apps.docker.ApplicationPort: ApplicationPort.yaml + com.mirantis.docker.DockerApplication: DockerApplication.yaml + com.mirantis.docker.DockerContainer: DockerContainer.yaml + com.mirantis.docker.DockerContainerHost: DockerContainerHost.yaml + com.mirantis.docker.DockerHelpers: DockerHelpers.yaml + com.mirantis.docker.DockerHostVolume: DockerHostVolume.yaml + com.mirantis.docker.DockerTempVolume: DockerTempVolume.yaml + com.mirantis.docker.DockerVolume: DockerVolume.yaml + com.mirantis.docker.ApplicationPort: ApplicationPort.yaml diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml index c89e90c..f4be98f 100644 --- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml +++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesCluster.yaml @@ -11,11 +11,11 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes + =: com.mirantis.docker.kubernetes std: io.murano res: io.murano.resources sys: io.murano.system - docker: io.murano.apps.docker + docker: com.mirantis.docker Name: KubernetesCluster diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml index bbfea98..e888f4c 100644 --- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml +++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesGatewayNode.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes + =: com.mirantis.docker.kubernetes std: io.murano res: io.murano.resources sys: io.murano.system diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml index 2543737..21353a4 100644 --- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml +++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMasterNode.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes + =: com.mirantis.docker.kubernetes std: io.murano res: io.murano.resources sys: io.murano.system diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml index 547fd96..3dfb88d 100644 --- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml +++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesMinionNode.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes + =: com.mirantis.docker.kubernetes std: io.murano res: io.murano.resources sys: io.murano.system diff --git a/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml b/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml index f2f050b..9db8995 100644 --- a/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml +++ b/Kubernetes/KubernetesCluster/package/Classes/KubernetesNode.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes + =: com.mirantis.docker.kubernetes std: io.murano res: io.murano.resources sys: io.murano.system diff --git a/Kubernetes/KubernetesCluster/package/UI/ui.yaml b/Kubernetes/KubernetesCluster/package/UI/ui.yaml index 234d9ae..99a28b2 100644 --- a/Kubernetes/KubernetesCluster/package/UI/ui.yaml +++ b/Kubernetes/KubernetesCluster/package/UI/ui.yaml @@ -14,7 +14,7 @@ Version: 2 Templates: masterNode: ?: - type: io.murano.apps.docker.kubernetes.KubernetesMasterNode + type: com.mirantis.docker.kubernetes.KubernetesMasterNode instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -27,7 +27,7 @@ Templates: minionNode: ?: - type: io.murano.apps.docker.kubernetes.KubernetesMinionNode + type: com.mirantis.docker.kubernetes.KubernetesMinionNode instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -42,7 +42,7 @@ Templates: gatewayNode: ?: - type: io.murano.apps.docker.kubernetes.KubernetesGatewayNode + type: com.mirantis.docker.kubernetes.KubernetesGatewayNode instance: ?: type: io.murano.resources.LinuxMuranoInstance @@ -55,7 +55,7 @@ Templates: Application: ?: - type: io.murano.apps.docker.kubernetes.KubernetesCluster + type: com.mirantis.docker.kubernetes.KubernetesCluster name: $.appConfiguration.name masterNode: $masterNode minionNodes: repeat($minionNode, $.appConfiguration.maxMinionCount) diff --git a/Kubernetes/KubernetesCluster/package/manifest.yaml b/Kubernetes/KubernetesCluster/package/manifest.yaml index 92032a3..29c72a5 100644 --- a/Kubernetes/KubernetesCluster/package/manifest.yaml +++ b/Kubernetes/KubernetesCluster/package/manifest.yaml @@ -12,7 +12,7 @@ Format: 1.3 Type: Application -FullName: io.murano.apps.docker.kubernetes.KubernetesCluster +FullName: com.mirantis.docker.kubernetes.KubernetesCluster Name: Kubernetes Cluster Description: | Kubernetes is an open source system for managing containerized applications across multiple hosts, @@ -20,10 +20,10 @@ Description: | Author: 'Mirantis, Inc' Tags: [Docker, Kubernetes] Classes: - io.murano.apps.docker.kubernetes.KubernetesCluster: KubernetesCluster.yaml - io.murano.apps.docker.kubernetes.KubernetesMasterNode: KubernetesMasterNode.yaml - io.murano.apps.docker.kubernetes.KubernetesMinionNode: KubernetesMinionNode.yaml - io.murano.apps.docker.kubernetes.KubernetesGatewayNode: KubernetesGatewayNode.yaml - io.murano.apps.docker.kubernetes.KubernetesNode: KubernetesNode.yaml + com.mirantis.docker.kubernetes.KubernetesCluster: KubernetesCluster.yaml + com.mirantis.docker.kubernetes.KubernetesMasterNode: KubernetesMasterNode.yaml + com.mirantis.docker.kubernetes.KubernetesMinionNode: KubernetesMinionNode.yaml + com.mirantis.docker.kubernetes.KubernetesGatewayNode: KubernetesGatewayNode.yaml + com.mirantis.docker.kubernetes.KubernetesNode: KubernetesNode.yaml Require: - io.murano.apps.docker.Interfaces: + com.mirantis.docker.Interfaces: diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml index 6062b1d..fba931c 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Pod.yaml @@ -12,7 +12,7 @@ Namespaces: - =: io.murano.apps.docker.kubernetes.static + =: com.mirantis.docker.kubernetes.static std: io.murano sys: io.murano.system diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml index 72bf328..96aa1a3 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/ReplicationController.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes.static + =: com.mirantis.docker.kubernetes.static std: io.murano sys: io.murano.system diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml index 32e1e3d..9187360 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/Classes/Service.yaml @@ -11,7 +11,7 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes.static + =: com.mirantis.docker.kubernetes.static std: io.murano sys: io.murano.system diff --git a/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml b/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml index 07a4028..bef4d65 100644 --- a/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml +++ b/Kubernetes/KubernetesEntitiesLibrary/package/manifest.yaml @@ -12,7 +12,7 @@ Format: 1.3 Type: Library -FullName: io.murano.apps.docker.kubernetes.static.KubernetesEntities +FullName: com.mirantis.docker.kubernetes.static.KubernetesEntities Name: Kubernetes static entities Description: | Kubernes Pod - A collection of containers which will be scheduled onto the same node, @@ -20,8 +20,8 @@ Description: | Author: 'Mirantis, Inc' Tags: [docker, kubernetes, pod] Classes: - io.murano.apps.docker.kubernetes.static.Pod: Pod.yaml - io.murano.apps.docker.kubernetes.static.Service: Service.yaml - io.murano.apps.docker.kubernetes.static.ReplicationController: ReplicationController.yaml + com.mirantis.docker.kubernetes.static.Pod: Pod.yaml + com.mirantis.docker.kubernetes.static.Service: Service.yaml + com.mirantis.docker.kubernetes.static.ReplicationController: ReplicationController.yaml Require: - io.murano.apps.docker.kubernetes.KubernetesCluster: + com.mirantis.docker.kubernetes.KubernetesCluster: diff --git a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml index 91e498b..c416dd7 100644 --- a/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml +++ b/Kubernetes/KubernetesPod/package/Classes/KubernetesPod.yaml @@ -11,8 +11,8 @@ # under the License. Namespaces: - =: io.murano.apps.docker.kubernetes - docker: io.murano.apps.docker + =: com.mirantis.docker.kubernetes + docker: com.mirantis.docker std: io.murano sys: io.murano.system diff --git a/Kubernetes/KubernetesPod/package/UI/ui.yaml b/Kubernetes/KubernetesPod/package/UI/ui.yaml index 5151d5f..e72b1e9 100644 --- a/Kubernetes/KubernetesPod/package/UI/ui.yaml +++ b/Kubernetes/KubernetesPod/package/UI/ui.yaml @@ -14,7 +14,7 @@ Version: 2 Application: ?: - type: io.murano.apps.docker.kubernetes.KubernetesPod + type: com.mirantis.docker.kubernetes.KubernetesPod name: $.appConfiguration.name labels: $.appConfiguration.labels kubernetesCluster: $.appConfiguration.kubernetesCluster @@ -53,7 +53,7 @@ Forms: Valid label values must be shorter than 64 characters, accepted characters are ([-A-Za-z0-9_.]) but the first character must be ([A-Za-z0-9]). - name: kubernetesCluster - type: io.murano.apps.docker.kubernetes.KubernetesCluster + type: com.mirantis.docker.kubernetes.KubernetesCluster label: Kubernetes cluster description: >- Kubernetes service diff --git a/Kubernetes/KubernetesPod/package/manifest.yaml b/Kubernetes/KubernetesPod/package/manifest.yaml index ab31db3..f18de16 100644 --- a/Kubernetes/KubernetesPod/package/manifest.yaml +++ b/Kubernetes/KubernetesPod/package/manifest.yaml @@ -12,7 +12,7 @@ Format: 1.3 Type: Application -FullName: io.murano.apps.docker.kubernetes.KubernetesPod +FullName: com.mirantis.docker.kubernetes.KubernetesPod Name: Kubernetes Pod Description: | Kubernes Pod - A collection of containers which will be scheduled onto the same node, @@ -20,7 +20,7 @@ Description: | Author: 'Mirantis, Inc' Tags: [docker, kubernetes, pod] Classes: - io.murano.apps.docker.kubernetes.KubernetesPod: KubernetesPod.yaml + com.mirantis.docker.kubernetes.KubernetesPod: KubernetesPod.yaml Require: - io.murano.apps.docker.Interfaces: - io.murano.apps.docker.kubernetes.KubernetesCluster: + com.mirantis.docker.Interfaces: + com.mirantis.docker.kubernetes.KubernetesCluster: diff --git a/Kubernetes/README.rst b/Kubernetes/README.rst index d03b20e..af5e73b 100644 --- a/Kubernetes/README.rst +++ b/Kubernetes/README.rst @@ -171,7 +171,7 @@ deploying both Kubernetes and it's nodes. `createService(applicationName, applicationPorts, podId)` * `applicationName` a string holding application's name. * `applicationPorts` list of instances of - `io.murano.apps.docker.ApplicationPort` class. + `com.mirantis.docker.ApplicationPort` class. * `podId` a string holding a name of the pod. Check each port in applicationPorts and creates or updates it if the port