Commit 50d57ac1 authored by lavado's avatar lavado
Browse files

Merge branch 'add-proxy-native-relation-charms' into 'master'

Add charm example for a proxy-native relation

See merge request !90
parents f4c5ff96 cbd63cab
Loading
Loading
Loading
Loading
+9 −0
Original line number Diff line number Diff line
@@ -58,3 +58,12 @@
[submodule "charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/mod/operator"]
	path = charm-packages/native_k8s_charm_vnf/charms/nginx-k8s/mod/operator
	url = https://github.com/canonical/operator
[submodule "charm-packages/proxy_native_relation_vnf/charms/simple_provides_proxy/mod/charms.osm"]
	path = charm-packages/proxy_native_relation_vnf/charms/simple_provides_proxy/mod/charms.osm
	url = https://github.com/charmed-osm/charms.osm.git
[submodule "charm-packages/proxy_native_relation_vnf/charms/simple_provides_proxy/mod/operator"]
	path = charm-packages/proxy_native_relation_vnf/charms/simple_provides_proxy/mod/operator
	url = https://github.com/canonical/operator.git
[submodule "charm-packages/proxy_native_relation_vnf/charms/simple_requires/mod/operator"]
	path = charm-packages/proxy_native_relation_vnf/charms/simple_requires/mod/operator
	url = https://github.com/canonical/operator.git
+54.6 KiB
Loading image diff...
+26 −0
Original line number Diff line number Diff line
nsd:nsd-catalog:
    nsd:
    -   id: proxy_native_relation-ns
        name: proxy_native_relation-ns
        short-name: proxy_native_relation-ns
        description: NS with 2 VNFs with cloudinit connected by datanet and mgmtnet VLs
        version: '1.0'
        logo: osm.png
        constituent-vnfd:
        -   vnfd-id-ref: proxy_native_relation-vnf
            member-vnf-index: '1'
        vld:
        -   id: mgmtnet
            name: mgmtnet
            short-name: mgmtnet
            type: ELAN
            mgmt-network: 'true'
            vim-network-name: osm-ext
            vnfd-connection-point-ref:
            -   vnfd-id-ref: proxy_native_relation-vnf
                member-vnf-index-ref: '1'
                vnfd-connection-point-ref: provides-mgmt
            -   vnfd-id-ref: proxy_native_relation-vnf
                member-vnf-index-ref: '1'
                vnfd-connection-point-ref: requires-mgmt
+54 −0
Original line number Diff line number Diff line
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# Licensed 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.
##
touch:
  description: "Touch a file on the VNF."
  params:
    filename:
      description: "The name of the file to touch."
      type: string
      default: ""
  required:
    - filename

# Standard OSM functions
start:
  description: "Stop the service on the VNF."
stop:
  description: "Stop the service on the VNF."
restart:
  description: "Stop the service on the VNF."
reboot:
  description: "Reboot the VNF virtual machine."
upgrade:
  description: "Upgrade the software on the VNF."

# Required by charms.osm.sshproxy
run:
  description: "Run an arbitrary command"
  params:
    command:
      description: "The command to execute."
      type: string
      default: ""
  required:
    - command
generate-ssh-key:
  description: "Generate a new SSH keypair for this unit. This will replace any existing previously generated keypair."
verify-ssh-credentials:
  description: "Verify that this unit can authenticate with server specified by ssh-hostname and ssh-username."
get-ssh-public-key:
  description: "Get the public SSH key for this unit."
+41 −0
Original line number Diff line number Diff line
##
# Copyright 2020 Canonical Ltd.
# All rights reserved.
#
# Licensed 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.
##
options:
  ssh-hostname:
    type: string
    default: ""
    description: "The hostname or IP address of the machine to"
  ssh-username:
    type: string
    default: ""
    description: "The username to login as."
  ssh-password:
    type: string
    default: ""
    description: "The password used to authenticate."
  ssh-public-key:
    type: string
    default: ""
    description: "The public key of this unit."
  ssh-key-type:
    type: string
    default: "rsa"
    description: "The type of encryption to use for the SSH key."
  ssh-key-bits:
    type: int
    default: 4096
    description: "The number of bits to use for the SSH key."
Loading