add vpcoffering loadbalancerattachment and kubernetescluster

Author: bernardodemarco

engine/schema/src/main/resources/nimble/resource-types/README.md

@@ -1,6 +1,6 @@
 # TOSCA Profile
 
-25 / 31
+28 / 31
 
 - [X] Domain
 - [X] Account
@@ -9,7 +9,7 @@
 - [X] ComputeOffering
 - [X] DiskOffering
 - [ ] NetworkOffering MAPAS
-- [ ] VpcOffering MAPAS
+- [X] VpcOffering
 - [X] InstanceGroup
 - [X] SshKeyPair
 - [X] UserData
@@ -22,12 +22,12 @@
 - [X] EgressFirewallRule
 - [X] FirewallRule
 - [X] LoadBalancer
-- [ ] LoadBalancerVirtualMachineAssigner MAPAS
+- [X] LoadBalancerAttachment
 - [X] PortForwardingRule
 - [X] NetworkAclList
 - [X] NetworkAclRule
 - [X] StaticNat
-- [ ] KubernetesCluster PARTIAL - VER COMO LIDAR COM MAPAS
+- [X] KubernetesCluster
 - [ ] VirtualMachine MAPAS
 - [X] AutoScalingVmGroup
 - [X] AutoScalingPolicy

engine/schema/src/main/resources/nimble/resource-types/kubernetes-cluster.yaml

@@ -19,6 +19,24 @@ tosca_definitions_version: tosca_2_0
 description: >
   KubernetesCluster node type definition.
 
+data_types:
+  NodeOffering:
+    properties:
+      node:
+        type: string
+        description: "Node type (e.g. 'control', 'worker') for which the offering will be applied."
+      offering:
+        type: string
+        description: ID of the service offering to be used for this node type.
+  NodeTemplate:
+    properties:
+      node:
+        type: string
+        description: "Node type (e.g. 'control', 'worker') for which the template will be used."
+      template:
+        type: string
+        description: ID of the template to be used for this node type.
+
 node_types:
   KubernetesCluster:
     properties:
@@ -78,7 +96,7 @@ node_types:
         type: string
         description: Kubernetes cluster type (CloudManaged or ExternalManaged).
         required: false
-        validation: { $valid_values: [ $value, [CloudManaged, ExternalManaged] ] }
+        validation: { $valid_values: [ $value, [ CloudManaged, ExternalManaged ] ] }
       docker-registry-password:
         type: string
         description: Password for the Docker image private registry.
@@ -103,7 +121,18 @@ node_types:
         type: integer
         description: Number of etcd nodes in the cluster.
         required: false
-#      node templates, nodeofferings
+      node-offerings:
+        type: list
+        entry_schema:
+          type: NodeOffering
+        description: "Compute offerings for each node type. If used, overrides the 'service-offering-id' property."
+        required: false
+      node-templates:
+        type: list
+        entry_schema:
+          type: NodeTemplate
+        description: Templates for each node type. If not specified, the system VM templates will be used.
+        required: false
     attributes:
       id:
         type: string

engine/schema/src/main/resources/nimble/resource-types/load-balancer-attachment.yaml

@@ -0,0 +1,50 @@
+# 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.
+tosca_definitions_version: tosca_2_0
+
+description: >
+  LoadBalancerAttachment node type definition.
+
+data_types:
+  VirtualMachineIpMapping:
+    properties:
+      virtual-machine-id:
+        type: string
+        description: The ID of the virtual machine.
+      ip:
+        type: string
+        description: The internal IP address of the virtual machine.
+
+node_types:
+  LoadBalancerAttachment:
+    properties:
+      load-balancer-id:
+        type: string
+        description: The ID of the load balancer.
+        required: true
+      virtual-machine-ids:
+        type: list
+        entry_schema:
+          type: string
+        description: The list of IDs of the virtual machines to attach to the load balancer.
+        required: true
+      virtual-machine-ip-map:
+        type: list
+        entry_schema:
+          type: VirtualMachineIpMapping
+        description: The mapping between virtual machine IDs and their internal IP addresses.
+        required: true

engine/schema/src/main/resources/nimble/resource-types/vpc-offering.yaml

@@ -0,0 +1,78 @@
+# 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.
+tosca_definitions_version: tosca_2_0
+
+description: >
+  VpcOffering node type definition.
+
+data_types:
+  NetworkServiceProviderMapping:
+    properties:
+      service:
+        type: string
+        description: The network service.
+      provider:
+        type: string
+        description: The network service provider.
+
+node_types:
+  VpcOffering:
+    properties:
+      name:
+        type: string
+        description: Name of the VPC offering.
+        required: true
+      display-text:
+        type: string
+        description: Display text of the VPC offering.
+        required: false
+      zone-id:
+        type: string
+        description: The ID of the availability zone. If not specified, the VPC offering will be public.
+        required: false
+      domain-id:
+        type: string
+        description: The ID of the domain for which the VPC offering will be available. If not specified, the compute offering will be public.
+        required: false
+      enable:
+        type: boolean
+        description: Whether the VPC offering will be enabled during creation.
+        required: false
+      internet-protocol:
+        type: list
+        description: "The internet protocol of the offering. Valid values are 'ipv4' and 'dualstack'."
+        required: false
+      supported-services:
+        type: list
+        entry_schema:
+          type: string
+        description: The network services supported by the offering.
+        required: false
+      service-provider-map:
+        type: list
+        entry_schema:
+          type: NetworkServiceProviderMapping
+        description: The network services mapped to their providers.
+        required: false
+      service-offering-id:
+        type: string
+        description: The ID of the network service offering for the VPC router.
+        required: false
+    attributes:
+      id:
+        type: string
+        description: The ID of the VPC offering.